From 37427f44f527f9c97f73b1d7ac94414baa9287bb Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Mon, 19 May 2025 09:34:02 +0200 Subject: [PATCH 01/24] Removed deprecated field: format --- .../src/test/resources/tilskuddfartoy.json | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/fint-arkiv-resource-model-java/src/test/resources/tilskuddfartoy.json b/fint-arkiv-resource-model-java/src/test/resources/tilskuddfartoy.json index 3d978540..35fa11f0 100644 --- a/fint-arkiv-resource-model-java/src/test/resources/tilskuddfartoy.json +++ b/fint-arkiv-resource-model-java/src/test/resources/tilskuddfartoy.json @@ -21,7 +21,6 @@ "beskrivelse": "Ferdig - Hoveddokument - Grønn - Ugradert - null", "dokumentobjekt": [ { - "format": "JPG", "_links": { "referanseDokumentfil": [ { @@ -122,7 +121,6 @@ "beskrivelse": "Behandles - Hoveddokument - Grønn - Ugradert - null", "dokumentobjekt": [ { - "format": "DOCX", "_links": { "referanseDokumentfil": [ { @@ -276,7 +274,6 @@ "beskrivelse": "Behandles - Hoveddokument - Grønn - Ugradert - null", "dokumentobjekt": [ { - "format": "PDF", "_links": { "referanseDokumentfil": [ { @@ -375,7 +372,6 @@ "beskrivelse": "Behandles - Hoveddokument - Grønn - Ugradert - null", "dokumentobjekt": [ { - "format": "PDF", "_links": { "referanseDokumentfil": [ { @@ -479,7 +475,6 @@ "beskrivelse": "Behandles - Hoveddokument - Grønn - Ugradert - null", "dokumentobjekt": [ { - "format": "PDF", "_links": { "referanseDokumentfil": [ { @@ -583,7 +578,6 @@ "beskrivelse": "Behandles - Hoveddokument - Grønn - Ugradert - null", "dokumentobjekt": [ { - "format": "PDF", "_links": { "referanseDokumentfil": [ { @@ -687,7 +681,6 @@ "beskrivelse": "Behandles - Hoveddokument - Grønn - Ugradert - null", "dokumentobjekt": [ { - "format": "PDF", "_links": { "referanseDokumentfil": [ { @@ -791,7 +784,6 @@ "beskrivelse": "Behandles - Hoveddokument - Grønn - Ugradert - null", "dokumentobjekt": [ { - "format": "PDF", "_links": { "referanseDokumentfil": [ { @@ -890,7 +882,6 @@ "beskrivelse": "Behandles - Hoveddokument - Grønn - Ugradert - null", "dokumentobjekt": [ { - "format": "PDF", "_links": { "referanseDokumentfil": [ { @@ -1062,7 +1053,6 @@ "beskrivelse": "Behandles - Hoveddokument - Grønn - Ugradert - null", "dokumentobjekt": [ { - "format": "HTML", "_links": { "referanseDokumentfil": [ { @@ -1166,7 +1156,6 @@ "beskrivelse": "Behandles - Hoveddokument - Grønn - Ugradert - null", "dokumentobjekt": [ { - "format": "PDF", "_links": { "referanseDokumentfil": [ { @@ -1270,7 +1259,6 @@ "beskrivelse": "Behandles - Hoveddokument - Grønn - Ugradert - null", "dokumentobjekt": [ { - "format": "PDF", "_links": { "referanseDokumentfil": [ { @@ -1697,7 +1685,6 @@ "beskrivelse": "Behandles - Hoveddokument - Grønn - Ugradert - null", "dokumentobjekt": [ { - "format": "PDF", "_links": { "referanseDokumentfil": [ { @@ -1796,7 +1783,6 @@ "beskrivelse": "Behandles - Hoveddokument - Grønn - Ugradert - null", "dokumentobjekt": [ { - "format": "PDF", "_links": { "referanseDokumentfil": [ { @@ -1900,7 +1886,6 @@ "beskrivelse": "Behandles - Hoveddokument - Grønn - Ugradert - null", "dokumentobjekt": [ { - "format": "PDF", "_links": { "referanseDokumentfil": [ { From 61219ada6a14d94f76a2ea502cf3cdfbf1be2bd4 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Mon, 19 May 2025 09:51:02 +0200 Subject: [PATCH 02/24] Removed deprecated: foreldreansvar og relation person --- .../fint/test/model/ModelDeserializationSpec.groovy | 1 - .../no/fint/test/model/ModelSerializationSpec.groovy | 11 +++++------ .../src/test/resources/kontaktpersonresource.json | 1 - 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/ModelDeserializationSpec.groovy b/fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/ModelDeserializationSpec.groovy index 24428799..21029331 100644 --- a/fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/ModelDeserializationSpec.groovy +++ b/fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/ModelDeserializationSpec.groovy @@ -146,7 +146,6 @@ class ModelDeserializationSpec extends Specification { then: result result instanceof KontaktpersonResource - result.foreldreansvar result.links.size() == 2 } } diff --git a/fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/ModelSerializationSpec.groovy b/fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/ModelSerializationSpec.groovy index 172aed23..1f21aeb2 100644 --- a/fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/ModelSerializationSpec.groovy +++ b/fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/ModelSerializationSpec.groovy @@ -89,20 +89,19 @@ class ModelSerializationSpec extends Specification { given: def kontaktperson = new KontaktpersonResource( systemId: new Identifikator(identifikatorverdi: "ABCD1234"), - foreldreansvar: true, - type: "forelder" + type: "forelder", + navn: new Personnavn(fornavn: "Tore", etternavn: "Tang") ) - kontaktperson.addPerson(Link.with(Person, "fodselsnummer", "12345678901")) kontaktperson.addKontaktperson(Link.with(Person, "fodselsnummer", "23456789012")) when: def result = objectMapper.writeValueAsString(kontaktperson) - println(result) def object = jsonSlurper.parseText(result) then: object - object.foreldreansvar - object._links.size() == 2 + object.navn.fornavn == "Tore" + object.navn.etternavn == "Tang" + object._links.size() == 1 } } diff --git a/fint-felles-resource-model-java/src/test/resources/kontaktpersonresource.json b/fint-felles-resource-model-java/src/test/resources/kontaktpersonresource.json index 558ea890..928f9691 100644 --- a/fint-felles-resource-model-java/src/test/resources/kontaktpersonresource.json +++ b/fint-felles-resource-model-java/src/test/resources/kontaktpersonresource.json @@ -1,5 +1,4 @@ { - "foreldreansvar": true, "systemId": { "gyldighetsperiode": null, "identifikatorverdi": "ABCD1234" From 7738acd64c0ff01c6a150bcecd487e05832caca6 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Mon, 19 May 2025 10:33:35 +0200 Subject: [PATCH 03/24] rename basisgruppe -> klasse + deprecated fields --- .../model/ModelDeserializationSpec.groovy | 40 +++++++++---------- .../test/model/ModelSerializationSpec.groovy | 33 +++++++-------- .../SpringModelDeserializationSpec.groovy | 31 ++++---------- .../src/test/resources/basisgruppe.json | 14 ------- .../test/resources/basisgrupperesource.json | 21 ---------- .../src/test/resources/klasse.json | 7 ++++ .../src/test/resources/klasseresource.json | 22 ++++++++++ 7 files changed, 68 insertions(+), 100 deletions(-) delete mode 100644 fint-utdanning-resource-model-java/src/test/resources/basisgruppe.json delete mode 100644 fint-utdanning-resource-model-java/src/test/resources/basisgrupperesource.json create mode 100644 fint-utdanning-resource-model-java/src/test/resources/klasse.json create mode 100644 fint-utdanning-resource-model-java/src/test/resources/klasseresource.json diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/ModelDeserializationSpec.groovy b/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/ModelDeserializationSpec.groovy index 81ba6c70..94d96782 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/ModelDeserializationSpec.groovy +++ b/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/ModelDeserializationSpec.groovy @@ -4,8 +4,8 @@ import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException import no.fint.model.resource.felles.PersonResource -import no.fint.model.resource.utdanning.elev.BasisgruppeResource -import no.fint.model.utdanning.elev.Basisgruppe +import no.fint.model.resource.utdanning.elev.KlasseResource +import no.fint.model.utdanning.elev.Klasse import spock.lang.Specification class ModelDeserializationSpec extends Specification { @@ -15,74 +15,70 @@ class ModelDeserializationSpec extends Specification { objectMapper = new ObjectMapper() } - def "Read Basisgruppe from basisgruppe.json"() { + def "Read Klasse from klasse.json"() { given: - def input = getClass().getResourceAsStream("/basisgruppe.json") + def input = getClass().getResourceAsStream("/klasse.json") when: - def result = objectMapper.readValue(input, Basisgruppe.class) + def result = objectMapper.readValue(input, Klasse.class) println(result) then: result - result.periode.start result.navn == "ABC123" } - def "Read BasisgruppeResource from basisgruppe.json"() { + def "Read KlasseResource from klasse.json"() { given: - def input = getClass().getResourceAsStream("/basisgruppe.json") + def input = getClass().getResourceAsStream("/klasse.json") when: - def result = objectMapper.readValue(input, BasisgruppeResource.class) + def result = objectMapper.readValue(input, KlasseResource.class) println(result) then: result - result.periode.start result.navn == "ABC123" } - def "Read Basisgruppe from basisgrupperesource.json"() { + def "Read Klasse from klasseresource.json"() { given: - def input = getClass().getResourceAsStream("/basisgrupperesource.json") + def input = getClass().getResourceAsStream("/klasseresource.json") when: - def result = objectMapper.readValue(input, Basisgruppe.class) + def result = objectMapper.readValue(input, Klasse.class) println(result) then: thrown(UnrecognizedPropertyException) } - def "Read Basisgruppe from basisgrupperesource.json with ObjectMapper config"() { + def "Read Klasse from klasseresource.json with ObjectMapper config"() { given: - def input = getClass().getResourceAsStream("/basisgrupperesource.json") + def input = getClass().getResourceAsStream("/klasseresource.json") objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); when: - def result = objectMapper.readValue(input, Basisgruppe.class) + def result = objectMapper.readValue(input, Klasse.class) println(result) then: result - result.periode.start result.navn == "ABC123" } - def "Read BasisgruppeResource from basisgrupperesource.json"() { + def "Read KlasseResource from klasseresource.json"() { given: - def input = getClass().getResourceAsStream("/basisgrupperesource.json") + def input = getClass().getResourceAsStream("/klasseresource.json") when: - def result = objectMapper.readValue(input, BasisgruppeResource.class) + def result = objectMapper.readValue(input, KlasseResource.class) println(result) then: result - result.periode.start result.navn == "ABC123" - result.links.size() == 1 + result.links.size() == 2 } def 'Empty Person JSON'() { diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/ModelSerializationSpec.groovy b/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/ModelSerializationSpec.groovy index 295fd035..bd3a8f89 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/ModelSerializationSpec.groovy +++ b/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/ModelSerializationSpec.groovy @@ -5,15 +5,12 @@ import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.databind.util.ISO8601DateFormat import groovy.json.JsonSlurper import no.fint.model.felles.kompleksedatatyper.Identifikator -import no.fint.model.felles.kompleksedatatyper.Periode import no.fint.model.resource.Link -import no.fint.model.resource.utdanning.elev.BasisgruppeResource -import no.fint.model.utdanning.elev.Basisgruppe -import no.fint.model.utdanning.elev.Medlemskap +import no.fint.model.resource.utdanning.elev.KlasseResource +import no.fint.model.utdanning.elev.Klasse +import no.fint.model.utdanning.elev.Klassemedlemskap import spock.lang.Specification -import java.util.concurrent.TimeUnit - class ModelSerializationSpec extends Specification { def objectMapper def jsonSlurper @@ -25,43 +22,41 @@ class ModelSerializationSpec extends Specification { jsonSlurper = new JsonSlurper() } - def "Serialize Basisgruppe without Links"() { + def "Serialize Klasse without Links"() { given: - def basisgruppe = new Basisgruppe( + def klasse = new Klasse( systemId: new Identifikator(identifikatorverdi: "ABC123"), - periode: [new Periode(start: new Date(), slutt: new Date(System.currentTimeMillis()+TimeUnit.DAYS.toMillis(365)))], - beskrivelse: "Basisgruppe 123", + beskrivelse: "Klasse 123", navn: "ABC123" ) when: - def result = objectMapper.writeValueAsString(basisgruppe) + def result = objectMapper.writeValueAsString(klasse) println(result) def object = jsonSlurper.parseText(result) then: object - object.periode.start + object.navn == "ABC123" } - def "Serialize BasisgruppeResource with links"() { + def "Serialize KlasseResource with links"() { given: - def basisgruppe = new BasisgruppeResource( + def klasse = new KlasseResource( systemId: new Identifikator(identifikatorverdi: "ABC123"), - periode: [new Periode(start: new Date(), slutt: new Date(System.currentTimeMillis()+TimeUnit.DAYS.toMillis(365)))], - beskrivelse: "Basisgruppe 123", + beskrivelse: "Klasse 123", navn: "ABC123" ) - basisgruppe.addMedlemskap(Link.with(Medlemskap.class, "systemid", "123")) + klasse.addKlassemedlemskap(Link.with(Klassemedlemskap.class, "systemid", "123")) when: - def result = objectMapper.writeValueAsString(basisgruppe) + def result = objectMapper.writeValueAsString(klasse) println(result) def object = jsonSlurper.parseText(result) then: object - object._links.medlemskap + object._links.klassemedlemskap } } diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/SpringModelDeserializationSpec.groovy b/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/SpringModelDeserializationSpec.groovy index f3543d55..278ba293 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/SpringModelDeserializationSpec.groovy +++ b/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/SpringModelDeserializationSpec.groovy @@ -2,11 +2,13 @@ package no.fint.test.model import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.ObjectMapper -import no.fint.model.utdanning.elev.Basisgruppe +import no.fint.model.felles.Person +import no.fint.model.utdanning.elev.Klasse import no.fint.test.model.utils.TestApplication import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest import org.springframework.hateoas.Resource +import org.springframework.hateoas.Resources import spock.lang.Specification @SpringBootTest(classes = TestApplication) @@ -15,36 +17,17 @@ class SpringModelDeserializationSpec extends Specification { @Autowired private ObjectMapper objectMapper - def "Read Resource from basisgrupperesource.json"() { + def "Read Resource from klasseresource.json"() { given: - def input = getClass().getResourceAsStream("/basisgrupperesource.json") + def input = getClass().getResourceAsStream("/klasseresource.json") when: - def result = objectMapper.readValue(input, new TypeReference>() {}) - println(result) + def result = objectMapper.readValue(input, new TypeReference>() {}) then: result - result.links.size() == 1 + result.links.size() == 3 result.content - result.content.periode.start result.content.navn == "ABC123" } - - /* - def "Read Resources from personresourceslinks json"() { - given: - def input = getClass().getResourceAsStream("/personresourceslinks.json") - - when: - def result = objectMapper.readValue(input, new TypeReference>() {}) - - then: - result - result.links.size() == 1 - result.content - result.content.bostedsadresse - result.content.postadresse - } - */ } diff --git a/fint-utdanning-resource-model-java/src/test/resources/basisgruppe.json b/fint-utdanning-resource-model-java/src/test/resources/basisgruppe.json deleted file mode 100644 index 2dc0f60f..00000000 --- a/fint-utdanning-resource-model-java/src/test/resources/basisgruppe.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "beskrivelse": "Basisgruppe 123", - "navn": "ABC123", - "periode": [ - { - "beskrivelse": "BG 123", - "slutt": "2019-04-17T13:47:48Z", - "start": "2018-04-17T13:47:48Z" - } - ], - "systemId": { - "identifikatorverdi": "ABC123" - } -} diff --git a/fint-utdanning-resource-model-java/src/test/resources/basisgrupperesource.json b/fint-utdanning-resource-model-java/src/test/resources/basisgrupperesource.json deleted file mode 100644 index 6071c012..00000000 --- a/fint-utdanning-resource-model-java/src/test/resources/basisgrupperesource.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "beskrivelse": "Basisgruppe 123", - "navn": "ABC123", - "periode": [ - { - "beskrivelse": "BG 123", - "slutt": "2019-04-17T13:47:49Z", - "start": "2018-04-17T13:47:49Z" - } - ], - "systemId": { - "identifikatorverdi": "ABC123" - }, - "_links": { - "medlemskap": [ - { - "href": "${utdanning.elev.medlemskap}/systemid/123" - } - ] - } -} diff --git a/fint-utdanning-resource-model-java/src/test/resources/klasse.json b/fint-utdanning-resource-model-java/src/test/resources/klasse.json new file mode 100644 index 00000000..826a5877 --- /dev/null +++ b/fint-utdanning-resource-model-java/src/test/resources/klasse.json @@ -0,0 +1,7 @@ +{ + "beskrivelse": "Basisgruppe 123", + "navn": "ABC123", + "systemId": { + "identifikatorverdi": "ABC123" + } +} diff --git a/fint-utdanning-resource-model-java/src/test/resources/klasseresource.json b/fint-utdanning-resource-model-java/src/test/resources/klasseresource.json new file mode 100644 index 00000000..c9f54354 --- /dev/null +++ b/fint-utdanning-resource-model-java/src/test/resources/klasseresource.json @@ -0,0 +1,22 @@ +{ + "beskrivelse": "Basisgruppe 123", + "navn": "ABC123", + "systemId": { + "identifikatorverdi": "ABC123" + }, + "_links": { + "skolear": [ + { + "href": "${utdanning.kodeverk.skolear}/skolear/systemid/139590" + } + ], + "termin": [ + { + "href": "${utdanning.kodeverk.termin}/termin/systemid/268360" + }, + { + "href": "${utdanning.kodeverk.termin}/termin/systemid/268361" + } + ] + } +} From a7ed3fb0990a0be35e3b57091b25f1ca9905dbf7 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Mon, 2 Jun 2025 23:40:21 +0200 Subject: [PATCH 04/24] Upgraded Gradle + no.fint -> no.novari --- .gitignore | 1 + build.gradle | 21 +++++--- fint-administrasjon-model-java/build.gradle | 6 +-- .../build.gradle | 16 +++--- .../model/ModelDeserializationSpec.groovy | 8 +-- .../test/model/ModelSerializationSpec.groovy | 21 ++++---- .../SpringModelDeserializationSpec.groovy | 12 ++--- .../test/model/utils/TestApplication.java | 2 +- .../test/model/utils/TestConfiguration.java | 20 ++++++++ fint-arkiv-model-java/build.gradle | 6 +-- fint-arkiv-resource-model-java/build.gradle | 16 +++--- .../model/arkiv/test/ModelSpec.groovy | 4 +- fint-felles-model-java/build.gradle | 2 +- fint-felles-resource-model-java/build.gradle | 15 +++--- .../model/ModelDeserializationSpec.groovy | 50 +++++++++---------- .../test/model/ModelSerializationSpec.groovy | 18 +++---- .../SpringModelDeserializationSpec.groovy | 20 ++++---- .../test/model/utils/TestApplication.java | 4 +- .../test/model/utils/TestConfiguration.java | 20 ++++++++ fint-okonomi-model-java/build.gradle | 2 +- fint-okonomi-resource-model-java/build.gradle | 4 +- fint-personvern-model-java/build.gradle | 6 +-- .../build.gradle | 4 +- fint-ressurs-model-java/build.gradle | 6 +-- fint-ressurs-resource-model-java/build.gradle | 16 +++--- fint-utdanning-model-java/build.gradle | 6 +-- .../build.gradle | 16 +++--- .../model/ModelDeserializationSpec.groovy | 8 +-- .../test/model/ModelSerializationSpec.groovy | 12 ++--- .../SpringModelDeserializationSpec.groovy | 14 +++--- .../test/model/utils/TestApplication.java | 4 +- .../test/model/utils/TestConfiguration.java | 20 ++++++++ gradle.properties | 3 ++ gradle/wrapper/gradle-wrapper.properties | 2 +- 34 files changed, 228 insertions(+), 157 deletions(-) rename fint-administrasjon-resource-model-java/src/test/groovy/no/{fint => novari}/test/model/ModelDeserializationSpec.groovy (95%) rename fint-administrasjon-resource-model-java/src/test/groovy/no/{fint => novari}/test/model/ModelSerializationSpec.groovy (84%) rename fint-administrasjon-resource-model-java/src/test/groovy/no/{fint => novari}/test/model/SpringModelDeserializationSpec.groovy (80%) rename {fint-felles-resource-model-java/src/test/groovy/no/fint => fint-administrasjon-resource-model-java/src/test/groovy/no/novari}/test/model/utils/TestApplication.java (88%) create mode 100644 fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java rename fint-arkiv-resource-model-java/src/test/groovy/no/{fint => novari}/model/arkiv/test/ModelSpec.groovy (84%) rename fint-felles-resource-model-java/src/test/groovy/no/{fint => novari}/test/model/ModelDeserializationSpec.groovy (65%) rename fint-felles-resource-model-java/src/test/groovy/no/{fint => novari}/test/model/ModelSerializationSpec.groovy (87%) rename fint-felles-resource-model-java/src/test/groovy/no/{fint => novari}/test/model/SpringModelDeserializationSpec.groovy (68%) rename {fint-utdanning-resource-model-java/src/test/groovy/no/fint => fint-felles-resource-model-java/src/test/groovy/no/novari}/test/model/utils/TestApplication.java (68%) create mode 100644 fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java rename fint-utdanning-resource-model-java/src/test/groovy/no/{fint => novari}/test/model/ModelDeserializationSpec.groovy (92%) rename fint-utdanning-resource-model-java/src/test/groovy/no/{fint => novari}/test/model/ModelSerializationSpec.groovy (84%) rename fint-utdanning-resource-model-java/src/test/groovy/no/{fint => novari}/test/model/SpringModelDeserializationSpec.groovy (68%) rename {fint-administrasjon-resource-model-java/src/test/groovy/no/fint => fint-utdanning-resource-model-java/src/test/groovy/no/novari}/test/model/utils/TestApplication.java (68%) create mode 100644 fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java diff --git a/.gitignore b/.gitignore index 56613c68..00b35b5a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ bin/ *.ipr *.iml .vscode/ +.java-version \ No newline at end of file diff --git a/build.gradle b/build.gradle index 7cb0d4cf..6f7dbc75 100644 --- a/build.gradle +++ b/build.gradle @@ -6,13 +6,16 @@ apply plugin: 'java-library' apply plugin: 'maven-publish' allprojects { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } + } - project.group = 'no.fint' + project.group = 'no.novari' repositories { - maven { url 'https://repo.fintlabs.no/releases' } + maven { url = 'https://repo.fintlabs.no/releases' } mavenLocal() mavenCentral() } @@ -22,12 +25,18 @@ subprojects { apply plugin: 'java-library' apply plugin: 'groovy' apply plugin: 'maven-publish' - apply from: 'https://raw.githubusercontent.com/FINTLabs/fint-buildscripts/v1.8.0/dependencies.gradle' + + configurations { + annotationProcessor + } dependencies { + annotationProcessor("org.projectlombok:lombok:${lombokVersion}") compileOnly("org.projectlombok:lombok:${lombokVersion}") implementation("com.fasterxml.jackson.core:jackson-annotations:2.13.3") implementation("com.fasterxml.jackson.core:jackson-core:2.13.3") + implementation("javax.validation:validation-api:2.0.1.Final") + implementation("org.hibernate.validator:hibernate-validator:6.0.23.Final") } test { @@ -39,7 +48,7 @@ subprojects { publishing { repositories { maven { - url "https://repo.fintlabs.no/releases" + url = "https://repo.fintlabs.no/releases" credentials { username = System.getenv("REPOSILITE_USERNAME") password = System.getenv("REPOSILITE_PASSWORD") diff --git a/fint-administrasjon-model-java/build.gradle b/fint-administrasjon-model-java/build.gradle index 9d0d85f2..a820ba07 100644 --- a/fint-administrasjon-model-java/build.gradle +++ b/fint-administrasjon-model-java/build.gradle @@ -1,3 +1,3 @@ -dependencies { - compile project(":fint-felles-model-java") -} +dependencies { + api project(":fint-felles-model-java") +} diff --git a/fint-administrasjon-resource-model-java/build.gradle b/fint-administrasjon-resource-model-java/build.gradle index 10ee9e40..8323835d 100644 --- a/fint-administrasjon-resource-model-java/build.gradle +++ b/fint-administrasjon-resource-model-java/build.gradle @@ -1,11 +1,11 @@ dependencies { - compile project(":fint-administrasjon-model-java") - compile project(":fint-felles-resource-model-java") + api project(":fint-administrasjon-model-java") + api project(":fint-felles-resource-model-java") - testCompile("org.spockframework:spock-core:${spockSpringVersion}") - testCompile("org.spockframework:spock-spring:${spockSpringVersion}") - testCompile("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") - testCompile("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") - testCompile('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') - testCompile('org.springframework.hateoas:spring-hateoas:0.24.0.RELEASE') + testImplementation("org.spockframework:spock-core:${spockSpringVersion}") + testImplementation("org.spockframework:spock-spring:${spockSpringVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") + testImplementation("org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE") + testImplementation("org.springframework.hateoas:spring-hateoas:0.25.1.RELEASE") } diff --git a/fint-administrasjon-resource-model-java/src/test/groovy/no/fint/test/model/ModelDeserializationSpec.groovy b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy similarity index 95% rename from fint-administrasjon-resource-model-java/src/test/groovy/no/fint/test/model/ModelDeserializationSpec.groovy rename to fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy index 178d53d9..73c99f65 100644 --- a/fint-administrasjon-resource-model-java/src/test/groovy/no/fint/test/model/ModelDeserializationSpec.groovy +++ b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy @@ -1,11 +1,11 @@ -package no.fint.test.model +package no.novari.test.model import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException -import no.fint.model.administrasjon.personal.Fastlonn -import no.fint.model.resource.administrasjon.personal.FastlonnResource -import no.fint.model.resource.administrasjon.personal.FastlonnResources +import no.novari.model.administrasjon.personal.Fastlonn +import no.novari.model.resource.administrasjon.personal.FastlonnResource +import no.novari.model.resource.administrasjon.personal.FastlonnResources import spock.lang.Specification class ModelDeserializationSpec extends Specification { diff --git a/fint-administrasjon-resource-model-java/src/test/groovy/no/fint/test/model/ModelSerializationSpec.groovy b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy similarity index 84% rename from fint-administrasjon-resource-model-java/src/test/groovy/no/fint/test/model/ModelSerializationSpec.groovy rename to fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy index aabf7e58..7d3e24a8 100644 --- a/fint-administrasjon-resource-model-java/src/test/groovy/no/fint/test/model/ModelSerializationSpec.groovy +++ b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy @@ -1,16 +1,16 @@ -package no.fint.test.model +package no.novari.test.model import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.databind.util.ISO8601DateFormat import groovy.json.JsonSlurper -import no.fint.model.administrasjon.kompleksedatatyper.Kontostreng -import no.fint.model.administrasjon.personal.Fastlonn -import no.fint.model.felles.kompleksedatatyper.Identifikator -import no.fint.model.felles.kompleksedatatyper.Periode -import no.fint.model.resource.Link -import no.fint.model.resource.administrasjon.kompleksedatatyper.KontostrengResource -import no.fint.model.resource.administrasjon.personal.FastlonnResource +import no.novari.model.administrasjon.kompleksedatatyper.Kontostreng +import no.novari.model.administrasjon.personal.Fastlonn +import no.novari.model.felles.kompleksedatatyper.Identifikator +import no.novari.model.felles.kompleksedatatyper.Periode +import no.novari.model.resource.Link +import no.novari.model.resource.administrasjon.kompleksedatatyper.KontostrengResource +import no.novari.model.resource.administrasjon.personal.FastlonnResource import spock.lang.Specification class ModelSerializationSpec extends Specification { @@ -64,6 +64,7 @@ class ModelSerializationSpec extends Specification { then: object + object.prosent object._links.arbeidsforhold } @@ -91,9 +92,11 @@ class ModelSerializationSpec extends Specification { then: object + object.prosent object._links.arbeidsforhold object._links.lonnsart object.kontostreng._links.art + object.kontostreng._links.ansvar + object.kontostreng._links.funksjon } - } diff --git a/fint-administrasjon-resource-model-java/src/test/groovy/no/fint/test/model/SpringModelDeserializationSpec.groovy b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy similarity index 80% rename from fint-administrasjon-resource-model-java/src/test/groovy/no/fint/test/model/SpringModelDeserializationSpec.groovy rename to fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy index 8c7b8a65..33ed20f5 100644 --- a/fint-administrasjon-resource-model-java/src/test/groovy/no/fint/test/model/SpringModelDeserializationSpec.groovy +++ b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy @@ -1,14 +1,12 @@ -package no.fint.test.model +package no.novari.test.model import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.ObjectMapper -import no.fint.model.administrasjon.personal.Fastlonn -import no.fint.model.felles.Person -import no.fint.test.model.utils.TestApplication +import no.novari.model.administrasjon.personal.Fastlonn +import no.novari.test.model.utils.TestApplication import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest import org.springframework.hateoas.Resource -import org.springframework.hateoas.Resources import spock.lang.Specification @SpringBootTest(classes = TestApplication) @@ -17,9 +15,9 @@ class SpringModelDeserializationSpec extends Specification { @Autowired private ObjectMapper objectMapper - def "Read Resource from fastlonnresourcelinks.json"() { + def "Read Resource from fastlonnresourcelinks"() { given: - def input = getClass().getResourceAsStream("/fastlonnresourcelinks.json") + def input = getClass().getClassLoader().getResourceAsStream("fastlonnresourcelinks.json") when: def result = objectMapper.readValue(input, new TypeReference>() {}) diff --git a/fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/utils/TestApplication.java b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java similarity index 88% rename from fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/utils/TestApplication.java rename to fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java index 2db1a43a..5efe57bc 100644 --- a/fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/utils/TestApplication.java +++ b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java @@ -1,4 +1,4 @@ -package no.fint.test.model.utils; +package no.novari.test.model.utils; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.hateoas.config.EnableHypermediaSupport; diff --git a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java new file mode 100644 index 00000000..1395b189 --- /dev/null +++ b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java @@ -0,0 +1,20 @@ +package no.novari.test.model.utils; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.hateoas.hal.Jackson2HalModule; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; + +@Configuration +public class TestConfiguration { + + @Bean + @Primary + public ObjectMapper objectMapper() { + return Jackson2ObjectMapperBuilder.json() + .modules(new Jackson2HalModule()) + .build(); + } +} diff --git a/fint-arkiv-model-java/build.gradle b/fint-arkiv-model-java/build.gradle index 9d0d85f2..a820ba07 100644 --- a/fint-arkiv-model-java/build.gradle +++ b/fint-arkiv-model-java/build.gradle @@ -1,3 +1,3 @@ -dependencies { - compile project(":fint-felles-model-java") -} +dependencies { + api project(":fint-felles-model-java") +} diff --git a/fint-arkiv-resource-model-java/build.gradle b/fint-arkiv-resource-model-java/build.gradle index 14e6850c..dbd53b40 100644 --- a/fint-arkiv-resource-model-java/build.gradle +++ b/fint-arkiv-resource-model-java/build.gradle @@ -1,12 +1,10 @@ dependencies { - compile project(":fint-arkiv-model-java") - compile project(":fint-felles-resource-model-java") - - testCompile("org.spockframework:spock-core:${spockSpringVersion}") - testCompile("org.spockframework:spock-spring:${spockSpringVersion}") - testCompile("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") - testCompile("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") - testCompile('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') - testCompile('org.springframework.hateoas:spring-hateoas:0.24.0.RELEASE') + api project(":fint-arkiv-model-java") + api project(":fint-felles-resource-model-java") + testImplementation("org.spockframework:spock-core:${spockSpringVersion}") + testImplementation("org.spockframework:spock-spring:${spockSpringVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") + testImplementation('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') } diff --git a/fint-arkiv-resource-model-java/src/test/groovy/no/fint/model/arkiv/test/ModelSpec.groovy b/fint-arkiv-resource-model-java/src/test/groovy/no/novari/model/arkiv/test/ModelSpec.groovy similarity index 84% rename from fint-arkiv-resource-model-java/src/test/groovy/no/fint/model/arkiv/test/ModelSpec.groovy rename to fint-arkiv-resource-model-java/src/test/groovy/no/novari/model/arkiv/test/ModelSpec.groovy index 4a40b839..5ed24d01 100644 --- a/fint-arkiv-resource-model-java/src/test/groovy/no/fint/model/arkiv/test/ModelSpec.groovy +++ b/fint-arkiv-resource-model-java/src/test/groovy/no/novari/model/arkiv/test/ModelSpec.groovy @@ -1,7 +1,7 @@ -package no.fint.model.arkiv.test +package no.novari.model.arkiv.test import com.fasterxml.jackson.databind.ObjectMapper -import no.fint.model.resource.arkiv.kulturminnevern.TilskuddFartoyResource +import no.novari.model.resource.arkiv.kulturminnevern.TilskuddFartoyResource import spock.lang.Specification class ModelSpec extends Specification { diff --git a/fint-felles-model-java/build.gradle b/fint-felles-model-java/build.gradle index e6c34504..d85335c3 100644 --- a/fint-felles-model-java/build.gradle +++ b/fint-felles-model-java/build.gradle @@ -1,3 +1,3 @@ dependencies { - compile('no.fintlabs:fint-model-core:0.5.0') + api('no.novari:fint-model-core:1.0.0-rc-1') } diff --git a/fint-felles-resource-model-java/build.gradle b/fint-felles-resource-model-java/build.gradle index c6d5ac2b..2594220b 100644 --- a/fint-felles-resource-model-java/build.gradle +++ b/fint-felles-resource-model-java/build.gradle @@ -1,11 +1,10 @@ dependencies { - compile project(":fint-felles-model-java") - compile('no.fintlabs:fint-model-resource:0.5.0') + api project(":fint-felles-model-java") + api('no.novari:fint-model-resource:1.0.0-rc-2') - testCompile("org.spockframework:spock-core:${spockSpringVersion}") - testCompile("org.spockframework:spock-spring:${spockSpringVersion}") - testCompile("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") - testCompile("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") - testCompile('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') - testCompile('org.springframework.hateoas:spring-hateoas:0.24.0.RELEASE') + testImplementation("org.spockframework:spock-spring:${spockSpringVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") + testImplementation('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') + testImplementation('org.springframework.hateoas:spring-hateoas:0.25.1.RELEASE') } diff --git a/fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/ModelDeserializationSpec.groovy b/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy similarity index 65% rename from fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/ModelDeserializationSpec.groovy rename to fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy index 21029331..cd58bbdd 100644 --- a/fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/ModelDeserializationSpec.groovy +++ b/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy @@ -1,14 +1,13 @@ -package no.fint.test.model +package no.novari.test.model import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException -import no.fint.model.felles.Person -import no.fint.model.resource.felles.KontaktpersonResource -import no.fint.model.resource.felles.PersonResource -import no.fint.model.resource.felles.PersonResources +import no.novari.model.felles.Person +import no.novari.model.resource.felles.KontaktpersonResource +import no.novari.model.resource.felles.PersonResource +import no.novari.model.resource.felles.PersonResources -//import no.fint.model.resource.felles.PersonResources import spock.lang.Specification class ModelDeserializationSpec extends Specification { @@ -20,23 +19,30 @@ class ModelDeserializationSpec extends Specification { def "Read Person from person.json"() { given: - def input = getClass().getResourceAsStream("/person.json") + def input = getClass().getClassLoader().getResourceAsStream("person.json") when: def result = objectMapper.readValue(input, Person.class) - println(result) then: result + result.fodselsnummer + result.fodselsnummer.identifikatorverdi == "12345678901" + result.navn + result.navn.fornavn == "Tore" + result.navn.etternavn == "Test" + result.fodselsdato + result.bostedsadresse + result.bostedsadresse.adresselinje.size() == 1 + result.bostedsadresse.adresselinje[0] == "Storgata 12" } def "Read PersonResource from person.json"() { given: - def input = getClass().getResourceAsStream("/person.json") + def input = getClass().getClassLoader().getResourceAsStream("person.json") when: def result = objectMapper.readValue(input, PersonResource.class) - println(result) then: result @@ -44,11 +50,10 @@ class ModelDeserializationSpec extends Specification { def "Read Person from personresource.json"() { given: - def input = getClass().getResourceAsStream("/personresource.json") + def input = getClass().getClassLoader().getResourceAsStream("personresource.json") when: def result = objectMapper.readValue(input, Person.class) - println(result) then: thrown(UnrecognizedPropertyException) @@ -56,12 +61,11 @@ class ModelDeserializationSpec extends Specification { def "Read Person from personresource.json with ObjectMapper config"() { given: - def input = getClass().getResourceAsStream("/personresource.json") + def input = getClass().getClassLoader().getResourceAsStream("personresource.json") objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); when: def result = objectMapper.readValue(input, Person.class) - println(result) then: result @@ -69,11 +73,10 @@ class ModelDeserializationSpec extends Specification { def "Read PersonResource from personresource.json"() { given: - def input = getClass().getResourceAsStream("/personresource.json") + def input = getClass().getClassLoader().getResourceAsStream("personresource.json") when: def result = objectMapper.readValue(input, PersonResource.class) - println(result) then: result @@ -82,11 +85,10 @@ class ModelDeserializationSpec extends Specification { def "Read Person from personresourcelinks.json"() { given: - def input = getClass().getResourceAsStream("/personresourcelinks.json") + def input = getClass().getClassLoader().getResourceAsStream("personresourcelinks.json") when: def result = objectMapper.readValue(input, Person.class) - println(result) then: thrown(UnrecognizedPropertyException) @@ -94,12 +96,11 @@ class ModelDeserializationSpec extends Specification { def "Read Person from personresourcelinks.json with ObjectMapper config"() { given: - def input = getClass().getResourceAsStream("/personresourcelinks.json") + def input = getClass().getClassLoader().getResourceAsStream("personresourcelinks.json") objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); when: def result = objectMapper.readValue(input, Person.class) - println(result) then: result @@ -107,11 +108,10 @@ class ModelDeserializationSpec extends Specification { def "Read PersonResource from personresourcelinks.json"() { given: - def input = getClass().getResourceAsStream("/personresourcelinks.json") + def input = getClass().getClassLoader().getResourceAsStream("personresourcelinks.json") when: def result = objectMapper.readValue(input, PersonResource.class) - println(result) then: result @@ -121,11 +121,10 @@ class ModelDeserializationSpec extends Specification { def "Read PersonResources from personresourceslinks.json"() { given: - def input = getClass().getResourceAsStream("/personresourceslinks.json") + def input = getClass().getClassLoader().getResourceAsStream("personresourceslinks.json") when: def result = objectMapper.readValue(input, PersonResources.class) - println(result) then: result @@ -137,11 +136,10 @@ class ModelDeserializationSpec extends Specification { def "Read KontaktpersonResource from kontaktpersonresource.json"() { given: - def input = getClass().getResourceAsStream("/kontaktpersonresource.json") + def input = getClass().getClassLoader().getResourceAsStream("kontaktpersonresource.json") when: def result = objectMapper.readValue(input, KontaktpersonResource) - println(result) then: result diff --git a/fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/ModelSerializationSpec.groovy b/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy similarity index 87% rename from fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/ModelSerializationSpec.groovy rename to fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy index 1f21aeb2..ffe5d205 100644 --- a/fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/ModelSerializationSpec.groovy +++ b/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy @@ -1,15 +1,15 @@ -package no.fint.test.model +package no.novari.test.model import com.fasterxml.jackson.databind.ObjectMapper import groovy.json.JsonSlurper -import no.fint.model.felles.Person -import no.fint.model.felles.kompleksedatatyper.Adresse -import no.fint.model.felles.kompleksedatatyper.Identifikator -import no.fint.model.felles.kompleksedatatyper.Personnavn -import no.fint.model.resource.Link -import no.fint.model.resource.felles.KontaktpersonResource -import no.fint.model.resource.felles.PersonResource -import no.fint.model.resource.felles.kompleksedatatyper.AdresseResource +import no.novari.model.felles.Person +import no.novari.model.felles.kompleksedatatyper.Adresse +import no.novari.model.felles.kompleksedatatyper.Identifikator +import no.novari.model.felles.kompleksedatatyper.Personnavn +import no.novari.model.resource.Link +import no.novari.model.resource.felles.KontaktpersonResource +import no.novari.model.resource.felles.PersonResource +import no.novari.model.resource.felles.kompleksedatatyper.AdresseResource import spock.lang.Specification class ModelSerializationSpec extends Specification { diff --git a/fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/SpringModelDeserializationSpec.groovy b/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy similarity index 68% rename from fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/SpringModelDeserializationSpec.groovy rename to fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy index fa2ca691..18fe8448 100644 --- a/fint-felles-resource-model-java/src/test/groovy/no/fint/test/model/SpringModelDeserializationSpec.groovy +++ b/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy @@ -1,9 +1,9 @@ -package no.fint.test.model +package no.novari.test.model import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.ObjectMapper -import no.fint.model.felles.Person -import no.fint.test.model.utils.TestApplication +import no.novari.model.felles.Person +import no.novari.test.model.utils.TestApplication import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest import org.springframework.hateoas.Resource @@ -12,14 +12,13 @@ import spock.lang.Specification @SpringBootTest(classes = TestApplication) class SpringModelDeserializationSpec extends Specification { - @Autowired private ObjectMapper objectMapper def "Read Resource from personresourcelinks json"() { given: - def input = getClass().getResourceAsStream("/personresourcelinks.json") - + def input = getClass().getClassLoader().getResourceAsStream("personresourcelinks.json") + when: def result = objectMapper.readValue(input, new TypeReference>() {}) @@ -33,7 +32,7 @@ class SpringModelDeserializationSpec extends Specification { def "Read Resources from personresourceslinks json"() { given: - def input = getClass().getResourceAsStream("/personresourceslinks.json") + def input = getClass().getClassLoader().getResourceAsStream("personresourceslinks.json") when: def result = objectMapper.readValue(input, new TypeReference>() {}) @@ -41,8 +40,9 @@ class SpringModelDeserializationSpec extends Specification { then: result result.links.size() == 1 - result.content - result.content.bostedsadresse - result.content.postadresse + result.content.size() == 1 + result.content[0].bostedsadresse.adresselinje[0] == "Storgata 12" + result.content[0].navn.fornavn == "Tore" + result.content[0].navn.etternavn == "Test" } } diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/utils/TestApplication.java b/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java similarity index 68% rename from fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/utils/TestApplication.java rename to fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java index 2db1a43a..283b3b72 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/utils/TestApplication.java +++ b/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java @@ -1,9 +1,11 @@ -package no.fint.test.model.utils; +package no.novari.test.model.utils; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.hateoas.config.EnableHypermediaSupport; +import org.springframework.context.annotation.Import; @EnableHypermediaSupport(type = EnableHypermediaSupport.HypermediaType.HAL) @SpringBootApplication +@Import(TestConfiguration.class) public class TestApplication { } diff --git a/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java b/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java new file mode 100644 index 00000000..1395b189 --- /dev/null +++ b/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java @@ -0,0 +1,20 @@ +package no.novari.test.model.utils; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.hateoas.hal.Jackson2HalModule; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; + +@Configuration +public class TestConfiguration { + + @Bean + @Primary + public ObjectMapper objectMapper() { + return Jackson2ObjectMapperBuilder.json() + .modules(new Jackson2HalModule()) + .build(); + } +} diff --git a/fint-okonomi-model-java/build.gradle b/fint-okonomi-model-java/build.gradle index 5fd6471f..e2905031 100644 --- a/fint-okonomi-model-java/build.gradle +++ b/fint-okonomi-model-java/build.gradle @@ -1,3 +1,3 @@ dependencies { - compile project(":fint-administrasjon-model-java") + api project(":fint-administrasjon-model-java") } diff --git a/fint-okonomi-resource-model-java/build.gradle b/fint-okonomi-resource-model-java/build.gradle index b953a48d..2c21c745 100644 --- a/fint-okonomi-resource-model-java/build.gradle +++ b/fint-okonomi-resource-model-java/build.gradle @@ -1,4 +1,4 @@ dependencies { - compile project(":fint-okonomi-model-java") - compile project(":fint-administrasjon-resource-model-java") + api project(":fint-okonomi-model-java") + api project(":fint-administrasjon-resource-model-java") } diff --git a/fint-personvern-model-java/build.gradle b/fint-personvern-model-java/build.gradle index 9d0d85f2..a820ba07 100644 --- a/fint-personvern-model-java/build.gradle +++ b/fint-personvern-model-java/build.gradle @@ -1,3 +1,3 @@ -dependencies { - compile project(":fint-felles-model-java") -} +dependencies { + api project(":fint-felles-model-java") +} diff --git a/fint-personvern-resource-model-java/build.gradle b/fint-personvern-resource-model-java/build.gradle index 2fa1198e..a4962191 100644 --- a/fint-personvern-resource-model-java/build.gradle +++ b/fint-personvern-resource-model-java/build.gradle @@ -1,4 +1,4 @@ dependencies { - compile project(":fint-personvern-model-java") - compile project(":fint-felles-resource-model-java") + api project(":fint-personvern-model-java") + api project(":fint-felles-resource-model-java") } diff --git a/fint-ressurs-model-java/build.gradle b/fint-ressurs-model-java/build.gradle index 9d0d85f2..a820ba07 100644 --- a/fint-ressurs-model-java/build.gradle +++ b/fint-ressurs-model-java/build.gradle @@ -1,3 +1,3 @@ -dependencies { - compile project(":fint-felles-model-java") -} +dependencies { + api project(":fint-felles-model-java") +} diff --git a/fint-ressurs-resource-model-java/build.gradle b/fint-ressurs-resource-model-java/build.gradle index 88a3fed5..18c86bfd 100644 --- a/fint-ressurs-resource-model-java/build.gradle +++ b/fint-ressurs-resource-model-java/build.gradle @@ -1,11 +1,11 @@ dependencies { - compile project(":fint-ressurs-model-java") - compile project(":fint-felles-resource-model-java") + api project(":fint-ressurs-model-java") + api project(":fint-felles-resource-model-java") - testCompile("org.spockframework:spock-core:${spockSpringVersion}") - testCompile("org.spockframework:spock-spring:${spockSpringVersion}") - testCompile("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") - testCompile("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") - testCompile('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') - testCompile('org.springframework.hateoas:spring-hateoas:0.24.0.RELEASE') + testImplementation("org.spockframework:spock-core:${spockSpringVersion}") + testImplementation("org.spockframework:spock-spring:${spockSpringVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") + testImplementation('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') + testImplementation('org.springframework.hateoas:spring-hateoas:0.25.1.RELEASE') } diff --git a/fint-utdanning-model-java/build.gradle b/fint-utdanning-model-java/build.gradle index 9d0d85f2..a820ba07 100644 --- a/fint-utdanning-model-java/build.gradle +++ b/fint-utdanning-model-java/build.gradle @@ -1,3 +1,3 @@ -dependencies { - compile project(":fint-felles-model-java") -} +dependencies { + api project(":fint-felles-model-java") +} diff --git a/fint-utdanning-resource-model-java/build.gradle b/fint-utdanning-resource-model-java/build.gradle index d9cde4bb..c8ff68a7 100644 --- a/fint-utdanning-resource-model-java/build.gradle +++ b/fint-utdanning-resource-model-java/build.gradle @@ -1,11 +1,11 @@ dependencies { - compile project(":fint-utdanning-model-java") - compile project(":fint-felles-resource-model-java") + api project(":fint-utdanning-model-java") + api project(":fint-felles-resource-model-java") - testCompile("org.spockframework:spock-core:${spockSpringVersion}") - testCompile("org.spockframework:spock-spring:${spockSpringVersion}") - testCompile("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") - testCompile("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") - testCompile('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') - testCompile('org.springframework.hateoas:spring-hateoas:0.24.0.RELEASE') + testImplementation("org.spockframework:spock-core:${spockSpringVersion}") + testImplementation("org.spockframework:spock-spring:${spockSpringVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") + testImplementation('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') + testImplementation('org.springframework.hateoas:spring-hateoas:0.25.1.RELEASE') } diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/ModelDeserializationSpec.groovy b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy similarity index 92% rename from fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/ModelDeserializationSpec.groovy rename to fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy index 94d96782..51687658 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/ModelDeserializationSpec.groovy +++ b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy @@ -1,11 +1,11 @@ -package no.fint.test.model +package no.novari.test.model import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException -import no.fint.model.resource.felles.PersonResource -import no.fint.model.resource.utdanning.elev.KlasseResource -import no.fint.model.utdanning.elev.Klasse +import no.novari.model.resource.felles.PersonResource +import no.novari.model.resource.utdanning.elev.KlasseResource +import no.novari.model.utdanning.elev.Klasse import spock.lang.Specification class ModelDeserializationSpec extends Specification { diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/ModelSerializationSpec.groovy b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy similarity index 84% rename from fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/ModelSerializationSpec.groovy rename to fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy index bd3a8f89..1bfcfe3e 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/ModelSerializationSpec.groovy +++ b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy @@ -1,14 +1,14 @@ -package no.fint.test.model +package no.novari.test.model import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.databind.util.ISO8601DateFormat import groovy.json.JsonSlurper -import no.fint.model.felles.kompleksedatatyper.Identifikator -import no.fint.model.resource.Link -import no.fint.model.resource.utdanning.elev.KlasseResource -import no.fint.model.utdanning.elev.Klasse -import no.fint.model.utdanning.elev.Klassemedlemskap +import no.novari.model.felles.kompleksedatatyper.Identifikator +import no.novari.model.resource.Link +import no.novari.model.resource.utdanning.elev.KlasseResource +import no.novari.model.utdanning.elev.Klasse +import no.novari.model.utdanning.elev.Klassemedlemskap import spock.lang.Specification class ModelSerializationSpec extends Specification { diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/SpringModelDeserializationSpec.groovy b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy similarity index 68% rename from fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/SpringModelDeserializationSpec.groovy rename to fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy index 278ba293..cabb463d 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/fint/test/model/SpringModelDeserializationSpec.groovy +++ b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy @@ -1,14 +1,12 @@ -package no.fint.test.model +package no.novari.test.model import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.ObjectMapper -import no.fint.model.felles.Person -import no.fint.model.utdanning.elev.Klasse -import no.fint.test.model.utils.TestApplication +import no.novari.model.utdanning.elev.Klasse +import no.novari.test.model.utils.TestApplication import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest import org.springframework.hateoas.Resource -import org.springframework.hateoas.Resources import spock.lang.Specification @SpringBootTest(classes = TestApplication) @@ -17,10 +15,10 @@ class SpringModelDeserializationSpec extends Specification { @Autowired private ObjectMapper objectMapper - def "Read Resource from klasseresource.json"() { + def "Read Resource from klasseresource json"() { given: - def input = getClass().getResourceAsStream("/klasseresource.json") - + def input = getClass().getClassLoader().getResourceAsStream("klasseresource.json") + when: def result = objectMapper.readValue(input, new TypeReference>() {}) diff --git a/fint-administrasjon-resource-model-java/src/test/groovy/no/fint/test/model/utils/TestApplication.java b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java similarity index 68% rename from fint-administrasjon-resource-model-java/src/test/groovy/no/fint/test/model/utils/TestApplication.java rename to fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java index 2db1a43a..e1f3756b 100644 --- a/fint-administrasjon-resource-model-java/src/test/groovy/no/fint/test/model/utils/TestApplication.java +++ b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java @@ -1,9 +1,11 @@ -package no.fint.test.model.utils; +package no.novari.test.model.utils; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Import; import org.springframework.hateoas.config.EnableHypermediaSupport; @EnableHypermediaSupport(type = EnableHypermediaSupport.HypermediaType.HAL) @SpringBootApplication +@Import(TestConfiguration.class) public class TestApplication { } diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java new file mode 100644 index 00000000..1395b189 --- /dev/null +++ b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java @@ -0,0 +1,20 @@ +package no.novari.test.model.utils; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.hateoas.hal.Jackson2HalModule; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; + +@Configuration +public class TestConfiguration { + + @Bean + @Primary + public ObjectMapper objectMapper() { + return Jackson2ObjectMapperBuilder.json() + .modules(new Jackson2HalModule()) + .build(); + } +} diff --git a/gradle.properties b/gradle.properties index cddfa6b2..390f98c6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,4 @@ version=3.19.0 +springBootVersion=2.7.12 +lombokVersion=1.18.30 +spockSpringVersion=1.2-groovy-2.4 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae45383b..77c0b4f0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 1ad9f214d4abcb702410f8a9fb06bbe1ec963e9e Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Tue, 16 Sep 2025 15:39:28 +0200 Subject: [PATCH 05/24] Build with Java 11, compatible with Java 8 --- build.gradle | 8 +++++--- fint-administrasjon-resource-model-java/build.gradle | 3 +++ fint-felles-model-java/build.gradle | 2 +- fint-felles-resource-model-java/build.gradle | 2 +- gradle.properties | 6 ++++-- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 6f7dbc75..bc729935 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,9 @@ apply plugin: 'maven-publish' allprojects { java { toolchain { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(11) + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } } @@ -33,8 +35,8 @@ subprojects { dependencies { annotationProcessor("org.projectlombok:lombok:${lombokVersion}") compileOnly("org.projectlombok:lombok:${lombokVersion}") - implementation("com.fasterxml.jackson.core:jackson-annotations:2.13.3") - implementation("com.fasterxml.jackson.core:jackson-core:2.13.3") + implementation("com.fasterxml.jackson.core:jackson-annotations:2.18.0") + implementation("com.fasterxml.jackson.core:jackson-core:2.18.0") implementation("javax.validation:validation-api:2.0.1.Final") implementation("org.hibernate.validator:hibernate-validator:6.0.23.Final") } diff --git a/fint-administrasjon-resource-model-java/build.gradle b/fint-administrasjon-resource-model-java/build.gradle index 8323835d..ee6e3d68 100644 --- a/fint-administrasjon-resource-model-java/build.gradle +++ b/fint-administrasjon-resource-model-java/build.gradle @@ -8,4 +8,7 @@ dependencies { testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") testImplementation("org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE") testImplementation("org.springframework.hateoas:spring-hateoas:0.25.1.RELEASE") + testImplementation("org.apache.groovy:groovy:4.0.26") + testImplementation("org.apache.groovy:groovy-json:4.0.26") + } diff --git a/fint-felles-model-java/build.gradle b/fint-felles-model-java/build.gradle index d85335c3..f9f20fd5 100644 --- a/fint-felles-model-java/build.gradle +++ b/fint-felles-model-java/build.gradle @@ -1,3 +1,3 @@ dependencies { - api('no.novari:fint-model-core:1.0.0-rc-1') + api('no.novari:fint-model-core:${fintModelCoreVersion}') } diff --git a/fint-felles-resource-model-java/build.gradle b/fint-felles-resource-model-java/build.gradle index 2594220b..d7c5cf42 100644 --- a/fint-felles-resource-model-java/build.gradle +++ b/fint-felles-resource-model-java/build.gradle @@ -1,6 +1,6 @@ dependencies { api project(":fint-felles-model-java") - api('no.novari:fint-model-resource:1.0.0-rc-2') + api('no.novari:fint-model-resource:${fintModelResourceVersion}') testImplementation("org.spockframework:spock-spring:${spockSpringVersion}") testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") diff --git a/gradle.properties b/gradle.properties index 390f98c6..110cded1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,6 @@ version=3.19.0 springBootVersion=2.7.12 -lombokVersion=1.18.30 -spockSpringVersion=1.2-groovy-2.4 \ No newline at end of file +lombokVersion=1.18.38 +spockSpringVersion=2.4-M6-groovy-4.0 +fintModelResourceVersion=1.0.0-rc-2 +fintModelCoreVersion=1.0.0-rc-1 \ No newline at end of file From dabf8b3fc12c1e1e16298fa3a33c875ee0aa0473 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 17 Sep 2025 09:13:03 +0200 Subject: [PATCH 06/24] Reorganize into no.novari.fint --- build.gradle | 8 ++++++-- .../administrasjon/fullmakt/Fullmakt.java | 7 +++---- .../fullmakt/FullmaktActions.java | 2 +- .../model/administrasjon/fullmakt/Rolle.java | 5 ++--- .../administrasjon/kodeverk/Aktivitet.java | 12 +++--------- .../model/administrasjon/kodeverk/Anlegg.java | 12 +++--------- .../model/administrasjon/kodeverk/Ansvar.java | 7 ++----- .../kodeverk/Arbeidsforholdstype.java | 8 +++----- .../model/administrasjon/kodeverk/Art.java | 12 +++--------- .../model/administrasjon/kodeverk/Diverse.java | 12 +++--------- .../model/administrasjon/kodeverk/Formal.java | 12 +++--------- .../administrasjon/kodeverk/Fravarsgrunn.java | 13 ++++--------- .../administrasjon/kodeverk/Fravarstype.java | 8 +++----- .../administrasjon/kodeverk/Funksjon.java | 7 ++----- .../kodeverk/KodeverkActions.java | 2 +- .../kodeverk/Kontodimensjon.java | 8 +++----- .../administrasjon/kodeverk/Kontrakt.java | 12 +++--------- .../administrasjon/kodeverk/Lonnsart.java | 8 +++----- .../administrasjon/kodeverk/Lopenummer.java | 12 +++--------- .../model/administrasjon/kodeverk/Objekt.java | 12 +++--------- .../kodeverk/Personalressurskategori.java | 13 ++++--------- .../administrasjon/kodeverk/Prosjekt.java | 7 ++----- .../administrasjon/kodeverk/Prosjektart.java | 7 ++----- .../model/administrasjon/kodeverk/Ramme.java | 12 +++--------- .../administrasjon/kodeverk/Stillingskode.java | 8 +++----- .../administrasjon/kodeverk/Uketimetall.java | 13 ++++--------- .../KompleksedatatyperActions.java | 2 +- .../kompleksedatatyper/Kontostreng.java | 8 ++------ .../organisasjon/Arbeidslokasjon.java | 7 +++---- .../organisasjon/OrganisasjonActions.java | 2 +- .../organisasjon/Organisasjonselement.java | 9 ++++----- .../personal/Arbeidsforhold.java | 7 +++---- .../administrasjon/personal/Fastlonn.java | 5 +---- .../administrasjon/personal/Fasttillegg.java | 5 +---- .../model/administrasjon/personal/Fravar.java | 8 ++++---- .../model/administrasjon/personal/Lonn.java | 10 +++++----- .../personal/PersonalActions.java | 2 +- .../personal/Personalressurs.java | 9 ++++----- .../administrasjon/personal/Variabellonn.java | 5 +---- .../fullmakt/FullmaktResource.java | 7 +++---- .../fullmakt/FullmaktResources.java | 2 +- .../administrasjon/fullmakt/RolleResource.java | 5 ++--- .../fullmakt/RolleResources.java | 2 +- .../kodeverk/AktivitetResource.java | 6 +----- .../kodeverk/AktivitetResources.java | 2 +- .../kodeverk/AnleggResource.java | 6 +----- .../kodeverk/AnleggResources.java | 2 +- .../kodeverk/AnsvarResource.java | 6 +----- .../kodeverk/AnsvarResources.java | 2 +- .../kodeverk/ArbeidsforholdstypeResource.java | 7 ++----- .../kodeverk/ArbeidsforholdstypeResources.java | 2 +- .../administrasjon/kodeverk/ArtResource.java | 6 +----- .../administrasjon/kodeverk/ArtResources.java | 2 +- .../kodeverk/DiverseResource.java | 6 +----- .../kodeverk/DiverseResources.java | 2 +- .../kodeverk/FormalResource.java | 6 +----- .../kodeverk/FormalResources.java | 2 +- .../kodeverk/FravarsgrunnResource.java | 7 ++----- .../kodeverk/FravarsgrunnResources.java | 2 +- .../kodeverk/FravarstypeResource.java | 7 ++----- .../kodeverk/FravarstypeResources.java | 2 +- .../kodeverk/FunksjonResource.java | 6 +----- .../kodeverk/FunksjonResources.java | 2 +- .../kodeverk/KontodimensjonResource.java | 7 ++----- .../kodeverk/KontodimensjonResources.java | 2 +- .../kodeverk/KontraktResource.java | 6 +----- .../kodeverk/KontraktResources.java | 2 +- .../kodeverk/LonnsartResource.java | 7 ++----- .../kodeverk/LonnsartResources.java | 2 +- .../kodeverk/LopenummerResource.java | 6 +----- .../kodeverk/LopenummerResources.java | 2 +- .../kodeverk/ObjektResource.java | 6 +----- .../kodeverk/ObjektResources.java | 2 +- .../PersonalressurskategoriResource.java | 7 ++----- .../PersonalressurskategoriResources.java | 2 +- .../kodeverk/ProsjektResource.java | 6 +----- .../kodeverk/ProsjektResources.java | 2 +- .../kodeverk/ProsjektartResource.java | 6 +----- .../kodeverk/ProsjektartResources.java | 2 +- .../administrasjon/kodeverk/RammeResource.java | 6 +----- .../kodeverk/RammeResources.java | 2 +- .../kodeverk/StillingskodeResource.java | 7 ++----- .../kodeverk/StillingskodeResources.java | 2 +- .../kodeverk/UketimetallResource.java | 7 ++----- .../kodeverk/UketimetallResources.java | 2 +- .../KontostrengResource.java | 6 +----- .../KontostrengResources.java | 2 +- .../organisasjon/ArbeidslokasjonResource.java | 7 +++---- .../organisasjon/ArbeidslokasjonResources.java | 2 +- .../OrganisasjonselementResource.java | 9 ++++----- .../OrganisasjonselementResources.java | 2 +- .../personal/ArbeidsforholdResource.java | 7 +++---- .../personal/ArbeidsforholdResources.java | 2 +- .../personal/FastlonnResource.java | 5 +---- .../personal/FastlonnResources.java | 2 +- .../personal/FasttilleggResource.java | 5 +---- .../personal/FasttilleggResources.java | 2 +- .../personal/FravarResource.java | 8 ++++---- .../personal/FravarResources.java | 2 +- .../administrasjon/personal/LonnResource.java | 10 +++++----- .../administrasjon/personal/LonnResources.java | 2 +- .../personal/PersonalressursResource.java | 9 ++++----- .../personal/PersonalressursResources.java | 2 +- .../personal/VariabellonnResource.java | 5 +---- .../personal/VariabellonnResources.java | 2 +- .../test/model/ModelDeserializationSpec.groovy | 8 ++++---- .../test/model/ModelSerializationSpec.groovy | 16 ++++++++-------- .../SpringModelDeserializationSpec.groovy | 6 +++--- .../test/model/utils/TestApplication.java | 2 +- .../test/model/utils/TestConfiguration.java | 2 +- .../model/arkiv/kodeverk/DokumentStatus.java | 13 ++++--------- .../model/arkiv/kodeverk/DokumentType.java | 13 ++++--------- .../fint/model/arkiv/kodeverk/Format.java | 13 ++++--------- .../model/arkiv/kodeverk/JournalStatus.java | 13 ++++--------- .../model/arkiv/kodeverk/JournalpostType.java | 13 ++++--------- .../arkiv/kodeverk/Klassifikasjonstype.java | 13 ++++--------- .../model/arkiv/kodeverk/KodeverkActions.java | 2 +- .../arkiv/kodeverk/KorrespondansepartType.java | 13 ++++--------- .../model/arkiv/kodeverk/Merknadstype.java | 13 ++++--------- .../fint/model/arkiv/kodeverk/PartRolle.java | 13 ++++--------- .../fint/model/arkiv/kodeverk/Rolle.java | 13 ++++--------- .../model/arkiv/kodeverk/Saksmappetype.java | 13 ++++--------- .../fint/model/arkiv/kodeverk/Saksstatus.java | 13 ++++--------- .../arkiv/kodeverk/Skjermingshjemmel.java | 13 ++++--------- .../model/arkiv/kodeverk/Tilgangsgruppe.java | 13 ++++--------- .../arkiv/kodeverk/Tilgangsrestriksjon.java | 13 ++++--------- .../kodeverk/TilknyttetRegistreringSom.java | 13 ++++--------- .../model/arkiv/kodeverk/Variantformat.java | 13 ++++--------- ...DispensasjonAutomatiskFredaKulturminne.java | 14 +++++--------- .../KulturminnevernActions.java | 2 +- .../arkiv/kulturminnevern/TilskuddFartoy.java | 12 ++++-------- .../TilskuddFredaBygningPrivatEie.java | 14 +++++--------- .../model/arkiv/noark/AdministrativEnhet.java | 7 +++---- .../fint/model/arkiv/noark/Arkivdel.java | 5 ++--- .../fint/model/arkiv/noark/Arkivressurs.java | 7 +++---- .../fint/model/arkiv/noark/Autorisasjon.java | 5 ++--- .../fint/model/arkiv/noark/Avskrivning.java | 11 ++--------- .../model/arkiv/noark/Dokumentbeskrivelse.java | 9 ++------- .../fint/model/arkiv/noark/Dokumentfil.java | 10 +++------- .../fint/model/arkiv/noark/Dokumentobjekt.java | 8 ++------ .../fint/model/arkiv/noark/Journalpost.java | 10 +++------- .../fint/model/arkiv/noark/Klasse.java | 6 +----- .../arkiv/noark/Klassifikasjonssystem.java | 6 ++---- .../model/arkiv/noark/Korrespondansepart.java | 12 ++++-------- .../fint/model/arkiv/noark/Mappe.java | 11 +++-------- .../fint/model/arkiv/noark/Merknad.java | 5 +---- .../fint/model/arkiv/noark/NoarkActions.java | 2 +- .../fint/model/arkiv/noark/Part.java | 9 +++------ .../fint/model/arkiv/noark/Registrering.java | 11 +---------- .../fint/model/arkiv/noark/Sak.java | 12 +++--------- .../fint/model/arkiv/noark/Saksmappe.java | 9 +++------ .../fint/model/arkiv/noark/Skjerming.java | 8 ++------ .../fint/model/arkiv/noark/Tilgang.java | 5 ++--- .../model/arkiv/personal/PersonalActions.java | 2 +- .../model/arkiv/personal/Personalmappe.java | 7 +++---- .../arkiv/samferdsel/SamferdselActions.java | 2 +- .../arkiv/samferdsel/SoknadDrosjeloyve.java | 11 +++-------- .../arkiv/kodeverk/DokumentStatusResource.java | 7 ++----- .../kodeverk/DokumentStatusResources.java | 2 +- .../arkiv/kodeverk/DokumentTypeResource.java | 7 ++----- .../arkiv/kodeverk/DokumentTypeResources.java | 2 +- .../arkiv/kodeverk/FormatResource.java | 7 ++----- .../arkiv/kodeverk/FormatResources.java | 2 +- .../arkiv/kodeverk/JournalStatusResource.java | 7 ++----- .../arkiv/kodeverk/JournalStatusResources.java | 2 +- .../kodeverk/JournalpostTypeResource.java | 7 ++----- .../kodeverk/JournalpostTypeResources.java | 2 +- .../kodeverk/KlassifikasjonstypeResource.java | 7 ++----- .../kodeverk/KlassifikasjonstypeResources.java | 2 +- .../KorrespondansepartTypeResource.java | 7 ++----- .../KorrespondansepartTypeResources.java | 2 +- .../arkiv/kodeverk/MerknadstypeResource.java | 7 ++----- .../arkiv/kodeverk/MerknadstypeResources.java | 2 +- .../arkiv/kodeverk/PartRolleResource.java | 7 ++----- .../arkiv/kodeverk/PartRolleResources.java | 2 +- .../resource/arkiv/kodeverk/RolleResource.java | 7 ++----- .../arkiv/kodeverk/RolleResources.java | 2 +- .../arkiv/kodeverk/SaksmappetypeResource.java | 7 ++----- .../arkiv/kodeverk/SaksmappetypeResources.java | 2 +- .../arkiv/kodeverk/SaksstatusResource.java | 7 ++----- .../arkiv/kodeverk/SaksstatusResources.java | 2 +- .../kodeverk/SkjermingshjemmelResource.java | 7 ++----- .../kodeverk/SkjermingshjemmelResources.java | 2 +- .../arkiv/kodeverk/TilgangsgruppeResource.java | 7 ++----- .../kodeverk/TilgangsgruppeResources.java | 2 +- .../kodeverk/TilgangsrestriksjonResource.java | 7 ++----- .../kodeverk/TilgangsrestriksjonResources.java | 2 +- .../TilknyttetRegistreringSomResource.java | 7 ++----- .../TilknyttetRegistreringSomResources.java | 2 +- .../arkiv/kodeverk/VariantformatResource.java | 7 ++----- .../arkiv/kodeverk/VariantformatResources.java | 2 +- ...sjonAutomatiskFredaKulturminneResource.java | 9 ++++----- ...jonAutomatiskFredaKulturminneResources.java | 2 +- .../TilskuddFartoyResource.java | 7 +++---- .../TilskuddFartoyResources.java | 2 +- .../TilskuddFredaBygningPrivatEieResource.java | 9 ++++----- ...TilskuddFredaBygningPrivatEieResources.java | 2 +- .../noark/AdministrativEnhetResource.java | 7 +++---- .../noark/AdministrativEnhetResources.java | 2 +- .../resource/arkiv/noark/ArkivdelResource.java | 5 ++--- .../arkiv/noark/ArkivdelResources.java | 2 +- .../arkiv/noark/ArkivressursResource.java | 6 ++---- .../arkiv/noark/ArkivressursResources.java | 2 +- .../arkiv/noark/AutorisasjonResource.java | 5 ++--- .../arkiv/noark/AutorisasjonResources.java | 2 +- .../noark/DokumentbeskrivelseResource.java | 8 ++------ .../noark/DokumentbeskrivelseResources.java | 2 +- .../arkiv/noark/DokumentfilResource.java | 5 ++--- .../arkiv/noark/DokumentfilResources.java | 2 +- .../arkiv/noark/DokumentobjektResource.java | 6 +----- .../arkiv/noark/DokumentobjektResources.java | 2 +- .../arkiv/noark/JournalpostResource.java | 8 ++------ .../arkiv/noark/JournalpostResources.java | 2 +- .../resource/arkiv/noark/KlasseResource.java | 5 +---- .../resource/arkiv/noark/KlasseResources.java | 2 +- .../noark/KlassifikasjonssystemResource.java | 6 ++---- .../noark/KlassifikasjonssystemResources.java | 2 +- .../noark/KorrespondansepartResource.java | 10 +++------- .../noark/KorrespondansepartResources.java | 2 +- .../resource/arkiv/noark/MappeResource.java | 10 ++-------- .../resource/arkiv/noark/MappeResources.java | 2 +- .../resource/arkiv/noark/MerknadResource.java | 4 +--- .../resource/arkiv/noark/MerknadResources.java | 2 +- .../resource/arkiv/noark/PartResource.java | 8 +++----- .../resource/arkiv/noark/PartResources.java | 2 +- .../arkiv/noark/RegistreringResource.java | 10 +--------- .../arkiv/noark/RegistreringResources.java | 2 +- .../resource/arkiv/noark/SakResource.java | 6 +----- .../resource/arkiv/noark/SakResources.java | 2 +- .../arkiv/noark/SaksmappeResource.java | 8 ++------ .../arkiv/noark/SaksmappeResources.java | 2 +- .../arkiv/noark/SkjermingResource.java | 6 +----- .../arkiv/noark/SkjermingResources.java | 2 +- .../resource/arkiv/noark/TilgangResource.java | 5 ++--- .../resource/arkiv/noark/TilgangResources.java | 2 +- .../arkiv/personal/PersonalmappeResource.java | 7 +++---- .../arkiv/personal/PersonalmappeResources.java | 2 +- .../samferdsel/SoknadDrosjeloyveResource.java | 6 ++---- .../samferdsel/SoknadDrosjeloyveResources.java | 2 +- .../model/arkiv/test/ModelSpec.groovy | 4 ++-- fint-felles-model-java/build.gradle | 2 +- .../fint/model/felles/FellesActions.java | 2 +- .../fint/model/felles/Kontaktperson.java | 9 ++++----- .../{ => novari}/fint/model/felles/Person.java | 12 ++++++------ .../fint/model/felles/Virksomhet.java | 7 +++---- .../fint/model/felles/basisklasser/Aktor.java | 17 +++++------------ .../basisklasser/BasisklasserActions.java | 2 +- .../fint/model/felles/basisklasser/Begrep.java | 12 ++++-------- .../fint/model/felles/basisklasser/Enhet.java | 15 +++++---------- .../fint/model/felles/kodeverk/Fylke.java | 8 +++----- .../model/felles/kodeverk/KodeverkActions.java | 2 +- .../fint/model/felles/kodeverk/Kommune.java | 8 +++----- .../fint/model/felles/kodeverk/Valuta.java | 10 +++------- .../model/felles/kodeverk/iso/IsoActions.java | 2 +- .../fint/model/felles/kodeverk/iso/Kjonn.java | 13 ++++--------- .../model/felles/kodeverk/iso/Landkode.java | 13 ++++--------- .../fint/model/felles/kodeverk/iso/Sprak.java | 13 ++++--------- .../felles/kompleksedatatyper/Adresse.java | 8 ++------ .../kompleksedatatyper/Identifikator.java | 12 ++---------- .../KompleksedatatyperActions.java | 2 +- .../kompleksedatatyper/Kontaktinformasjon.java | 12 +----------- .../kompleksedatatyper/Matrikkelnummer.java | 8 ++------ .../felles/kompleksedatatyper/Periode.java | 11 ++--------- .../felles/kompleksedatatyper/Personnavn.java | 12 ++---------- fint-felles-resource-model-java/build.gradle | 3 ++- .../resource/felles/KontaktpersonResource.java | 9 ++++----- .../felles/KontaktpersonResources.java | 2 +- .../model/resource/felles/PersonResource.java | 12 ++++++------ .../model/resource/felles/PersonResources.java | 2 +- .../resource/felles/VirksomhetResource.java | 7 +++---- .../resource/felles/VirksomhetResources.java | 2 +- .../felles/basisklasser/AktorResource.java | 10 +++------- .../felles/basisklasser/AktorResources.java | 2 +- .../felles/basisklasser/BegrepResource.java | 7 +++---- .../felles/basisklasser/BegrepResources.java | 2 +- .../felles/basisklasser/EnhetResource.java | 9 +++------ .../felles/basisklasser/EnhetResources.java | 2 +- .../felles/kodeverk/FylkeResource.java | 7 ++----- .../felles/kodeverk/FylkeResources.java | 2 +- .../felles/kodeverk/KommuneResource.java | 7 ++----- .../felles/kodeverk/KommuneResources.java | 2 +- .../felles/kodeverk/ValutaResource.java | 5 ++--- .../felles/kodeverk/ValutaResources.java | 2 +- .../felles/kodeverk/iso/KjonnResource.java | 7 ++----- .../felles/kodeverk/iso/KjonnResources.java | 2 +- .../felles/kodeverk/iso/LandkodeResource.java | 7 ++----- .../felles/kodeverk/iso/LandkodeResources.java | 2 +- .../felles/kodeverk/iso/SprakResource.java | 7 ++----- .../felles/kodeverk/iso/SprakResources.java | 2 +- .../kompleksedatatyper/AdresseResource.java | 6 +----- .../kompleksedatatyper/AdresseResources.java | 2 +- .../MatrikkelnummerResource.java | 6 +----- .../MatrikkelnummerResources.java | 2 +- .../test/model/ModelDeserializationSpec.groovy | 10 +++++----- .../test/model/ModelSerializationSpec.groovy | 18 +++++++++--------- .../SpringModelDeserializationSpec.groovy | 6 +++--- .../test/model/utils/TestApplication.java | 4 ++-- .../test/model/utils/TestConfiguration.java | 2 +- .../fint/model/okonomi/faktura/Faktura.java | 7 +++---- .../model/okonomi/faktura/FakturaActions.java | 2 +- .../model/okonomi/faktura/Fakturagrunnlag.java | 8 +++----- .../model/okonomi/faktura/Fakturalinje.java | 6 +----- .../model/okonomi/faktura/Fakturamottaker.java | 8 ++------ .../model/okonomi/faktura/Fakturautsteder.java | 5 ++--- .../okonomi/kodeverk/KodeverkActions.java | 2 +- .../model/okonomi/kodeverk/Merverdiavgift.java | 11 +++-------- .../fint/model/okonomi/kodeverk/Vare.java | 7 +++---- .../fint/model/okonomi/regnskap/Bilag.java | 12 ++---------- .../model/okonomi/regnskap/Leverandor.java | 5 ++--- .../okonomi/regnskap/Leverandorgruppe.java | 5 ++--- .../fint/model/okonomi/regnskap/Postering.java | 7 +++---- .../okonomi/regnskap/RegnskapActions.java | 2 +- .../model/okonomi/regnskap/Transaksjon.java | 7 +++---- .../okonomi/faktura/FakturaResource.java | 7 +++---- .../okonomi/faktura/FakturaResources.java | 2 +- .../faktura/FakturagrunnlagResource.java | 8 +++----- .../faktura/FakturagrunnlagResources.java | 2 +- .../okonomi/faktura/FakturalinjeResource.java | 5 +---- .../okonomi/faktura/FakturalinjeResources.java | 2 +- .../faktura/FakturamottakerResource.java | 6 +----- .../faktura/FakturamottakerResources.java | 2 +- .../faktura/FakturautstederResource.java | 5 ++--- .../faktura/FakturautstederResources.java | 2 +- .../kodeverk/MerverdiavgiftResource.java | 6 ++---- .../kodeverk/MerverdiavgiftResources.java | 2 +- .../okonomi/kodeverk/VareResource.java | 7 +++---- .../okonomi/kodeverk/VareResources.java | 2 +- .../okonomi/regnskap/LeverandorResource.java | 5 ++--- .../okonomi/regnskap/LeverandorResources.java | 2 +- .../regnskap/LeverandorgruppeResource.java | 5 ++--- .../regnskap/LeverandorgruppeResources.java | 2 +- .../okonomi/regnskap/PosteringResource.java | 7 +++---- .../okonomi/regnskap/PosteringResources.java | 2 +- .../okonomi/regnskap/TransaksjonResource.java | 7 +++---- .../okonomi/regnskap/TransaksjonResources.java | 2 +- .../kodeverk/Behandlingsgrunnlag.java | 13 ++++--------- .../personvern/kodeverk/KodeverkActions.java | 2 +- .../personvern/kodeverk/Personopplysning.java | 13 ++++--------- .../model/personvern/samtykke/Behandling.java | 5 ++--- .../model/personvern/samtykke/Samtykke.java | 7 +++---- .../personvern/samtykke/SamtykkeActions.java | 2 +- .../model/personvern/samtykke/Tjeneste.java | 5 ++--- .../kodeverk/BehandlingsgrunnlagResource.java | 7 ++----- .../kodeverk/BehandlingsgrunnlagResources.java | 2 +- .../kodeverk/PersonopplysningResource.java | 7 ++----- .../kodeverk/PersonopplysningResources.java | 2 +- .../samtykke/BehandlingResource.java | 5 ++--- .../samtykke/BehandlingResources.java | 2 +- .../personvern/samtykke/SamtykkeResource.java | 7 +++---- .../personvern/samtykke/SamtykkeResources.java | 2 +- .../personvern/samtykke/TjenesteResource.java | 5 ++--- .../personvern/samtykke/TjenesteResources.java | 2 +- .../model/ressurs/eiendel/Applikasjon.java | 7 +++---- .../ressurs/eiendel/Applikasjonsressurs.java | 7 +++---- .../Applikasjonsressurstilgjengelighet.java | 7 +++---- .../model/ressurs/eiendel/EiendelActions.java | 2 +- .../ressurs/kodeverk/Applikasjonskategori.java | 13 ++++--------- .../model/ressurs/kodeverk/Brukertype.java | 13 ++++--------- .../ressurs/kodeverk/Handhevingstype.java | 13 ++++--------- .../ressurs/kodeverk/KodeverkActions.java | 2 +- .../model/ressurs/kodeverk/Lisensmodell.java | 13 ++++--------- .../fint/model/ressurs/kodeverk/Plattform.java | 13 ++++--------- .../fint/model/ressurs/tilgang/Identitet.java | 5 ++--- .../fint/model/ressurs/tilgang/Rettighet.java | 6 ++---- .../model/ressurs/tilgang/TilgangActions.java | 2 +- .../ressurs/eiendel/ApplikasjonResource.java | 7 +++---- .../ressurs/eiendel/ApplikasjonResources.java | 2 +- .../eiendel/ApplikasjonsressursResource.java | 7 +++---- .../eiendel/ApplikasjonsressursResources.java | 2 +- ...ikasjonsressurstilgjengelighetResource.java | 7 +++---- ...kasjonsressurstilgjengelighetResources.java | 2 +- .../kodeverk/ApplikasjonskategoriResource.java | 7 ++----- .../ApplikasjonskategoriResources.java | 2 +- .../ressurs/kodeverk/BrukertypeResource.java | 7 ++----- .../ressurs/kodeverk/BrukertypeResources.java | 2 +- .../kodeverk/HandhevingstypeResource.java | 7 ++----- .../kodeverk/HandhevingstypeResources.java | 2 +- .../ressurs/kodeverk/LisensmodellResource.java | 7 ++----- .../kodeverk/LisensmodellResources.java | 2 +- .../ressurs/kodeverk/PlattformResource.java | 7 ++----- .../ressurs/kodeverk/PlattformResources.java | 2 +- .../ressurs/tilgang/IdentitetResource.java | 5 ++--- .../ressurs/tilgang/IdentitetResources.java | 2 +- .../ressurs/tilgang/RettighetResource.java | 6 ++---- .../ressurs/tilgang/RettighetResources.java | 2 +- .../basisklasser/BasisklasserActions.java | 2 +- .../model/utdanning/basisklasser/Gruppe.java | 7 +++---- .../basisklasser/Gruppemedlemskap.java | 12 ++++-------- .../basisklasser/Utdanningsforhold.java | 5 ++--- .../fint/model/utdanning/elev/Basisgruppe.java | 8 +++----- .../utdanning/elev/Basisgruppemedlemskap.java | 8 +++----- .../fint/model/utdanning/elev/Elev.java | 9 ++++----- .../fint/model/utdanning/elev/ElevActions.java | 2 +- .../fint/model/utdanning/elev/Elevforhold.java | 11 +++++------ .../utdanning/elev/Elevtilrettelegging.java | 5 ++--- .../utdanning/elev/Kontaktlarergruppe.java | 8 +++----- .../elev/Kontaktlarergruppemedlemskap.java | 8 +++----- .../fint/model/utdanning/elev/Medlemskap.java | 5 ++--- .../model/utdanning/elev/Persongruppe.java | 8 +++----- .../utdanning/elev/Persongruppemedlemskap.java | 8 +++----- .../model/utdanning/elev/Skoleressurs.java | 5 ++--- .../utdanning/elev/Undervisningsforhold.java | 8 +++----- .../fint/model/utdanning/elev/Varsel.java | 5 ++--- .../utdanning/kodeverk/Avbruddsarsak.java | 13 ++++--------- .../utdanning/kodeverk/Betalingsstatus.java | 13 ++++--------- .../model/utdanning/kodeverk/Bevistype.java | 13 ++++--------- .../model/utdanning/kodeverk/Brevtype.java | 13 ++++--------- .../model/utdanning/kodeverk/Eksamensform.java | 13 ++++--------- .../model/utdanning/kodeverk/Elevkategori.java | 13 ++++--------- .../model/utdanning/kodeverk/Fagmerknad.java | 13 ++++--------- .../model/utdanning/kodeverk/Fagstatus.java | 13 ++++--------- .../model/utdanning/kodeverk/Fravarstype.java | 13 ++++--------- .../model/utdanning/kodeverk/Fullfortkode.java | 13 ++++--------- .../utdanning/kodeverk/Grepreferanse.java | 12 +----------- .../utdanning/kodeverk/Karakterskala.java | 8 +++----- .../utdanning/kodeverk/Karakterstatus.java | 13 ++++--------- .../utdanning/kodeverk/KodeverkActions.java | 2 +- .../fint/model/utdanning/kodeverk/OtEnhet.java | 8 +++----- .../model/utdanning/kodeverk/OtStatus.java | 11 +++-------- .../model/utdanning/kodeverk/Provestatus.java | 13 ++++--------- .../fint/model/utdanning/kodeverk/Skolear.java | 13 ++++--------- .../utdanning/kodeverk/Skoleeiertype.java | 13 ++++--------- .../fint/model/utdanning/kodeverk/Termin.java | 13 ++++--------- .../utdanning/kodeverk/Tilrettelegging.java | 13 ++++--------- .../model/utdanning/kodeverk/Varseltype.java | 13 ++++--------- .../utdanning/kodeverk/Vigoreferanse.java | 12 +----------- .../utdanning/kodeverk/Vitnemalsmerknad.java | 13 ++++--------- .../model/utdanning/larling/AvlagtProve.java | 5 ++--- .../fint/model/utdanning/larling/Larling.java | 7 +++---- .../utdanning/larling/LarlingActions.java | 2 +- .../fint/model/utdanning/ot/OtActions.java | 2 +- .../fint/model/utdanning/ot/OtUngdom.java | 5 ++--- .../fint/model/utdanning/timeplan/Eksamen.java | 7 +++---- .../fint/model/utdanning/timeplan/Fag.java | 8 +++----- .../model/utdanning/timeplan/Faggruppe.java | 8 +++----- .../timeplan/Faggruppemedlemskap.java | 8 +++----- .../fint/model/utdanning/timeplan/Rom.java | 5 ++--- .../fint/model/utdanning/timeplan/Time.java | 7 +++---- .../utdanning/timeplan/TimeplanActions.java | 2 +- .../timeplan/Undervisningsgruppe.java | 8 +++----- .../Undervisningsgruppemedlemskap.java | 8 +++----- .../utdanning/utdanningsprogram/Arstrinn.java | 8 +++----- .../utdanningsprogram/Programomrade.java | 8 +++----- .../Programomrademedlemskap.java | 8 +++----- .../utdanning/utdanningsprogram/Skole.java | 7 +++---- .../utdanningsprogram/Utdanningsprogram.java | 8 +++----- .../UtdanningsprogramActions.java | 2 +- .../utdanning/vurdering/Anmerkninger.java | 5 ++--- .../utdanning/vurdering/Eksamensgruppe.java | 7 +++---- .../vurdering/Eksamensgruppemedlemskap.java | 8 +++----- .../utdanning/vurdering/Eksamensvurdering.java | 7 ++----- .../model/utdanning/vurdering/Elevfravar.java | 5 ++--- .../utdanning/vurdering/Elevvurdering.java | 5 ++--- .../utdanning/vurdering/Fagvurdering.java | 6 +++--- .../fint/model/utdanning/vurdering/Fravar.java | 7 +++---- .../utdanning/vurdering/Fravarsoversikt.java | 6 ++---- .../utdanning/vurdering/Fravarsprosent.java | 12 ++---------- .../vurdering/Fravarsregistrering.java | 7 +++---- .../vurdering/Halvarsfagvurdering.java | 7 ++----- .../vurdering/Halvarsordensvurdering.java | 7 ++----- .../utdanning/vurdering/Karakterhistorie.java | 5 ++--- .../utdanning/vurdering/Karakterverdi.java | 8 +++----- .../utdanning/vurdering/Ordensvurdering.java | 6 +++--- .../fint/model/utdanning/vurdering/Sensor.java | 5 ++--- .../utdanning/vurdering/Sluttfagvurdering.java | 7 ++----- .../vurdering/Sluttordensvurdering.java | 7 ++----- .../vurdering/Underveisfagvurdering.java | 7 ++----- .../vurdering/Underveisordensvurdering.java | 7 ++----- .../model/utdanning/vurdering/Vurdering.java | 5 ++--- .../utdanning/vurdering/VurderingActions.java | 2 +- .../build.gradle | 1 + .../utdanning/basisklasser/GruppeResource.java | 7 +++---- .../basisklasser/GruppeResources.java | 2 +- .../basisklasser/GruppemedlemskapResource.java | 7 +++---- .../GruppemedlemskapResources.java | 2 +- .../UtdanningsforholdResource.java | 5 ++--- .../UtdanningsforholdResources.java | 2 +- .../utdanning/elev/BasisgruppeResource.java | 7 ++----- .../utdanning/elev/BasisgruppeResources.java | 2 +- .../elev/BasisgruppemedlemskapResource.java | 7 ++----- .../elev/BasisgruppemedlemskapResources.java | 2 +- .../resource/utdanning/elev/ElevResource.java | 9 ++++----- .../resource/utdanning/elev/ElevResources.java | 2 +- .../utdanning/elev/ElevforholdResource.java | 10 ++++------ .../utdanning/elev/ElevforholdResources.java | 2 +- .../elev/ElevtilretteleggingResource.java | 5 ++--- .../elev/ElevtilretteleggingResources.java | 2 +- .../elev/KontaktlarergruppeResource.java | 7 ++----- .../elev/KontaktlarergruppeResources.java | 2 +- .../KontaktlarergruppemedlemskapResource.java | 7 ++----- .../KontaktlarergruppemedlemskapResources.java | 2 +- .../utdanning/elev/MedlemskapResource.java | 5 ++--- .../utdanning/elev/MedlemskapResources.java | 2 +- .../utdanning/elev/PersongruppeResource.java | 7 ++----- .../utdanning/elev/PersongruppeResources.java | 2 +- .../elev/PersongruppemedlemskapResource.java | 7 ++----- .../elev/PersongruppemedlemskapResources.java | 2 +- .../utdanning/elev/SkoleressursResource.java | 5 ++--- .../utdanning/elev/SkoleressursResources.java | 2 +- .../elev/UndervisningsforholdResource.java | 7 ++----- .../elev/UndervisningsforholdResources.java | 2 +- .../utdanning/elev/VarselResource.java | 5 ++--- .../utdanning/elev/VarselResources.java | 2 +- .../kodeverk/AvbruddsarsakResource.java | 7 ++----- .../kodeverk/AvbruddsarsakResources.java | 2 +- .../kodeverk/BetalingsstatusResource.java | 7 ++----- .../kodeverk/BetalingsstatusResources.java | 2 +- .../utdanning/kodeverk/BevistypeResource.java | 7 ++----- .../utdanning/kodeverk/BevistypeResources.java | 2 +- .../utdanning/kodeverk/BrevtypeResource.java | 7 ++----- .../utdanning/kodeverk/BrevtypeResources.java | 2 +- .../kodeverk/EksamensformResource.java | 7 ++----- .../kodeverk/EksamensformResources.java | 2 +- .../kodeverk/ElevkategoriResource.java | 7 ++----- .../kodeverk/ElevkategoriResources.java | 2 +- .../utdanning/kodeverk/FagmerknadResource.java | 7 ++----- .../kodeverk/FagmerknadResources.java | 2 +- .../utdanning/kodeverk/FagstatusResource.java | 7 ++----- .../utdanning/kodeverk/FagstatusResources.java | 2 +- .../kodeverk/FravarstypeResource.java | 7 ++----- .../kodeverk/FravarstypeResources.java | 2 +- .../kodeverk/FullfortkodeResource.java | 7 ++----- .../kodeverk/FullfortkodeResources.java | 2 +- .../kodeverk/KarakterskalaResource.java | 7 ++----- .../kodeverk/KarakterskalaResources.java | 2 +- .../kodeverk/KarakterstatusResource.java | 7 ++----- .../kodeverk/KarakterstatusResources.java | 2 +- .../utdanning/kodeverk/OtEnhetResource.java | 7 ++----- .../utdanning/kodeverk/OtEnhetResources.java | 2 +- .../utdanning/kodeverk/OtStatusResource.java | 6 ++---- .../utdanning/kodeverk/OtStatusResources.java | 2 +- .../kodeverk/ProvestatusResource.java | 7 ++----- .../kodeverk/ProvestatusResources.java | 2 +- .../utdanning/kodeverk/SkolearResource.java | 7 ++----- .../utdanning/kodeverk/SkolearResources.java | 2 +- .../kodeverk/SkoleeiertypeResource.java | 7 ++----- .../kodeverk/SkoleeiertypeResources.java | 2 +- .../utdanning/kodeverk/TerminResource.java | 7 ++----- .../utdanning/kodeverk/TerminResources.java | 2 +- .../kodeverk/TilretteleggingResource.java | 7 ++----- .../kodeverk/TilretteleggingResources.java | 2 +- .../utdanning/kodeverk/VarseltypeResource.java | 7 ++----- .../kodeverk/VarseltypeResources.java | 2 +- .../kodeverk/VitnemalsmerknadResource.java | 7 ++----- .../kodeverk/VitnemalsmerknadResources.java | 2 +- .../utdanning/larling/AvlagtProveResource.java | 5 ++--- .../larling/AvlagtProveResources.java | 2 +- .../utdanning/larling/LarlingResource.java | 7 +++---- .../utdanning/larling/LarlingResources.java | 2 +- .../utdanning/ot/OtUngdomResource.java | 5 ++--- .../utdanning/ot/OtUngdomResources.java | 2 +- .../utdanning/timeplan/EksamenResource.java | 7 +++---- .../utdanning/timeplan/EksamenResources.java | 2 +- .../utdanning/timeplan/FagResource.java | 7 ++----- .../utdanning/timeplan/FagResources.java | 2 +- .../utdanning/timeplan/FaggruppeResource.java | 7 ++----- .../utdanning/timeplan/FaggruppeResources.java | 2 +- .../timeplan/FaggruppemedlemskapResource.java | 7 ++----- .../timeplan/FaggruppemedlemskapResources.java | 2 +- .../utdanning/timeplan/RomResource.java | 5 ++--- .../utdanning/timeplan/RomResources.java | 2 +- .../utdanning/timeplan/TimeResource.java | 7 +++---- .../utdanning/timeplan/TimeResources.java | 2 +- .../timeplan/UndervisningsgruppeResource.java | 7 ++----- .../timeplan/UndervisningsgruppeResources.java | 2 +- .../UndervisningsgruppemedlemskapResource.java | 7 ++----- ...UndervisningsgruppemedlemskapResources.java | 2 +- .../utdanningsprogram/ArstrinnResource.java | 7 ++----- .../utdanningsprogram/ArstrinnResources.java | 2 +- .../ProgramomradeResource.java | 7 ++----- .../ProgramomradeResources.java | 2 +- .../ProgramomrademedlemskapResource.java | 7 ++----- .../ProgramomrademedlemskapResources.java | 2 +- .../utdanningsprogram/SkoleResource.java | 7 +++---- .../utdanningsprogram/SkoleResources.java | 2 +- .../UtdanningsprogramResource.java | 7 ++----- .../UtdanningsprogramResources.java | 2 +- .../vurdering/AnmerkningerResource.java | 5 ++--- .../vurdering/AnmerkningerResources.java | 2 +- .../vurdering/EksamensgruppeResource.java | 6 ++---- .../vurdering/EksamensgruppeResources.java | 2 +- .../EksamensgruppemedlemskapResource.java | 7 ++----- .../EksamensgruppemedlemskapResources.java | 2 +- .../vurdering/EksamensvurderingResource.java | 6 +----- .../vurdering/EksamensvurderingResources.java | 2 +- .../vurdering/ElevfravarResource.java | 5 ++--- .../vurdering/ElevfravarResources.java | 2 +- .../vurdering/ElevvurderingResource.java | 5 ++--- .../vurdering/ElevvurderingResources.java | 2 +- .../vurdering/FagvurderingResource.java | 6 +++--- .../vurdering/FagvurderingResources.java | 2 +- .../utdanning/vurdering/FravarResource.java | 7 +++---- .../utdanning/vurdering/FravarResources.java | 2 +- .../vurdering/FravarsoversiktResource.java | 7 +++---- .../vurdering/FravarsoversiktResources.java | 2 +- .../vurdering/FravarsregistreringResource.java | 7 +++---- .../FravarsregistreringResources.java | 2 +- .../vurdering/HalvarsfagvurderingResource.java | 6 +----- .../HalvarsfagvurderingResources.java | 2 +- .../HalvarsordensvurderingResource.java | 6 +----- .../HalvarsordensvurderingResources.java | 2 +- .../vurdering/KarakterhistorieResource.java | 5 ++--- .../vurdering/KarakterhistorieResources.java | 2 +- .../vurdering/KarakterverdiResource.java | 7 ++----- .../vurdering/KarakterverdiResources.java | 2 +- .../vurdering/OrdensvurderingResource.java | 6 +++--- .../vurdering/OrdensvurderingResources.java | 2 +- .../utdanning/vurdering/SensorResource.java | 5 ++--- .../utdanning/vurdering/SensorResources.java | 2 +- .../vurdering/SluttfagvurderingResource.java | 6 +----- .../vurdering/SluttfagvurderingResources.java | 2 +- .../SluttordensvurderingResource.java | 6 +----- .../SluttordensvurderingResources.java | 2 +- .../UnderveisfagvurderingResource.java | 6 +----- .../UnderveisfagvurderingResources.java | 2 +- .../UnderveisordensvurderingResource.java | 6 +----- .../UnderveisordensvurderingResources.java | 2 +- .../utdanning/vurdering/VurderingResource.java | 5 ++--- .../vurdering/VurderingResources.java | 2 +- .../test/model/ModelDeserializationSpec.groovy | 8 ++++---- .../test/model/ModelSerializationSpec.groovy | 16 ++++++++-------- .../SpringModelDeserializationSpec.groovy | 8 ++++---- .../test/model/utils/TestApplication.java | 4 ++-- .../test/model/utils/TestConfiguration.java | 2 +- gradle.properties | 4 ++-- 625 files changed, 1278 insertions(+), 2391 deletions(-) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/fullmakt/Fullmakt.java (94%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/fullmakt/FullmaktActions.java (90%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/fullmakt/Rolle.java (92%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Aktivitet.java (78%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Anlegg.java (78%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Ansvar.java (91%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Arbeidsforholdstype.java (90%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Art.java (78%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Diverse.java (78%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Formal.java (78%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Fravarsgrunn.java (78%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Fravarstype.java (90%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Funksjon.java (90%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/KodeverkActions.java (96%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Kontodimensjon.java (90%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Kontrakt.java (78%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Lonnsart.java (90%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Lopenummer.java (78%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Objekt.java (78%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Personalressurskategori.java (78%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Prosjekt.java (90%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Prosjektart.java (90%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Ramme.java (78%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Stillingskode.java (90%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kodeverk/Uketimetall.java (78%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kompleksedatatyper/KompleksedatatyperActions.java (86%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/kompleksedatatyper/Kontostreng.java (92%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/organisasjon/Arbeidslokasjon.java (91%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/organisasjon/OrganisasjonActions.java (90%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/organisasjon/Organisasjonselement.java (91%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/personal/Arbeidsforhold.java (95%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/personal/Fastlonn.java (92%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/personal/Fasttillegg.java (92%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/personal/Fravar.java (92%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/personal/Lonn.java (90%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/personal/PersonalActions.java (93%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/personal/Personalressurs.java (92%) rename fint-administrasjon-model-java/src/main/java/no/{ => novari}/fint/model/administrasjon/personal/Variabellonn.java (92%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/fullmakt/FullmaktResource.java (95%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/fullmakt/FullmaktResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/fullmakt/RolleResource.java (88%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/fullmakt/RolleResources.java (90%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/AktivitetResource.java (78%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/AktivitetResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/AnleggResource.java (78%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/AnleggResources.java (90%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/AnsvarResource.java (86%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/AnsvarResources.java (90%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResource.java (83%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/ArtResource.java (78%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/ArtResources.java (90%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/DiverseResource.java (78%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/DiverseResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/FormalResource.java (78%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/FormalResources.java (90%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResource.java (80%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/FravarstypeResource.java (84%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/FravarstypeResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/FunksjonResource.java (84%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/FunksjonResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/KontodimensjonResource.java (84%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/KontodimensjonResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/KontraktResource.java (78%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/KontraktResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/LonnsartResource.java (83%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/LonnsartResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/LopenummerResource.java (79%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/LopenummerResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/ObjektResource.java (78%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/ObjektResources.java (90%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResource.java (80%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResources.java (92%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/ProsjektResource.java (82%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/ProsjektResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/ProsjektartResource.java (86%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/ProsjektartResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/RammeResource.java (78%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/RammeResources.java (90%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/StillingskodeResource.java (83%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/StillingskodeResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/UketimetallResource.java (80%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kodeverk/UketimetallResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResource.java (93%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResources.java (90%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResource.java (85%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResource.java (90%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/personal/ArbeidsforholdResource.java (96%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/personal/ArbeidsforholdResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/personal/FastlonnResource.java (87%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/personal/FastlonnResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/personal/FasttilleggResource.java (87%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/personal/FasttilleggResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/personal/FravarResource.java (92%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/personal/FravarResources.java (90%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/personal/LonnResource.java (88%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/personal/LonnResources.java (90%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/personal/PersonalressursResource.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/personal/PersonalressursResources.java (91%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/personal/VariabellonnResource.java (87%) rename fint-administrasjon-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/administrasjon/personal/VariabellonnResources.java (91%) rename fint-administrasjon-resource-model-java/src/test/groovy/no/novari/{ => fint}/test/model/ModelDeserializationSpec.groovy (95%) rename fint-administrasjon-resource-model-java/src/test/groovy/no/novari/{ => fint}/test/model/ModelSerializationSpec.groovy (87%) rename fint-administrasjon-resource-model-java/src/test/groovy/no/novari/{ => fint}/test/model/SpringModelDeserializationSpec.groovy (91%) rename fint-administrasjon-resource-model-java/src/test/groovy/no/novari/{ => fint}/test/model/utils/TestApplication.java (86%) rename {fint-felles-resource-model-java/src/test/groovy/no/novari => fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint}/test/model/utils/TestConfiguration.java (93%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/DokumentStatus.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/DokumentType.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/Format.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/JournalStatus.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/JournalpostType.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/Klassifikasjonstype.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/KodeverkActions.java (97%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/KorrespondansepartType.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/Merknadstype.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/PartRolle.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/Rolle.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/Saksmappetype.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/Saksstatus.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/Skjermingshjemmel.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/Tilgangsgruppe.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/Tilgangsrestriksjon.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/TilknyttetRegistreringSom.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kodeverk/Variantformat.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminne.java (80%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kulturminnevern/KulturminnevernActions.java (93%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kulturminnevern/TilskuddFartoy.java (83%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEie.java (80%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/AdministrativEnhet.java (91%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Arkivdel.java (93%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Arkivressurs.java (92%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Autorisasjon.java (93%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Avskrivning.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Dokumentbeskrivelse.java (90%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Dokumentfil.java (84%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Dokumentobjekt.java (91%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Journalpost.java (90%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Klasse.java (91%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Klassifikasjonssystem.java (93%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Korrespondansepart.java (86%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Mappe.java (88%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Merknad.java (93%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/NoarkActions.java (95%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Part.java (88%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Registrering.java (87%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Sak.java (79%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Saksmappe.java (91%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Skjerming.java (90%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/noark/Tilgang.java (94%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/personal/PersonalActions.java (91%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/personal/Personalmappe.java (92%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/samferdsel/SamferdselActions.java (91%) rename fint-arkiv-model-java/src/main/java/no/{ => novari}/fint/model/arkiv/samferdsel/SoknadDrosjeloyve.java (83%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/DokumentStatusResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/DokumentStatusResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/DokumentTypeResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/DokumentTypeResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/FormatResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/FormatResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/JournalStatusResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/JournalStatusResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/JournalpostTypeResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/JournalpostTypeResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResources.java (93%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/MerknadstypeResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/MerknadstypeResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/PartRolleResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/PartRolleResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/RolleResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/RolleResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/SaksmappetypeResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/SaksmappetypeResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/SaksstatusResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/SaksstatusResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResources.java (93%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/VariantformatResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kodeverk/VariantformatResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResource.java (83%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResources.java (93%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResource.java (84%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResources.java (91%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResource.java (83%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/AdministrativEnhetResource.java (86%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/AdministrativEnhetResources.java (93%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/ArkivdelResource.java (91%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/ArkivdelResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/ArkivressursResource.java (89%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/ArkivressursResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/AutorisasjonResource.java (91%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/AutorisasjonResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/DokumentbeskrivelseResource.java (90%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/DokumentbeskrivelseResources.java (93%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/DokumentfilResource.java (87%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/DokumentfilResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/DokumentobjektResource.java (90%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/DokumentobjektResources.java (93%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/JournalpostResource.java (87%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/JournalpostResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/KlasseResource.java (88%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/KlasseResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/KlassifikasjonssystemResource.java (90%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/KlassifikasjonssystemResources.java (93%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/KorrespondansepartResource.java (81%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/KorrespondansepartResources.java (93%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/MappeResource.java (86%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/MappeResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/MerknadResource.java (91%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/MerknadResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/PartResource.java (84%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/PartResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/RegistreringResource.java (87%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/RegistreringResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/SakResource.java (80%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/SakResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/SaksmappeResource.java (90%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/SaksmappeResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/SkjermingResource.java (85%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/SkjermingResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/TilgangResource.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/noark/TilgangResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/personal/PersonalmappeResource.java (89%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/personal/PersonalmappeResources.java (92%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResource.java (85%) rename fint-arkiv-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResources.java (92%) rename fint-arkiv-resource-model-java/src/test/groovy/no/novari/{ => fint}/model/arkiv/test/ModelSpec.groovy (82%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/FellesActions.java (93%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/Kontaktperson.java (89%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/Person.java (91%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/Virksomhet.java (92%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/basisklasser/Aktor.java (67%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/basisklasser/BasisklasserActions.java (89%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/basisklasser/Begrep.java (81%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/basisklasser/Enhet.java (77%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/kodeverk/Fylke.java (90%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/kodeverk/KodeverkActions.java (92%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/kodeverk/Kommune.java (90%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/kodeverk/Valuta.java (84%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/kodeverk/iso/IsoActions.java (91%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/kodeverk/iso/Kjonn.java (78%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/kodeverk/iso/Landkode.java (78%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/kodeverk/iso/Sprak.java (78%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/kompleksedatatyper/Adresse.java (89%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/kompleksedatatyper/Identifikator.java (74%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/kompleksedatatyper/KompleksedatatyperActions.java (88%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/kompleksedatatyper/Kontaktinformasjon.java (73%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/kompleksedatatyper/Matrikkelnummer.java (88%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/kompleksedatatyper/Periode.java (77%) rename fint-felles-model-java/src/main/java/no/{ => novari}/fint/model/felles/kompleksedatatyper/Personnavn.java (75%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/KontaktpersonResource.java (85%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/KontaktpersonResources.java (93%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/PersonResource.java (92%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/PersonResources.java (93%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/VirksomhetResource.java (86%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/VirksomhetResources.java (93%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/basisklasser/AktorResource.java (74%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/basisklasser/AktorResources.java (91%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/basisklasser/BegrepResource.java (84%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/basisklasser/BegrepResources.java (91%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/basisklasser/EnhetResource.java (80%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/basisklasser/EnhetResources.java (91%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/kodeverk/FylkeResource.java (84%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/kodeverk/FylkeResources.java (91%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/kodeverk/KommuneResource.java (83%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/kodeverk/KommuneResources.java (92%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/kodeverk/ValutaResource.java (87%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/kodeverk/ValutaResources.java (91%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/kodeverk/iso/KjonnResource.java (80%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/kodeverk/iso/KjonnResources.java (91%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/kodeverk/iso/LandkodeResource.java (80%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/kodeverk/iso/LandkodeResources.java (91%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/kodeverk/iso/SprakResource.java (80%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/kodeverk/iso/SprakResources.java (91%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/kompleksedatatyper/AdresseResource.java (82%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/kompleksedatatyper/AdresseResources.java (90%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResource.java (84%) rename fint-felles-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResources.java (91%) rename fint-felles-resource-model-java/src/test/groovy/no/novari/{ => fint}/test/model/ModelDeserializationSpec.groovy (94%) rename fint-felles-resource-model-java/src/test/groovy/no/novari/{ => fint}/test/model/ModelSerializationSpec.groovy (87%) rename fint-felles-resource-model-java/src/test/groovy/no/novari/{ => fint}/test/model/SpringModelDeserializationSpec.groovy (92%) rename {fint-utdanning-resource-model-java/src/test/groovy/no/novari => fint-felles-resource-model-java/src/test/groovy/no/novari/fint}/test/model/utils/TestApplication.java (89%) rename {fint-utdanning-resource-model-java/src/test/groovy/no/novari => fint-felles-resource-model-java/src/test/groovy/no/novari/fint}/test/model/utils/TestConfiguration.java (93%) rename fint-okonomi-model-java/src/main/java/no/{ => novari}/fint/model/okonomi/faktura/Faktura.java (92%) rename fint-okonomi-model-java/src/main/java/no/{ => novari}/fint/model/okonomi/faktura/FakturaActions.java (92%) rename fint-okonomi-model-java/src/main/java/no/{ => novari}/fint/model/okonomi/faktura/Fakturagrunnlag.java (90%) rename fint-okonomi-model-java/src/main/java/no/{ => novari}/fint/model/okonomi/faktura/Fakturalinje.java (91%) rename fint-okonomi-model-java/src/main/java/no/{ => novari}/fint/model/okonomi/faktura/Fakturamottaker.java (89%) rename fint-okonomi-model-java/src/main/java/no/{ => novari}/fint/model/okonomi/faktura/Fakturautsteder.java (93%) rename fint-okonomi-model-java/src/main/java/no/{ => novari}/fint/model/okonomi/kodeverk/KodeverkActions.java (91%) rename fint-okonomi-model-java/src/main/java/no/{ => novari}/fint/model/okonomi/kodeverk/Merverdiavgift.java (82%) rename fint-okonomi-model-java/src/main/java/no/{ => novari}/fint/model/okonomi/kodeverk/Vare.java (91%) rename fint-okonomi-model-java/src/main/java/no/{ => novari}/fint/model/okonomi/regnskap/Bilag.java (77%) rename fint-okonomi-model-java/src/main/java/no/{ => novari}/fint/model/okonomi/regnskap/Leverandor.java (93%) rename fint-okonomi-model-java/src/main/java/no/{ => novari}/fint/model/okonomi/regnskap/Leverandorgruppe.java (93%) rename fint-okonomi-model-java/src/main/java/no/{ => novari}/fint/model/okonomi/regnskap/Postering.java (91%) rename fint-okonomi-model-java/src/main/java/no/{ => novari}/fint/model/okonomi/regnskap/RegnskapActions.java (93%) rename fint-okonomi-model-java/src/main/java/no/{ => novari}/fint/model/okonomi/regnskap/Transaksjon.java (92%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/faktura/FakturaResource.java (88%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/faktura/FakturaResources.java (92%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/faktura/FakturagrunnlagResource.java (87%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/faktura/FakturagrunnlagResources.java (92%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/faktura/FakturalinjeResource.java (86%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/faktura/FakturalinjeResources.java (92%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/faktura/FakturamottakerResource.java (81%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/faktura/FakturamottakerResources.java (92%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/faktura/FakturautstederResource.java (91%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/faktura/FakturautstederResources.java (92%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResource.java (84%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResources.java (92%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/kodeverk/VareResource.java (88%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/kodeverk/VareResources.java (91%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/regnskap/LeverandorResource.java (91%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/regnskap/LeverandorResources.java (92%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/regnskap/LeverandorgruppeResource.java (88%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/regnskap/LeverandorgruppeResources.java (92%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/regnskap/PosteringResource.java (87%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/regnskap/PosteringResources.java (92%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/regnskap/TransaksjonResource.java (91%) rename fint-okonomi-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/okonomi/regnskap/TransaksjonResources.java (92%) rename fint-personvern-model-java/src/main/java/no/{ => novari}/fint/model/personvern/kodeverk/Behandlingsgrunnlag.java (78%) rename fint-personvern-model-java/src/main/java/no/{ => novari}/fint/model/personvern/kodeverk/KodeverkActions.java (91%) rename fint-personvern-model-java/src/main/java/no/{ => novari}/fint/model/personvern/kodeverk/Personopplysning.java (78%) rename fint-personvern-model-java/src/main/java/no/{ => novari}/fint/model/personvern/samtykke/Behandling.java (94%) rename fint-personvern-model-java/src/main/java/no/{ => novari}/fint/model/personvern/samtykke/Samtykke.java (92%) rename fint-personvern-model-java/src/main/java/no/{ => novari}/fint/model/personvern/samtykke/SamtykkeActions.java (91%) rename fint-personvern-model-java/src/main/java/no/{ => novari}/fint/model/personvern/samtykke/Tjeneste.java (93%) rename fint-personvern-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResource.java (81%) rename fint-personvern-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResources.java (92%) rename fint-personvern-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/personvern/kodeverk/PersonopplysningResource.java (80%) rename fint-personvern-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/personvern/kodeverk/PersonopplysningResources.java (92%) rename fint-personvern-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/personvern/samtykke/BehandlingResource.java (92%) rename fint-personvern-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/personvern/samtykke/BehandlingResources.java (91%) rename fint-personvern-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/personvern/samtykke/SamtykkeResource.java (89%) rename fint-personvern-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/personvern/samtykke/SamtykkeResources.java (91%) rename fint-personvern-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/personvern/samtykke/TjenesteResource.java (88%) rename fint-personvern-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/personvern/samtykke/TjenesteResources.java (91%) rename fint-ressurs-model-java/src/main/java/no/{ => novari}/fint/model/ressurs/eiendel/Applikasjon.java (92%) rename fint-ressurs-model-java/src/main/java/no/{ => novari}/fint/model/ressurs/eiendel/Applikasjonsressurs.java (93%) rename fint-ressurs-model-java/src/main/java/no/{ => novari}/fint/model/ressurs/eiendel/Applikasjonsressurstilgjengelighet.java (91%) rename fint-ressurs-model-java/src/main/java/no/{ => novari}/fint/model/ressurs/eiendel/EiendelActions.java (93%) rename fint-ressurs-model-java/src/main/java/no/{ => novari}/fint/model/ressurs/kodeverk/Applikasjonskategori.java (79%) rename fint-ressurs-model-java/src/main/java/no/{ => novari}/fint/model/ressurs/kodeverk/Brukertype.java (78%) rename fint-ressurs-model-java/src/main/java/no/{ => novari}/fint/model/ressurs/kodeverk/Handhevingstype.java (79%) rename fint-ressurs-model-java/src/main/java/no/{ => novari}/fint/model/ressurs/kodeverk/KodeverkActions.java (94%) rename fint-ressurs-model-java/src/main/java/no/{ => novari}/fint/model/ressurs/kodeverk/Lisensmodell.java (78%) rename fint-ressurs-model-java/src/main/java/no/{ => novari}/fint/model/ressurs/kodeverk/Plattform.java (78%) rename fint-ressurs-model-java/src/main/java/no/{ => novari}/fint/model/ressurs/tilgang/Identitet.java (93%) rename fint-ressurs-model-java/src/main/java/no/{ => novari}/fint/model/ressurs/tilgang/Rettighet.java (92%) rename fint-ressurs-model-java/src/main/java/no/{ => novari}/fint/model/ressurs/tilgang/TilgangActions.java (91%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/eiendel/ApplikasjonResource.java (89%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/eiendel/ApplikasjonResources.java (92%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResource.java (92%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResources.java (92%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResource.java (87%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResources.java (93%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResource.java (81%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResources.java (92%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/kodeverk/BrukertypeResource.java (81%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/kodeverk/BrukertypeResources.java (92%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/kodeverk/HandhevingstypeResource.java (81%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/kodeverk/HandhevingstypeResources.java (92%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/kodeverk/LisensmodellResource.java (81%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/kodeverk/LisensmodellResources.java (92%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/kodeverk/PlattformResource.java (81%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/kodeverk/PlattformResources.java (92%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/tilgang/IdentitetResource.java (90%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/tilgang/IdentitetResources.java (92%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/tilgang/RettighetResource.java (87%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/tilgang/RettighetResources.java (92%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/basisklasser/BasisklasserActions.java (88%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/basisklasser/Gruppe.java (91%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/basisklasser/Gruppemedlemskap.java (80%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/basisklasser/Utdanningsforhold.java (93%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/elev/Basisgruppe.java (92%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/elev/Basisgruppemedlemskap.java (90%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/elev/Elev.java (90%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/elev/ElevActions.java (96%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/elev/Elevforhold.java (94%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/elev/Elevtilrettelegging.java (93%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/elev/Kontaktlarergruppe.java (92%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/elev/Kontaktlarergruppemedlemskap.java (90%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/elev/Medlemskap.java (94%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/elev/Persongruppe.java (92%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/elev/Persongruppemedlemskap.java (90%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/elev/Skoleressurs.java (94%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/elev/Undervisningsforhold.java (92%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/elev/Varsel.java (94%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Avbruddsarsak.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Betalingsstatus.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Bevistype.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Brevtype.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Eksamensform.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Elevkategori.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Fagmerknad.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Fagstatus.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Fravarstype.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Fullfortkode.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Grepreferanse.java (69%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Karakterskala.java (91%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Karakterstatus.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/KodeverkActions.java (97%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/OtEnhet.java (90%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/OtStatus.java (82%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Provestatus.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Skolear.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Skoleeiertype.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Termin.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Tilrettelegging.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Varseltype.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Vigoreferanse.java (69%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/kodeverk/Vitnemalsmerknad.java (78%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/larling/AvlagtProve.java (94%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/larling/Larling.java (92%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/larling/LarlingActions.java (91%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/ot/OtActions.java (91%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/ot/OtUngdom.java (93%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/timeplan/Eksamen.java (91%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/timeplan/Fag.java (92%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/timeplan/Faggruppe.java (91%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/timeplan/Faggruppemedlemskap.java (91%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/timeplan/Rom.java (93%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/timeplan/Time.java (92%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/timeplan/TimeplanActions.java (94%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/timeplan/Undervisningsgruppe.java (92%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/timeplan/Undervisningsgruppemedlemskap.java (90%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/utdanningsprogram/Arstrinn.java (90%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/utdanningsprogram/Programomrade.java (91%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/utdanningsprogram/Programomrademedlemskap.java (90%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/utdanningsprogram/Skole.java (94%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/utdanningsprogram/Utdanningsprogram.java (90%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/utdanningsprogram/UtdanningsprogramActions.java (92%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Anmerkninger.java (93%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Eksamensgruppe.java (94%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Eksamensgruppemedlemskap.java (92%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Eksamensvurdering.java (91%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Elevfravar.java (93%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Elevvurdering.java (95%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Fagvurdering.java (94%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Fravar.java (92%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Fravarsoversikt.java (91%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Fravarsprosent.java (76%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Fravarsregistrering.java (92%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Halvarsfagvurdering.java (91%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Halvarsordensvurdering.java (90%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Karakterhistorie.java (94%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Karakterverdi.java (90%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Ordensvurdering.java (93%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Sensor.java (93%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Sluttfagvurdering.java (91%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Sluttordensvurdering.java (90%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Underveisfagvurdering.java (91%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Underveisordensvurdering.java (90%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/Vurdering.java (94%) rename fint-utdanning-model-java/src/main/java/no/{ => novari}/fint/model/utdanning/vurdering/VurderingActions.java (97%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/basisklasser/GruppeResource.java (89%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/basisklasser/GruppeResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResource.java (83%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResource.java (88%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/BasisgruppeResource.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/BasisgruppeResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResource.java (85%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResources.java (93%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/ElevResource.java (87%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/ElevResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/ElevforholdResource.java (96%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/ElevforholdResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/ElevtilretteleggingResource.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/ElevtilretteleggingResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/KontaktlarergruppeResource.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/KontaktlarergruppeResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResource.java (86%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResources.java (93%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/MedlemskapResource.java (93%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/MedlemskapResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/PersongruppeResource.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/PersongruppeResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/PersongruppemedlemskapResource.java (86%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/PersongruppemedlemskapResources.java (93%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/SkoleressursResource.java (93%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/SkoleressursResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/UndervisningsforholdResource.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/UndervisningsforholdResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/VarselResource.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/elev/VarselResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResource.java (80%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/BetalingsstatusResource.java (81%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/BetalingsstatusResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/BevistypeResource.java (80%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/BevistypeResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/BrevtypeResource.java (80%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/BrevtypeResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/EksamensformResource.java (80%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/EksamensformResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/ElevkategoriResource.java (80%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/ElevkategoriResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/FagmerknadResource.java (80%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/FagmerknadResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/FagstatusResource.java (80%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/FagstatusResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/FravarstypeResource.java (80%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/FravarstypeResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/FullfortkodeResource.java (80%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/FullfortkodeResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/KarakterskalaResource.java (86%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/KarakterskalaResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/KarakterstatusResource.java (80%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/KarakterstatusResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/OtEnhetResource.java (83%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/OtEnhetResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/OtStatusResource.java (85%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/OtStatusResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/ProvestatusResource.java (80%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/ProvestatusResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/SkolearResource.java (80%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/SkolearResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResource.java (80%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/TerminResource.java (80%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/TerminResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/TilretteleggingResource.java (81%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/TilretteleggingResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/VarseltypeResource.java (80%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/VarseltypeResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResource.java (81%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/larling/AvlagtProveResource.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/larling/AvlagtProveResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/larling/LarlingResource.java (89%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/larling/LarlingResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/ot/OtUngdomResource.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/ot/OtUngdomResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/timeplan/EksamenResource.java (87%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/timeplan/EksamenResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/timeplan/FagResource.java (90%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/timeplan/FagResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/timeplan/FaggruppeResource.java (88%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/timeplan/FaggruppeResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResource.java (89%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/timeplan/RomResource.java (89%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/timeplan/RomResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/timeplan/TimeResource.java (89%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/timeplan/TimeResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResource.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResource.java (86%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResource.java (84%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResources.java (90%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResource.java (89%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResources.java (90%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResource.java (85%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/utdanningsprogram/SkoleResource.java (94%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/utdanningsprogram/SkoleResources.java (90%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResource.java (84%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/AnmerkningerResource.java (88%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/AnmerkningerResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/EksamensgruppeResource.java (93%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/EksamensgruppeResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResource.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/EksamensvurderingResource.java (87%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/EksamensvurderingResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/ElevfravarResource.java (90%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/ElevfravarResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/ElevvurderingResource.java (95%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/ElevvurderingResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/FagvurderingResource.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/FagvurderingResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/FravarResource.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/FravarResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/FravarsoversiktResource.java (87%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/FravarsoversiktResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/FravarsregistreringResource.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/FravarsregistreringResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResource.java (85%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResource.java (85%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/KarakterhistorieResource.java (93%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/KarakterhistorieResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/KarakterverdiResource.java (83%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/KarakterverdiResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/OrdensvurderingResource.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/OrdensvurderingResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/SensorResource.java (90%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/SensorResources.java (91%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/SluttfagvurderingResource.java (88%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/SluttfagvurderingResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/SluttordensvurderingResource.java (85%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/SluttordensvurderingResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResource.java (85%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResource.java (85%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResources.java (92%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/VurderingResource.java (93%) rename fint-utdanning-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/utdanning/vurdering/VurderingResources.java (91%) rename fint-utdanning-resource-model-java/src/test/groovy/no/novari/{ => fint}/test/model/ModelDeserializationSpec.groovy (91%) rename fint-utdanning-resource-model-java/src/test/groovy/no/novari/{ => fint}/test/model/ModelSerializationSpec.groovy (79%) rename fint-utdanning-resource-model-java/src/test/groovy/no/novari/{ => fint}/test/model/SpringModelDeserializationSpec.groovy (82%) rename {fint-felles-resource-model-java/src/test/groovy/no/novari => fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint}/test/model/utils/TestApplication.java (89%) rename {fint-administrasjon-resource-model-java/src/test/groovy/no/novari => fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint}/test/model/utils/TestConfiguration.java (93%) diff --git a/build.gradle b/build.gradle index bc729935..a8af2ba7 100644 --- a/build.gradle +++ b/build.gradle @@ -9,9 +9,13 @@ allprojects { java { toolchain { languageVersion = JavaLanguageVersion.of(11) - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + tasks.withType(JavaCompile).configureEach { + options.release = 8 } project.group = 'no.novari' diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/fullmakt/Fullmakt.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/Fullmakt.java similarity index 94% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/fullmakt/Fullmakt.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/Fullmakt.java index ae517d2f..a2603873 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/fullmakt/Fullmakt.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/Fullmakt.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.fullmakt; +package no.novari.fint.model.administrasjon.fullmakt; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/fullmakt/FullmaktActions.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/FullmaktActions.java similarity index 90% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/fullmakt/FullmaktActions.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/FullmaktActions.java index 059ad2f9..aac0452d 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/fullmakt/FullmaktActions.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/FullmaktActions.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.fullmakt; +package no.novari.fint.model.administrasjon.fullmakt; import java.util.Arrays; import java.util.List; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/fullmakt/Rolle.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/Rolle.java similarity index 92% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/fullmakt/Rolle.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/Rolle.java index 127c7782..e6f90057 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/fullmakt/Rolle.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/Rolle.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.fullmakt; +package no.novari.fint.model.administrasjon.fullmakt; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Aktivitet.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Aktivitet.java similarity index 78% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Aktivitet.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Aktivitet.java index df67362d..fbfddb00 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Aktivitet.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Aktivitet.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,15 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.kodeverk.Kontodimensjon; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Anlegg.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Anlegg.java similarity index 78% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Anlegg.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Anlegg.java index 1b178451..79b8ce1b 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Anlegg.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Anlegg.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,15 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.kodeverk.Kontodimensjon; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Ansvar.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Ansvar.java similarity index 91% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Ansvar.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Ansvar.java index dd53193b..62fd6a9e 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Ansvar.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Ansvar.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.kodeverk.Kontodimensjon; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Arbeidsforholdstype.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Arbeidsforholdstype.java similarity index 90% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Arbeidsforholdstype.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Arbeidsforholdstype.java index cfa636e5..3f70be2c 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Arbeidsforholdstype.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Arbeidsforholdstype.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Art.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Art.java similarity index 78% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Art.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Art.java index 8eb46866..48a902be 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Art.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Art.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,15 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.kodeverk.Kontodimensjon; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Diverse.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Diverse.java similarity index 78% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Diverse.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Diverse.java index 9e6cde0e..0c45f92c 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Diverse.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Diverse.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,15 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.kodeverk.Kontodimensjon; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Formal.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Formal.java similarity index 78% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Formal.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Formal.java index 29723a93..d9d401a0 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Formal.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Formal.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,15 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.kodeverk.Kontodimensjon; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Fravarsgrunn.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Fravarsgrunn.java similarity index 78% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Fravarsgrunn.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Fravarsgrunn.java index e2cf3351..876e1a1f 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Fravarsgrunn.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Fravarsgrunn.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Fravarstype.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Fravarstype.java similarity index 90% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Fravarstype.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Fravarstype.java index ed579e8c..61481d5c 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Fravarstype.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Fravarstype.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Funksjon.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Funksjon.java similarity index 90% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Funksjon.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Funksjon.java index b83fc4d5..195b3099 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Funksjon.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Funksjon.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.kodeverk.Kontodimensjon; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/KodeverkActions.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/KodeverkActions.java similarity index 96% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/KodeverkActions.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/KodeverkActions.java index 8d567b40..3f5f8535 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/KodeverkActions.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/KodeverkActions.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import java.util.Arrays; import java.util.List; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Kontodimensjon.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Kontodimensjon.java similarity index 90% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Kontodimensjon.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Kontodimensjon.java index ad894b1c..d12fa261 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Kontodimensjon.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Kontodimensjon.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintAbstractObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Kontrakt.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Kontrakt.java similarity index 78% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Kontrakt.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Kontrakt.java index b952b0e4..ead0b5ab 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Kontrakt.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Kontrakt.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,15 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.kodeverk.Kontodimensjon; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Lonnsart.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Lonnsart.java similarity index 90% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Lonnsart.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Lonnsart.java index 4b25426c..f92b11be 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Lonnsart.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Lonnsart.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Lopenummer.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Lopenummer.java similarity index 78% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Lopenummer.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Lopenummer.java index 4454d03a..69f8d339 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Lopenummer.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Lopenummer.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,15 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.kodeverk.Kontodimensjon; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Objekt.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Objekt.java similarity index 78% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Objekt.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Objekt.java index 93449757..115a36d2 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Objekt.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Objekt.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,15 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.kodeverk.Kontodimensjon; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Personalressurskategori.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Personalressurskategori.java similarity index 78% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Personalressurskategori.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Personalressurskategori.java index bba4d5c7..19008165 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Personalressurskategori.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Personalressurskategori.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Prosjekt.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Prosjekt.java similarity index 90% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Prosjekt.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Prosjekt.java index 54f9e376..aaaddae6 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Prosjekt.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Prosjekt.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.kodeverk.Kontodimensjon; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Prosjektart.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Prosjektart.java similarity index 90% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Prosjektart.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Prosjektart.java index e70bf9a0..2b674f7c 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Prosjektart.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Prosjektart.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.kodeverk.Kontodimensjon; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Ramme.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Ramme.java similarity index 78% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Ramme.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Ramme.java index bc8a303b..631f499d 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Ramme.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Ramme.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,15 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.kodeverk.Kontodimensjon; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Stillingskode.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Stillingskode.java similarity index 90% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Stillingskode.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Stillingskode.java index 22d3528b..97288bba 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Stillingskode.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Stillingskode.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Uketimetall.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Uketimetall.java similarity index 78% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Uketimetall.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Uketimetall.java index 521c6cba..af819560 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kodeverk/Uketimetall.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Uketimetall.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kodeverk; +package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kompleksedatatyper/KompleksedatatyperActions.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kompleksedatatyper/KompleksedatatyperActions.java similarity index 86% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kompleksedatatyper/KompleksedatatyperActions.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kompleksedatatyper/KompleksedatatyperActions.java index 824efade..54a7e9b0 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kompleksedatatyper/KompleksedatatyperActions.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kompleksedatatyper/KompleksedatatyperActions.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kompleksedatatyper; +package no.novari.fint.model.administrasjon.kompleksedatatyper; import java.util.Arrays; import java.util.List; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kompleksedatatyper/Kontostreng.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kompleksedatatyper/Kontostreng.java similarity index 92% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kompleksedatatyper/Kontostreng.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kompleksedatatyper/Kontostreng.java index f595d94d..f1b80305 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/kompleksedatatyper/Kontostreng.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kompleksedatatyper/Kontostreng.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.kompleksedatatyper; +package no.novari.fint.model.administrasjon.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,12 +11,8 @@ import java.util.Collections; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/organisasjon/Arbeidslokasjon.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/Arbeidslokasjon.java similarity index 91% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/organisasjon/Arbeidslokasjon.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/Arbeidslokasjon.java index a6864f01..03837f58 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/organisasjon/Arbeidslokasjon.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/Arbeidslokasjon.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.organisasjon; +package no.novari.fint.model.administrasjon.organisasjon; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.felles.basisklasser.Enhet; +import no.novari.fint.model.felles.basisklasser.Enhet; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/organisasjon/OrganisasjonActions.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/OrganisasjonActions.java similarity index 90% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/organisasjon/OrganisasjonActions.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/OrganisasjonActions.java index 4fa01bdb..2d80a10b 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/organisasjon/OrganisasjonActions.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/OrganisasjonActions.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.organisasjon; +package no.novari.fint.model.administrasjon.organisasjon; import java.util.Arrays; import java.util.List; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/organisasjon/Organisasjonselement.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/Organisasjonselement.java similarity index 91% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/organisasjon/Organisasjonselement.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/Organisasjonselement.java index 1dc9a985..34593ef3 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/organisasjon/Organisasjonselement.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/Organisasjonselement.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.organisasjon; +package no.novari.fint.model.administrasjon.organisasjon; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,13 +16,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.felles.basisklasser.Enhet; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; +import no.novari.fint.model.felles.basisklasser.Enhet; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Arbeidsforhold.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Arbeidsforhold.java similarity index 95% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Arbeidsforhold.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Arbeidsforhold.java index 6381dddf..0787a5e8 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Arbeidsforhold.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Arbeidsforhold.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.personal; +package no.novari.fint.model.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Fastlonn.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fastlonn.java similarity index 92% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Fastlonn.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fastlonn.java index c5b218d8..b863bd3f 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Fastlonn.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fastlonn.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.personal; +package no.novari.fint.model.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.personal.Lonn; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Fasttillegg.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fasttillegg.java similarity index 92% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Fasttillegg.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fasttillegg.java index 6d08ed56..782b8c04 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Fasttillegg.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fasttillegg.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.personal; +package no.novari.fint.model.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.personal.Lonn; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Fravar.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fravar.java similarity index 92% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Fravar.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fravar.java index 336c2c82..89e80b26 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Fravar.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fravar.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.personal; +package no.novari.fint.model.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,13 +16,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; + +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Lonn.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Lonn.java similarity index 90% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Lonn.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Lonn.java index dd127dc3..8df55334 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Lonn.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Lonn.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.personal; +package no.novari.fint.model.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,14 +16,14 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintAbstractObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.administrasjon.kompleksedatatyper.Kontostreng; -import no.fint.model.felles.kompleksedatatyper.Periode; + +import no.novari.fint.model.administrasjon.kompleksedatatyper.Kontostreng; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/PersonalActions.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/PersonalActions.java similarity index 93% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/PersonalActions.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/PersonalActions.java index 055af106..29a915dc 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/PersonalActions.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/PersonalActions.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.personal; +package no.novari.fint.model.administrasjon.personal; import java.util.Arrays; import java.util.List; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Personalressurs.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Personalressurs.java similarity index 92% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Personalressurs.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Personalressurs.java index 979e4d2c..b3bd6f33 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Personalressurs.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Personalressurs.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.personal; +package no.novari.fint.model.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,14 +16,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; +import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Variabellonn.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Variabellonn.java similarity index 92% rename from fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Variabellonn.java rename to fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Variabellonn.java index 77604960..efbc4ced 100644 --- a/fint-administrasjon-model-java/src/main/java/no/fint/model/administrasjon/personal/Variabellonn.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Variabellonn.java @@ -1,4 +1,4 @@ -package no.fint.model.administrasjon.personal; +package no.novari.fint.model.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.personal.Lonn; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/fullmakt/FullmaktResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/FullmaktResource.java similarity index 95% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/fullmakt/FullmaktResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/FullmaktResource.java index 4f323ce5..3a3ba4b2 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/fullmakt/FullmaktResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/FullmaktResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.fullmakt; +package no.novari.fint.model.resource.administrasjon.fullmakt; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/fullmakt/FullmaktResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/FullmaktResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/fullmakt/FullmaktResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/FullmaktResources.java index 714c279d..4f02ae6a 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/fullmakt/FullmaktResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/FullmaktResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.fullmakt; +package no.novari.fint.model.resource.administrasjon.fullmakt; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/fullmakt/RolleResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/RolleResource.java similarity index 88% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/fullmakt/RolleResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/RolleResource.java index d0331189..008fe96f 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/fullmakt/RolleResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/RolleResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.fullmakt; +package no.novari.fint.model.resource.administrasjon.fullmakt; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/fullmakt/RolleResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/RolleResources.java similarity index 90% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/fullmakt/RolleResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/RolleResources.java index ad560083..933a8b16 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/fullmakt/RolleResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/RolleResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.fullmakt; +package no.novari.fint.model.resource.administrasjon.fullmakt; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AktivitetResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AktivitetResource.java similarity index 78% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AktivitetResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AktivitetResource.java index b38a45ea..d9841912 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AktivitetResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AktivitetResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.kodeverk.KontodimensjonResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AktivitetResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AktivitetResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AktivitetResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AktivitetResources.java index 65953aa5..4bde99ba 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AktivitetResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AktivitetResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AnleggResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnleggResource.java similarity index 78% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AnleggResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnleggResource.java index ffd1b4b6..6615b78c 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AnleggResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnleggResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.kodeverk.KontodimensjonResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AnleggResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnleggResources.java similarity index 90% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AnleggResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnleggResources.java index e53c8378..4b4fd1ef 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AnleggResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnleggResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AnsvarResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnsvarResource.java similarity index 86% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AnsvarResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnsvarResource.java index d6a4df31..91496523 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AnsvarResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnsvarResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.kodeverk.KontodimensjonResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AnsvarResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnsvarResources.java similarity index 90% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AnsvarResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnsvarResources.java index d2dc3af6..67043469 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/AnsvarResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnsvarResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResource.java similarity index 83% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResource.java index faf7cbcf..1595ad1b 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResources.java index 21da25bb..1a2012e4 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ArtResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArtResource.java similarity index 78% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ArtResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArtResource.java index bedc3455..f403cced 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ArtResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArtResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.kodeverk.KontodimensjonResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ArtResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArtResources.java similarity index 90% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ArtResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArtResources.java index 61521c9e..f74bd793 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ArtResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArtResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/DiverseResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/DiverseResource.java similarity index 78% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/DiverseResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/DiverseResource.java index f89dc13c..82833bbc 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/DiverseResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/DiverseResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.kodeverk.KontodimensjonResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/DiverseResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/DiverseResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/DiverseResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/DiverseResources.java index 50b95119..8ea910c2 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/DiverseResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/DiverseResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FormalResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FormalResource.java similarity index 78% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FormalResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FormalResource.java index 451a7c81..88e413d4 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FormalResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FormalResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.kodeverk.KontodimensjonResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FormalResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FormalResources.java similarity index 90% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FormalResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FormalResources.java index 64bc036c..535a69fe 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FormalResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FormalResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResource.java similarity index 80% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResource.java index b7e89cab..3662d2a0 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResources.java index 55be7367..ecbf7dae 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FravarstypeResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarstypeResource.java similarity index 84% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FravarstypeResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarstypeResource.java index 8436d52c..a0fedfd0 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FravarstypeResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarstypeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FravarstypeResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarstypeResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FravarstypeResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarstypeResources.java index 4ca02a17..ae57df37 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FravarstypeResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarstypeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FunksjonResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FunksjonResource.java similarity index 84% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FunksjonResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FunksjonResource.java index b9f3f72f..d3f3954e 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FunksjonResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FunksjonResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.kodeverk.KontodimensjonResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FunksjonResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FunksjonResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FunksjonResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FunksjonResources.java index 3c1c96d3..60eb08d6 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/FunksjonResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FunksjonResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/KontodimensjonResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontodimensjonResource.java similarity index 84% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/KontodimensjonResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontodimensjonResource.java index 98284101..4d30c308 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/KontodimensjonResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontodimensjonResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintAbstractObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/KontodimensjonResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontodimensjonResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/KontodimensjonResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontodimensjonResources.java index 4f41eafa..1c56638e 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/KontodimensjonResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontodimensjonResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/KontraktResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontraktResource.java similarity index 78% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/KontraktResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontraktResource.java index 570fac22..046b63ae 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/KontraktResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontraktResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.kodeverk.KontodimensjonResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/KontraktResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontraktResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/KontraktResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontraktResources.java index 7486f134..4b948844 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/KontraktResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontraktResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/LonnsartResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LonnsartResource.java similarity index 83% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/LonnsartResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LonnsartResource.java index 4fc041b7..31d32502 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/LonnsartResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LonnsartResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/LonnsartResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LonnsartResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/LonnsartResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LonnsartResources.java index 02b1a652..fb0f5925 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/LonnsartResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LonnsartResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/LopenummerResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LopenummerResource.java similarity index 79% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/LopenummerResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LopenummerResource.java index f76c0c5c..9f3371b7 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/LopenummerResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LopenummerResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.kodeverk.KontodimensjonResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/LopenummerResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LopenummerResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/LopenummerResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LopenummerResources.java index 1257743f..34e211df 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/LopenummerResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LopenummerResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ObjektResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ObjektResource.java similarity index 78% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ObjektResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ObjektResource.java index 5900d033..a0ae5251 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ObjektResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ObjektResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.kodeverk.KontodimensjonResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ObjektResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ObjektResources.java similarity index 90% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ObjektResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ObjektResources.java index a0a5f01b..53a9193d 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ObjektResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ObjektResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResource.java similarity index 80% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResource.java index cb55cc8b..3024eb9d 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResources.java similarity index 92% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResources.java index 8401b743..7fa5bce2 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ProsjektResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektResource.java similarity index 82% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ProsjektResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektResource.java index 6f700b79..71edd27b 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ProsjektResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.kodeverk.KontodimensjonResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ProsjektResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ProsjektResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektResources.java index c60b9547..94b266e6 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ProsjektResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ProsjektartResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektartResource.java similarity index 86% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ProsjektartResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektartResource.java index de1c255d..24148905 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ProsjektartResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektartResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.kodeverk.KontodimensjonResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ProsjektartResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektartResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ProsjektartResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektartResources.java index 17c36687..787d2ed8 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/ProsjektartResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektartResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/RammeResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/RammeResource.java similarity index 78% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/RammeResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/RammeResource.java index 1054f61d..91469473 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/RammeResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/RammeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.kodeverk.KontodimensjonResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/RammeResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/RammeResources.java similarity index 90% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/RammeResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/RammeResources.java index c390b09f..bb4e55ae 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/RammeResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/RammeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/StillingskodeResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/StillingskodeResource.java similarity index 83% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/StillingskodeResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/StillingskodeResource.java index a27f1e9f..bc99291b 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/StillingskodeResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/StillingskodeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/StillingskodeResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/StillingskodeResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/StillingskodeResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/StillingskodeResources.java index 30baeaf2..f7422e9f 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/StillingskodeResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/StillingskodeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/UketimetallResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/UketimetallResource.java similarity index 80% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/UketimetallResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/UketimetallResource.java index 71886c02..2a3b313c 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/UketimetallResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/UketimetallResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/UketimetallResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/UketimetallResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/UketimetallResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/UketimetallResources.java index be8ac465..bcc39cb2 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kodeverk/UketimetallResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/UketimetallResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kodeverk; +package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResource.java similarity index 93% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResource.java index ae05eb83..5d659d16 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kompleksedatatyper; +package no.novari.fint.model.resource.administrasjon.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,11 +11,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.resource.Link; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResources.java similarity index 90% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResources.java index 521b2266..053c3eb8 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.kompleksedatatyper; +package no.novari.fint.model.resource.administrasjon.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResource.java similarity index 85% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResource.java index 45c7c836..960c7e22 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.organisasjon; +package no.novari.fint.model.resource.administrasjon.organisasjon; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.felles.basisklasser.EnhetResource; +import no.novari.fint.model.resource.felles.basisklasser.EnhetResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResources.java index 549a215b..e134d003 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.organisasjon; +package no.novari.fint.model.resource.administrasjon.organisasjon; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResource.java similarity index 90% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResource.java index 013825b7..ad14b3f2 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.organisasjon; +package no.novari.fint.model.resource.administrasjon.organisasjon; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,14 +15,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.felles.basisklasser.EnhetResource; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; +import no.novari.fint.model.resource.felles.basisklasser.EnhetResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResources.java index d82f63f4..4c195eaa 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.organisasjon; +package no.novari.fint.model.resource.administrasjon.organisasjon; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/ArbeidsforholdResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/ArbeidsforholdResource.java similarity index 96% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/ArbeidsforholdResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/ArbeidsforholdResource.java index 2c2e4e03..8f167633 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/ArbeidsforholdResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/ArbeidsforholdResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.personal; +package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/ArbeidsforholdResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/ArbeidsforholdResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/ArbeidsforholdResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/ArbeidsforholdResources.java index e543a379..650b4094 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/ArbeidsforholdResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/ArbeidsforholdResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.personal; +package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FastlonnResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FastlonnResource.java similarity index 87% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FastlonnResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FastlonnResource.java index 6d821927..3396362c 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FastlonnResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FastlonnResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.personal; +package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.personal.LonnResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FastlonnResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FastlonnResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FastlonnResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FastlonnResources.java index 8349a68d..99f543f7 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FastlonnResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FastlonnResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.personal; +package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FasttilleggResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FasttilleggResource.java similarity index 87% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FasttilleggResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FasttilleggResource.java index 8de37869..e44003f0 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FasttilleggResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FasttilleggResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.personal; +package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.personal.LonnResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FasttilleggResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FasttilleggResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FasttilleggResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FasttilleggResources.java index 416f9911..5f2ebe13 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FasttilleggResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FasttilleggResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.personal; +package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FravarResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FravarResource.java similarity index 92% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FravarResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FravarResource.java index 2b0c6365..ce5c5b5a 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FravarResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FravarResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.personal; +package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,14 +15,14 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; + +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FravarResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FravarResources.java similarity index 90% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FravarResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FravarResources.java index 5b1088c9..973992fd 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/FravarResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FravarResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.personal; +package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/LonnResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/LonnResource.java similarity index 88% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/LonnResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/LonnResource.java index 20e1de32..9e6264f1 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/LonnResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/LonnResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.personal; +package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,15 +15,15 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintAbstractObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.administrasjon.kompleksedatatyper.KontostrengResource; -import no.fint.model.felles.kompleksedatatyper.Periode; + +import no.novari.fint.model.resource.administrasjon.kompleksedatatyper.KontostrengResource; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/LonnResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/LonnResources.java similarity index 90% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/LonnResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/LonnResources.java index 3f04e442..67e77cd7 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/LonnResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/LonnResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.personal; +package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/PersonalressursResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/PersonalressursResource.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/PersonalressursResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/PersonalressursResource.java index cd8cfca7..40a02873 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/PersonalressursResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/PersonalressursResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.personal; +package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,15 +15,14 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; +import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/PersonalressursResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/PersonalressursResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/PersonalressursResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/PersonalressursResources.java index 097fe2f8..0834373f 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/PersonalressursResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/PersonalressursResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.personal; +package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/VariabellonnResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/VariabellonnResource.java similarity index 87% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/VariabellonnResource.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/VariabellonnResource.java index 24cb4fe2..a2df9f69 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/VariabellonnResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/VariabellonnResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.personal; +package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.personal.LonnResource; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/VariabellonnResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/VariabellonnResources.java similarity index 91% rename from fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/VariabellonnResources.java rename to fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/VariabellonnResources.java index 98de5706..4a27c03e 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/fint/model/resource/administrasjon/personal/VariabellonnResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/VariabellonnResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.administrasjon.personal; +package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy similarity index 95% rename from fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy rename to fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy index 73c99f65..fb0d6e2d 100644 --- a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy +++ b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy @@ -1,11 +1,11 @@ -package no.novari.test.model +package no.novari.fint.test.model import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException -import no.novari.model.administrasjon.personal.Fastlonn -import no.novari.model.resource.administrasjon.personal.FastlonnResource -import no.novari.model.resource.administrasjon.personal.FastlonnResources +import no.novari.fint.model.administrasjon.personal.Fastlonn +import no.novari.fint.model.resource.administrasjon.personal.FastlonnResource +import no.novari.fint.model.resource.administrasjon.personal.FastlonnResources import spock.lang.Specification class ModelDeserializationSpec extends Specification { diff --git a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy similarity index 87% rename from fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy rename to fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy index 7d3e24a8..6f349ee3 100644 --- a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy +++ b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy @@ -1,16 +1,16 @@ -package no.novari.test.model +package no.novari.fint.test.model import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.databind.util.ISO8601DateFormat import groovy.json.JsonSlurper -import no.novari.model.administrasjon.kompleksedatatyper.Kontostreng -import no.novari.model.administrasjon.personal.Fastlonn -import no.novari.model.felles.kompleksedatatyper.Identifikator -import no.novari.model.felles.kompleksedatatyper.Periode -import no.novari.model.resource.Link -import no.novari.model.resource.administrasjon.kompleksedatatyper.KontostrengResource -import no.novari.model.resource.administrasjon.personal.FastlonnResource +import no.novari.fint.model.administrasjon.kompleksedatatyper.Kontostreng +import no.novari.fint.model.administrasjon.personal.Fastlonn +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator +import no.novari.fint.model.felles.kompleksedatatyper.Periode +import no.fint.model.resource.Link +import no.novari.fint.model.resource.administrasjon.kompleksedatatyper.KontostrengResource +import no.novari.fint.model.resource.administrasjon.personal.FastlonnResource import spock.lang.Specification class ModelSerializationSpec extends Specification { diff --git a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy similarity index 91% rename from fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy rename to fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy index 33ed20f5..2e325eac 100644 --- a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy +++ b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy @@ -1,9 +1,9 @@ -package no.novari.test.model +package no.novari.fint.test.model import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.ObjectMapper -import no.novari.model.administrasjon.personal.Fastlonn -import no.novari.test.model.utils.TestApplication +import no.novari.fint.model.administrasjon.personal.Fastlonn +import no.novari.fint.test.model.utils.TestApplication import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest import org.springframework.hateoas.Resource diff --git a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java similarity index 86% rename from fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java rename to fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java index 5efe57bc..231de0e6 100644 --- a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java +++ b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java @@ -1,4 +1,4 @@ -package no.novari.test.model.utils; +package no.novari.fint.test.model.utils; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.hateoas.config.EnableHypermediaSupport; diff --git a/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java similarity index 93% rename from fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java rename to fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java index 1395b189..30f67c1c 100644 --- a/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java +++ b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java @@ -1,4 +1,4 @@ -package no.novari.test.model.utils; +package no.novari.fint.test.model.utils; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.context.annotation.Bean; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/DokumentStatus.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/DokumentStatus.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/DokumentStatus.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/DokumentStatus.java index bba39965..918870dd 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/DokumentStatus.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/DokumentStatus.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/DokumentType.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/DokumentType.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/DokumentType.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/DokumentType.java index 22b59566..842bf4fe 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/DokumentType.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/DokumentType.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Format.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Format.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Format.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Format.java index 1295426f..888531a7 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Format.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Format.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/JournalStatus.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/JournalStatus.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/JournalStatus.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/JournalStatus.java index 334cc030..3eb23a6d 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/JournalStatus.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/JournalStatus.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/JournalpostType.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/JournalpostType.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/JournalpostType.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/JournalpostType.java index f6232294..a929b852 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/JournalpostType.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/JournalpostType.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Klassifikasjonstype.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Klassifikasjonstype.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Klassifikasjonstype.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Klassifikasjonstype.java index 42de80ff..398ab777 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Klassifikasjonstype.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Klassifikasjonstype.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/KodeverkActions.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/KodeverkActions.java similarity index 97% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/KodeverkActions.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/KodeverkActions.java index ea44f141..14ff0dd2 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/KodeverkActions.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/KodeverkActions.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import java.util.Arrays; import java.util.List; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/KorrespondansepartType.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/KorrespondansepartType.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/KorrespondansepartType.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/KorrespondansepartType.java index be8298d5..ffd39bff 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/KorrespondansepartType.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/KorrespondansepartType.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Merknadstype.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Merknadstype.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Merknadstype.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Merknadstype.java index 543d69e4..04e3520b 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Merknadstype.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Merknadstype.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/PartRolle.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/PartRolle.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/PartRolle.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/PartRolle.java index 302187d3..facf8ded 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/PartRolle.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/PartRolle.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Rolle.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Rolle.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Rolle.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Rolle.java index 42b71750..92e0cf78 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Rolle.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Rolle.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Saksmappetype.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Saksmappetype.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Saksmappetype.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Saksmappetype.java index dcbdadfd..ef36df0c 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Saksmappetype.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Saksmappetype.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Saksstatus.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Saksstatus.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Saksstatus.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Saksstatus.java index 09f27ed5..9aedb49f 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Saksstatus.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Saksstatus.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Skjermingshjemmel.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Skjermingshjemmel.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Skjermingshjemmel.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Skjermingshjemmel.java index f320159d..e58282f8 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Skjermingshjemmel.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Skjermingshjemmel.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Tilgangsgruppe.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Tilgangsgruppe.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Tilgangsgruppe.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Tilgangsgruppe.java index 9ca552f9..72a84b57 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Tilgangsgruppe.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Tilgangsgruppe.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Tilgangsrestriksjon.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Tilgangsrestriksjon.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Tilgangsrestriksjon.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Tilgangsrestriksjon.java index 2c53a18c..faa96aa0 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Tilgangsrestriksjon.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Tilgangsrestriksjon.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/TilknyttetRegistreringSom.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/TilknyttetRegistreringSom.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/TilknyttetRegistreringSom.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/TilknyttetRegistreringSom.java index c4c61276..f9393424 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/TilknyttetRegistreringSom.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/TilknyttetRegistreringSom.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Variantformat.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Variantformat.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Variantformat.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Variantformat.java index 22dbac6f..e80569c0 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kodeverk/Variantformat.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Variantformat.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kodeverk; +package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminne.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminne.java similarity index 80% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminne.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminne.java index e252a078..d1b7424d 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminne.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminne.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kulturminnevern; +package no.novari.fint.model.arkiv.kulturminnevern; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,23 +6,19 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Matrikkelnummer; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.arkiv.noark.Saksmappe; +import no.novari.fint.model.felles.kompleksedatatyper.Matrikkelnummer; +import no.novari.fint.model.arkiv.noark.Saksmappe; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kulturminnevern/KulturminnevernActions.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/KulturminnevernActions.java similarity index 93% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kulturminnevern/KulturminnevernActions.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/KulturminnevernActions.java index 39cd025b..e2546319 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kulturminnevern/KulturminnevernActions.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/KulturminnevernActions.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kulturminnevern; +package no.novari.fint.model.arkiv.kulturminnevern; import java.util.Arrays; import java.util.List; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kulturminnevern/TilskuddFartoy.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/TilskuddFartoy.java similarity index 83% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kulturminnevern/TilskuddFartoy.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/TilskuddFartoy.java index 980f0c04..763607e2 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kulturminnevern/TilskuddFartoy.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/TilskuddFartoy.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kulturminnevern; +package no.novari.fint.model.arkiv.kulturminnevern; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,22 +6,18 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.arkiv.noark.Saksmappe; +import no.novari.fint.model.arkiv.noark.Saksmappe; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEie.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEie.java similarity index 80% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEie.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEie.java index ffcf9e91..94e50d83 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEie.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEie.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.kulturminnevern; +package no.novari.fint.model.arkiv.kulturminnevern; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,23 +6,19 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Matrikkelnummer; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.arkiv.noark.Saksmappe; +import no.novari.fint.model.felles.kompleksedatatyper.Matrikkelnummer; +import no.novari.fint.model.arkiv.noark.Saksmappe; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/AdministrativEnhet.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/AdministrativEnhet.java similarity index 91% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/AdministrativEnhet.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/AdministrativEnhet.java index d7c97984..992a00d5 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/AdministrativEnhet.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/AdministrativEnhet.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Arkivdel.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Arkivdel.java similarity index 93% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Arkivdel.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Arkivdel.java index fe068a8d..3406d8e0 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Arkivdel.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Arkivdel.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Arkivressurs.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Arkivressurs.java similarity index 92% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Arkivressurs.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Arkivressurs.java index f6eabb95..24c57be7 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Arkivressurs.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Arkivressurs.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -14,13 +14,12 @@ import java.util.Map; import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Autorisasjon.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Autorisasjon.java similarity index 93% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Autorisasjon.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Autorisasjon.java index 01865d4e..732ba5fc 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Autorisasjon.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Autorisasjon.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Avskrivning.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Avskrivning.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Avskrivning.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Avskrivning.java index 6542f13e..2a6a63dc 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Avskrivning.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Avskrivning.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,17 +6,10 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; -import java.util.Collections; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.HashMap; + import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Dokumentbeskrivelse.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentbeskrivelse.java similarity index 90% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Dokumentbeskrivelse.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentbeskrivelse.java index 3fa77339..033d9bf9 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Dokumentbeskrivelse.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentbeskrivelse.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,19 +11,14 @@ import java.util.Collections; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.arkiv.noark.Dokumentobjekt; + import java.util.Date; -import no.fint.model.arkiv.noark.Part; -import no.fint.model.arkiv.noark.Skjerming; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Dokumentfil.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentfil.java similarity index 84% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Dokumentfil.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentfil.java index 9af74e57..ff558300 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Dokumentfil.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentfil.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,17 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Dokumentobjekt.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentobjekt.java similarity index 91% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Dokumentobjekt.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentobjekt.java index 70a71330..2b54f248 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Dokumentobjekt.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentobjekt.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,12 +11,8 @@ import java.util.Collections; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Journalpost.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Journalpost.java similarity index 90% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Journalpost.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Journalpost.java index 4488d91b..68b3d04c 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Journalpost.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Journalpost.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,18 +11,14 @@ import java.util.Collections; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.arkiv.noark.Avskrivning; + import java.util.Date; -import no.fint.model.arkiv.noark.Registrering; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Klasse.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Klasse.java similarity index 91% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Klasse.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Klasse.java index f0f97cf9..25904924 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Klasse.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Klasse.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,16 +11,12 @@ import java.util.Collections; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.arkiv.noark.Skjerming; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Klassifikasjonssystem.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Klassifikasjonssystem.java similarity index 93% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Klassifikasjonssystem.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Klassifikasjonssystem.java index 9a169da9..261c8dae 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Klassifikasjonssystem.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Klassifikasjonssystem.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,13 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; import java.util.Date; -import no.fint.model.arkiv.noark.Klasse; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Korrespondansepart.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Korrespondansepart.java similarity index 86% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Korrespondansepart.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Korrespondansepart.java index b9c036b2..fdfb6733 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Korrespondansepart.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Korrespondansepart.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,18 +11,14 @@ import java.util.Collections; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Adresse; -import no.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; -import no.fint.model.arkiv.noark.Skjerming; +import no.novari.fint.model.felles.kompleksedatatyper.Adresse; +import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Mappe.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Mappe.java similarity index 88% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Mappe.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Mappe.java index a7d6ebba..deb12888 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Mappe.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Mappe.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -14,18 +14,13 @@ import java.util.Map; import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintAbstractObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; import java.util.Date; -import no.fint.model.arkiv.noark.Klasse; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.arkiv.noark.Merknad; -import no.fint.model.arkiv.noark.Part; -import no.fint.model.arkiv.noark.Skjerming; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Merknad.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Merknad.java similarity index 93% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Merknad.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Merknad.java index 9cdbdef1..fb18a09e 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Merknad.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Merknad.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,12 +11,9 @@ import java.util.Collections; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/NoarkActions.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/NoarkActions.java similarity index 95% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/NoarkActions.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/NoarkActions.java index e321ed4f..382fbb95 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/NoarkActions.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/NoarkActions.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import java.util.Arrays; import java.util.List; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Part.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Part.java similarity index 88% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Part.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Part.java index e883704f..401917c7 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Part.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Part.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,17 +11,14 @@ import java.util.Collections; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Adresse; -import no.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; +import no.novari.fint.model.felles.kompleksedatatyper.Adresse; +import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Registrering.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Registrering.java similarity index 87% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Registrering.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Registrering.java index 1833ea86..87820033 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Registrering.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Registrering.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,22 +11,13 @@ import java.util.Collections; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintAbstractObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; import java.util.Date; -import no.fint.model.arkiv.noark.Dokumentbeskrivelse; -import no.fint.model.arkiv.noark.Klasse; -import no.fint.model.arkiv.noark.Korrespondansepart; -import no.fint.model.arkiv.noark.Merknad; -import no.fint.model.arkiv.noark.Part; -import no.fint.model.arkiv.noark.Skjerming; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Sak.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Sak.java similarity index 79% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Sak.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Sak.java index 026bb27e..7fd6dae2 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Sak.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Sak.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,15 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.arkiv.noark.Saksmappe; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Saksmappe.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Saksmappe.java similarity index 91% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Saksmappe.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Saksmappe.java index 239d0c0e..dd175638 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Saksmappe.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Saksmappe.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -14,16 +14,13 @@ import java.util.Map; import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintAbstractObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.arkiv.noark.Registrering; -import no.fint.model.arkiv.noark.Journalpost; + import java.util.Date; -import no.fint.model.arkiv.noark.Mappe; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Skjerming.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Skjerming.java similarity index 90% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Skjerming.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Skjerming.java index 84991c6f..4b4bdc31 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Skjerming.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Skjerming.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,12 +11,8 @@ import java.util.Collections; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Tilgang.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Tilgang.java similarity index 94% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Tilgang.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Tilgang.java index 15ba3abb..7c3f0911 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/noark/Tilgang.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Tilgang.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.noark; +package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/personal/PersonalActions.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/personal/PersonalActions.java similarity index 91% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/personal/PersonalActions.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/personal/PersonalActions.java index 3158f8a6..3a3765ae 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/personal/PersonalActions.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/personal/PersonalActions.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.personal; +package no.novari.fint.model.arkiv.personal; import java.util.Arrays; import java.util.List; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/personal/Personalmappe.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/personal/Personalmappe.java similarity index 92% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/personal/Personalmappe.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/personal/Personalmappe.java index 6a81ab13..87fd115a 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/personal/Personalmappe.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/personal/Personalmappe.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.personal; +package no.novari.fint.model.arkiv.personal; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Personnavn; -import no.fint.model.arkiv.noark.Saksmappe; +import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; +import no.novari.fint.model.arkiv.noark.Saksmappe; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/samferdsel/SamferdselActions.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/samferdsel/SamferdselActions.java similarity index 91% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/samferdsel/SamferdselActions.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/samferdsel/SamferdselActions.java index 0ed1364a..29d220a9 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/samferdsel/SamferdselActions.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/samferdsel/SamferdselActions.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.samferdsel; +package no.novari.fint.model.arkiv.samferdsel; import java.util.Arrays; import java.util.List; diff --git a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/samferdsel/SoknadDrosjeloyve.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/samferdsel/SoknadDrosjeloyve.java similarity index 83% rename from fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/samferdsel/SoknadDrosjeloyve.java rename to fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/samferdsel/SoknadDrosjeloyve.java index e253cb9a..93d418d2 100644 --- a/fint-arkiv-model-java/src/main/java/no/fint/model/arkiv/samferdsel/SoknadDrosjeloyve.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/samferdsel/SoknadDrosjeloyve.java @@ -1,4 +1,4 @@ -package no.fint.model.arkiv.samferdsel; +package no.novari.fint.model.arkiv.samferdsel; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.arkiv.noark.Saksmappe; +import no.novari.fint.model.arkiv.noark.Saksmappe; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/DokumentStatusResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentStatusResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/DokumentStatusResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentStatusResource.java index 85818586..0369e645 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/DokumentStatusResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentStatusResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/DokumentStatusResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentStatusResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/DokumentStatusResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentStatusResources.java index 01f11384..b163951c 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/DokumentStatusResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentStatusResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/DokumentTypeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentTypeResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/DokumentTypeResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentTypeResource.java index 1ec36710..cb9633f8 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/DokumentTypeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentTypeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/DokumentTypeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentTypeResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/DokumentTypeResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentTypeResources.java index d8b14925..47d98586 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/DokumentTypeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentTypeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/FormatResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/FormatResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/FormatResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/FormatResource.java index 586dd02e..fb21d1b7 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/FormatResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/FormatResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/FormatResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/FormatResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/FormatResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/FormatResources.java index aac9e4c7..51937064 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/FormatResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/FormatResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/JournalStatusResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalStatusResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/JournalStatusResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalStatusResource.java index 7d6fe3d5..7c2696ee 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/JournalStatusResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalStatusResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/JournalStatusResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalStatusResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/JournalStatusResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalStatusResources.java index 675edb49..f898f6df 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/JournalStatusResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalStatusResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/JournalpostTypeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalpostTypeResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/JournalpostTypeResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalpostTypeResource.java index 99d0cdd2..0496f6e5 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/JournalpostTypeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalpostTypeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/JournalpostTypeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalpostTypeResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/JournalpostTypeResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalpostTypeResources.java index 3e967ec9..247ee861 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/JournalpostTypeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalpostTypeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResource.java index 3320849c..d8e464a0 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResources.java index 2394cb53..616b3bd0 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResource.java index f68f9643..dc189680 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResources.java similarity index 93% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResources.java index 7955073e..1d280a2c 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/MerknadstypeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/MerknadstypeResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/MerknadstypeResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/MerknadstypeResource.java index 9796c2d0..4d3880d7 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/MerknadstypeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/MerknadstypeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/MerknadstypeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/MerknadstypeResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/MerknadstypeResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/MerknadstypeResources.java index d82a1dfc..0805926e 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/MerknadstypeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/MerknadstypeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/PartRolleResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/PartRolleResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/PartRolleResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/PartRolleResource.java index d3074e0e..1b620f13 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/PartRolleResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/PartRolleResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/PartRolleResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/PartRolleResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/PartRolleResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/PartRolleResources.java index 3d9e20f7..7e578dd3 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/PartRolleResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/PartRolleResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/RolleResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/RolleResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/RolleResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/RolleResource.java index 17163fc8..a80ba21b 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/RolleResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/RolleResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/RolleResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/RolleResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/RolleResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/RolleResources.java index eb319125..1241e4d8 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/RolleResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/RolleResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SaksmappetypeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksmappetypeResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SaksmappetypeResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksmappetypeResource.java index 3a09cbec..cf7b7cac 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SaksmappetypeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksmappetypeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SaksmappetypeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksmappetypeResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SaksmappetypeResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksmappetypeResources.java index 34b1b58e..e533c149 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SaksmappetypeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksmappetypeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SaksstatusResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksstatusResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SaksstatusResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksstatusResource.java index 08638d36..bf97cb84 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SaksstatusResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksstatusResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SaksstatusResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksstatusResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SaksstatusResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksstatusResources.java index b714470b..7d19f0f5 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SaksstatusResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksstatusResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResource.java index 6b457ba4..7aea8fa9 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResources.java index 6010f9cd..c278e007 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResource.java index 2df6c340..a86a0775 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResources.java index 9925e771..ff142596 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResource.java index f9c3b723..3ef705c4 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResources.java index dc8c8430..263cb583 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResource.java index 6597388d..820e97c2 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResources.java similarity index 93% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResources.java index df92c7a7..6669d097 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/VariantformatResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/VariantformatResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/VariantformatResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/VariantformatResource.java index 484eb1f1..73a6600a 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/VariantformatResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/VariantformatResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/VariantformatResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/VariantformatResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/VariantformatResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/VariantformatResources.java index bd045c08..f10cc338 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kodeverk/VariantformatResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/VariantformatResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kodeverk; +package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResource.java similarity index 83% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResource.java index a365fd95..825db7ba 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kulturminnevern; +package no.novari.fint.model.resource.arkiv.kulturminnevern; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,14 +15,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.felles.kompleksedatatyper.MatrikkelnummerResource; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.arkiv.noark.SaksmappeResource; +import no.novari.fint.model.resource.felles.kompleksedatatyper.MatrikkelnummerResource; +import no.novari.fint.model.resource.arkiv.noark.SaksmappeResource; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResources.java similarity index 93% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResources.java index d3a20cbb..9b27709d 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kulturminnevern; +package no.novari.fint.model.resource.arkiv.kulturminnevern; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResource.java similarity index 84% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResource.java index 17bfe0d2..073872b3 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kulturminnevern; +package no.novari.fint.model.resource.arkiv.kulturminnevern; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.arkiv.noark.SaksmappeResource; +import no.novari.fint.model.resource.arkiv.noark.SaksmappeResource; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResources.java similarity index 91% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResources.java index 1bc18bf1..589fc81e 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kulturminnevern; +package no.novari.fint.model.resource.arkiv.kulturminnevern; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResource.java similarity index 83% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResource.java index be3f370f..4d5cc7f5 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kulturminnevern; +package no.novari.fint.model.resource.arkiv.kulturminnevern; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,14 +15,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.felles.kompleksedatatyper.MatrikkelnummerResource; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.arkiv.noark.SaksmappeResource; +import no.novari.fint.model.resource.felles.kompleksedatatyper.MatrikkelnummerResource; +import no.novari.fint.model.resource.arkiv.noark.SaksmappeResource; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResources.java index 78c51d9d..25962d0d 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.kulturminnevern; +package no.novari.fint.model.resource.arkiv.kulturminnevern; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/AdministrativEnhetResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AdministrativEnhetResource.java similarity index 86% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/AdministrativEnhetResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AdministrativEnhetResource.java index e21ce4b4..c07b8e6a 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/AdministrativEnhetResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AdministrativEnhetResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/AdministrativEnhetResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AdministrativEnhetResources.java similarity index 93% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/AdministrativEnhetResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AdministrativEnhetResources.java index d4141c43..27cfa8d8 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/AdministrativEnhetResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AdministrativEnhetResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/ArkivdelResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivdelResource.java similarity index 91% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/ArkivdelResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivdelResource.java index f93d2b4e..93307b2f 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/ArkivdelResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivdelResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/ArkivdelResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivdelResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/ArkivdelResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivdelResources.java index 8174919d..f47d1200 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/ArkivdelResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivdelResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/ArkivressursResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivressursResource.java similarity index 89% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/ArkivressursResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivressursResource.java index a92275cc..83d8c702 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/ArkivressursResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivressursResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.Map; import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/ArkivressursResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivressursResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/ArkivressursResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivressursResources.java index 71285e55..193c39c2 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/ArkivressursResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivressursResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/AutorisasjonResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AutorisasjonResource.java similarity index 91% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/AutorisasjonResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AutorisasjonResource.java index ae89c3f5..1b5a0251 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/AutorisasjonResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AutorisasjonResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/AutorisasjonResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AutorisasjonResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/AutorisasjonResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AutorisasjonResources.java index ec4b7dd3..2e426525 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/AutorisasjonResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AutorisasjonResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentbeskrivelseResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentbeskrivelseResource.java similarity index 90% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentbeskrivelseResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentbeskrivelseResource.java index 7f064752..3f4640dc 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentbeskrivelseResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentbeskrivelseResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,19 +11,15 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.arkiv.noark.DokumentobjektResource; + import java.util.Date; -import no.fint.model.resource.arkiv.noark.PartResource; -import no.fint.model.resource.arkiv.noark.SkjermingResource; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentbeskrivelseResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentbeskrivelseResources.java similarity index 93% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentbeskrivelseResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentbeskrivelseResources.java index f989cff8..66c21ff4 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentbeskrivelseResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentbeskrivelseResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentfilResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentfilResource.java similarity index 87% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentfilResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentfilResource.java index 056603c4..7f41e6ba 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentfilResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentfilResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentfilResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentfilResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentfilResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentfilResources.java index c654b0ea..49b6a481 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentfilResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentfilResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentobjektResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentobjektResource.java similarity index 90% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentobjektResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentobjektResource.java index 551b6bdc..8c039882 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentobjektResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentobjektResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,11 +11,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.resource.Link; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentobjektResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentobjektResources.java similarity index 93% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentobjektResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentobjektResources.java index 2e97d6db..6feb8fb1 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/DokumentobjektResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentobjektResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/JournalpostResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/JournalpostResource.java similarity index 87% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/JournalpostResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/JournalpostResource.java index f497fd18..d173f8d2 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/JournalpostResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/JournalpostResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,18 +11,14 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.arkiv.noark.Avskrivning; +import no.novari.fint.model.arkiv.noark.Avskrivning; import java.util.Date; -import no.fint.model.resource.arkiv.noark.RegistreringResource; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/JournalpostResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/JournalpostResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/JournalpostResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/JournalpostResources.java index 9edc4f17..f4b8495a 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/JournalpostResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/JournalpostResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KlasseResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlasseResource.java similarity index 88% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KlasseResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlasseResource.java index d5631429..055df174 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KlasseResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlasseResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,16 +11,13 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.arkiv.noark.SkjermingResource; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KlasseResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlasseResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KlasseResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlasseResources.java index ea46dad2..4675193c 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KlasseResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlasseResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KlassifikasjonssystemResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlassifikasjonssystemResource.java similarity index 90% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KlassifikasjonssystemResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlassifikasjonssystemResource.java index 7506f3d4..dcbdadaf 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KlassifikasjonssystemResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlassifikasjonssystemResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,14 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; import java.util.Date; -import no.fint.model.resource.arkiv.noark.KlasseResource; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KlassifikasjonssystemResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlassifikasjonssystemResources.java similarity index 93% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KlassifikasjonssystemResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlassifikasjonssystemResources.java index 8cb8db6d..7355ce97 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KlassifikasjonssystemResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlassifikasjonssystemResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KorrespondansepartResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KorrespondansepartResource.java similarity index 81% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KorrespondansepartResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KorrespondansepartResource.java index c8957934..ddf27a76 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KorrespondansepartResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KorrespondansepartResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,18 +11,14 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.felles.kompleksedatatyper.AdresseResource; -import no.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; -import no.fint.model.resource.arkiv.noark.SkjermingResource; +import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource; +import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KorrespondansepartResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KorrespondansepartResources.java similarity index 93% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KorrespondansepartResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KorrespondansepartResources.java index 648ee430..9ad44f34 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/KorrespondansepartResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KorrespondansepartResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/MappeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MappeResource.java similarity index 86% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/MappeResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MappeResource.java index b2fd1bb6..8dde90c3 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/MappeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MappeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,19 +13,13 @@ import java.util.Map; import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintAbstractObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; import java.util.Date; -import no.fint.model.resource.arkiv.noark.KlasseResource; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.arkiv.noark.MerknadResource; -import no.fint.model.resource.arkiv.noark.PartResource; -import no.fint.model.resource.arkiv.noark.SkjermingResource; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/MappeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MappeResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/MappeResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MappeResources.java index 99bf6e99..17b1a2fb 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/MappeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MappeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/MerknadResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MerknadResource.java similarity index 91% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/MerknadResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MerknadResource.java index 61c802ca..3c8d3fef 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/MerknadResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MerknadResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,11 +11,9 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.resource.Link; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/MerknadResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MerknadResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/MerknadResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MerknadResources.java index 6f8b3e90..e05b723c 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/MerknadResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MerknadResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/PartResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/PartResource.java similarity index 84% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/PartResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/PartResource.java index 9b164a22..52cf5886 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/PartResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/PartResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,17 +11,15 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.felles.kompleksedatatyper.AdresseResource; -import no.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; +import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource; +import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/PartResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/PartResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/PartResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/PartResources.java index d11db991..3676e012 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/PartResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/PartResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/RegistreringResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/RegistreringResource.java similarity index 87% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/RegistreringResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/RegistreringResource.java index 42625d9e..636db2da 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/RegistreringResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/RegistreringResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,22 +11,14 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintAbstractObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; import java.util.Date; -import no.fint.model.resource.arkiv.noark.DokumentbeskrivelseResource; -import no.fint.model.resource.arkiv.noark.KlasseResource; -import no.fint.model.resource.arkiv.noark.KorrespondansepartResource; -import no.fint.model.resource.arkiv.noark.MerknadResource; -import no.fint.model.resource.arkiv.noark.PartResource; -import no.fint.model.resource.arkiv.noark.SkjermingResource; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/RegistreringResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/RegistreringResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/RegistreringResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/RegistreringResources.java index 050ff29e..280bb862 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/RegistreringResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/RegistreringResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SakResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SakResource.java similarity index 80% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SakResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SakResource.java index ca01503c..eb4638d2 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SakResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SakResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.arkiv.noark.SaksmappeResource; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SakResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SakResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SakResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SakResources.java index 46f7f8a9..019a9e82 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SakResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SakResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SaksmappeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SaksmappeResource.java similarity index 90% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SaksmappeResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SaksmappeResource.java index 0ec8440a..91b4a54b 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SaksmappeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SaksmappeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,17 +13,13 @@ import java.util.Map; import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintAbstractObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.arkiv.noark.RegistreringResource; -import no.fint.model.resource.arkiv.noark.JournalpostResource; + import java.util.Date; -import no.fint.model.resource.arkiv.noark.MappeResource; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SaksmappeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SaksmappeResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SaksmappeResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SaksmappeResources.java index 3da30fc4..23cfdcb3 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SaksmappeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SaksmappeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SkjermingResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SkjermingResource.java similarity index 85% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SkjermingResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SkjermingResource.java index 92b14abe..c4f2ca74 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SkjermingResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SkjermingResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,11 +11,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.resource.Link; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SkjermingResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SkjermingResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SkjermingResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SkjermingResources.java index cbbf9490..6a7997d9 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/SkjermingResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SkjermingResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/TilgangResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/TilgangResource.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/TilgangResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/TilgangResource.java index d0eaa9b4..06d42fe1 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/TilgangResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/TilgangResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/TilgangResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/TilgangResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/TilgangResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/TilgangResources.java index bef01a9f..e66f5eef 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/noark/TilgangResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/TilgangResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.noark; +package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/personal/PersonalmappeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/personal/PersonalmappeResource.java similarity index 89% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/personal/PersonalmappeResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/personal/PersonalmappeResource.java index 434a0968..331b11b7 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/personal/PersonalmappeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/personal/PersonalmappeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.personal; +package no.novari.fint.model.resource.arkiv.personal; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Personnavn; -import no.fint.model.resource.arkiv.noark.SaksmappeResource; +import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; +import no.novari.fint.model.resource.arkiv.noark.SaksmappeResource; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/personal/PersonalmappeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/personal/PersonalmappeResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/personal/PersonalmappeResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/personal/PersonalmappeResources.java index e74cc18f..bd5b0342 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/personal/PersonalmappeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/personal/PersonalmappeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.personal; +package no.novari.fint.model.resource.arkiv.personal; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResource.java similarity index 85% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResource.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResource.java index c1ff7807..ccb9a67e 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.samferdsel; +package no.novari.fint.model.resource.arkiv.samferdsel; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,13 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.arkiv.noark.SaksmappeResource; +import no.novari.fint.model.resource.arkiv.noark.SaksmappeResource; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResources.java similarity index 92% rename from fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResources.java rename to fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResources.java index 11faf954..c9f7ffca 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.arkiv.samferdsel; +package no.novari.fint.model.resource.arkiv.samferdsel; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-arkiv-resource-model-java/src/test/groovy/no/novari/model/arkiv/test/ModelSpec.groovy b/fint-arkiv-resource-model-java/src/test/groovy/no/novari/fint/model/arkiv/test/ModelSpec.groovy similarity index 82% rename from fint-arkiv-resource-model-java/src/test/groovy/no/novari/model/arkiv/test/ModelSpec.groovy rename to fint-arkiv-resource-model-java/src/test/groovy/no/novari/fint/model/arkiv/test/ModelSpec.groovy index 5ed24d01..c95e12b8 100644 --- a/fint-arkiv-resource-model-java/src/test/groovy/no/novari/model/arkiv/test/ModelSpec.groovy +++ b/fint-arkiv-resource-model-java/src/test/groovy/no/novari/fint/model/arkiv/test/ModelSpec.groovy @@ -1,7 +1,7 @@ -package no.novari.model.arkiv.test +package no.novari.fint.model.arkiv.test import com.fasterxml.jackson.databind.ObjectMapper -import no.novari.model.resource.arkiv.kulturminnevern.TilskuddFartoyResource +import no.novari.fint.model.resource.arkiv.kulturminnevern.TilskuddFartoyResource import spock.lang.Specification class ModelSpec extends Specification { diff --git a/fint-felles-model-java/build.gradle b/fint-felles-model-java/build.gradle index f9f20fd5..6ceebd8b 100644 --- a/fint-felles-model-java/build.gradle +++ b/fint-felles-model-java/build.gradle @@ -1,3 +1,3 @@ dependencies { - api('no.novari:fint-model-core:${fintModelCoreVersion}') + api("no.fintlabs:fint-model-core:${fintModelCoreVersion}") } diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/FellesActions.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/FellesActions.java similarity index 93% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/FellesActions.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/FellesActions.java index 598df5b4..57d0e08f 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/FellesActions.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/FellesActions.java @@ -1,4 +1,4 @@ -package no.fint.model.felles; +package no.novari.fint.model.felles; import java.util.Arrays; import java.util.List; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/Kontaktperson.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Kontaktperson.java similarity index 89% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/Kontaktperson.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Kontaktperson.java index d19c5193..2aabd415 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/Kontaktperson.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Kontaktperson.java @@ -1,4 +1,4 @@ -package no.fint.model.felles; +package no.novari.fint.model.felles; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,13 +16,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; -import no.fint.model.felles.kompleksedatatyper.Personnavn; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; +import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/Person.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Person.java similarity index 91% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/Person.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Person.java index 07d91189..deabedea 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/Person.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Person.java @@ -1,4 +1,4 @@ -package no.fint.model.felles; +package no.novari.fint.model.felles; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,15 +16,15 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Adresse; +import no.novari.fint.model.felles.kompleksedatatyper.Adresse; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.felles.kompleksedatatyper.Personnavn; -import no.fint.model.felles.basisklasser.Aktor; + +import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; +import no.novari.fint.model.felles.basisklasser.Aktor; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/Virksomhet.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Virksomhet.java similarity index 92% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/Virksomhet.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Virksomhet.java index 74bca863..ad12309c 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/Virksomhet.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Virksomhet.java @@ -1,4 +1,4 @@ -package no.fint.model.felles; +package no.novari.fint.model.felles; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.felles.basisklasser.Enhet; +import no.novari.fint.model.felles.basisklasser.Enhet; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/basisklasser/Aktor.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Aktor.java similarity index 67% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/basisklasser/Aktor.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Aktor.java index 61eb8bcf..3ebc871d 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/basisklasser/Aktor.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Aktor.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.basisklasser; +package no.novari.fint.model.felles.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,22 +6,15 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; -import java.util.Collections; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.HashMap; + import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintAbstractObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; -import no.fint.model.felles.kompleksedatatyper.Adresse; +import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; +import no.novari.fint.model.felles.kompleksedatatyper.Adresse; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/basisklasser/BasisklasserActions.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/BasisklasserActions.java similarity index 89% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/basisklasser/BasisklasserActions.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/BasisklasserActions.java index 33a50bd4..aac13efc 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/basisklasser/BasisklasserActions.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/BasisklasserActions.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.basisklasser; +package no.novari.fint.model.felles.basisklasser; import java.util.Arrays; import java.util.List; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/basisklasser/Begrep.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Begrep.java similarity index 81% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/basisklasser/Begrep.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Begrep.java index ad450c43..81f13aa8 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/basisklasser/Begrep.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Begrep.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.basisklasser; +package no.novari.fint.model.felles.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,22 +6,18 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintAbstractObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/basisklasser/Enhet.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Enhet.java similarity index 77% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/basisklasser/Enhet.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Enhet.java index c54a5110..a921571f 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/basisklasser/Enhet.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Enhet.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.basisklasser; +package no.novari.fint.model.felles.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,23 +6,18 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintAbstractObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Adresse; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.felles.basisklasser.Aktor; +import no.novari.fint.model.felles.kompleksedatatyper.Adresse; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/Fylke.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Fylke.java similarity index 90% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/Fylke.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Fylke.java index 8c00f1fe..e7b002ce 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/Fylke.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Fylke.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.kodeverk; +package no.novari.fint.model.felles.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/KodeverkActions.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/KodeverkActions.java similarity index 92% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/KodeverkActions.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/KodeverkActions.java index 1a5b146d..e7c936d9 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/KodeverkActions.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/KodeverkActions.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.kodeverk; +package no.novari.fint.model.felles.kodeverk; import java.util.Arrays; import java.util.List; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/Kommune.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Kommune.java similarity index 90% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/Kommune.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Kommune.java index 18906875..ca6e58c9 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/Kommune.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Kommune.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.kodeverk; +package no.novari.fint.model.felles.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/Valuta.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Valuta.java similarity index 84% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/Valuta.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Valuta.java index 83a1a49e..04f6978b 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/Valuta.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Valuta.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.kodeverk; +package no.novari.fint.model.felles.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,17 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/iso/IsoActions.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/IsoActions.java similarity index 91% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/iso/IsoActions.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/IsoActions.java index 6e2bbee0..dba47e7d 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/iso/IsoActions.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/IsoActions.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.kodeverk.iso; +package no.novari.fint.model.felles.kodeverk.iso; import java.util.Arrays; import java.util.List; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/iso/Kjonn.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Kjonn.java similarity index 78% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/iso/Kjonn.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Kjonn.java index 7f9094f1..223085fd 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/iso/Kjonn.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Kjonn.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.kodeverk.iso; +package no.novari.fint.model.felles.kodeverk.iso; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/iso/Landkode.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Landkode.java similarity index 78% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/iso/Landkode.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Landkode.java index b2b2e488..8c888b0b 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/iso/Landkode.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Landkode.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.kodeverk.iso; +package no.novari.fint.model.felles.kodeverk.iso; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/iso/Sprak.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Sprak.java similarity index 78% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/iso/Sprak.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Sprak.java index 33070094..b240c5d4 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/kodeverk/iso/Sprak.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Sprak.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.kodeverk.iso; +package no.novari.fint.model.felles.kodeverk.iso; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Adresse.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Adresse.java similarity index 89% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Adresse.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Adresse.java index 85201c66..aa883f63 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Adresse.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Adresse.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.kompleksedatatyper; +package no.novari.fint.model.felles.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,12 +11,8 @@ import java.util.Collections; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Identifikator.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Identifikator.java similarity index 74% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Identifikator.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Identifikator.java index 436619fd..f60680e6 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Identifikator.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Identifikator.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.kompleksedatatyper; +package no.novari.fint.model.felles.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,13 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; -import java.util.Collections; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.HashMap; + import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Periode; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/KompleksedatatyperActions.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/KompleksedatatyperActions.java similarity index 88% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/KompleksedatatyperActions.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/KompleksedatatyperActions.java index 1aae6373..22cea417 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/KompleksedatatyperActions.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/KompleksedatatyperActions.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.kompleksedatatyper; +package no.novari.fint.model.felles.kompleksedatatyper; import java.util.Arrays; import java.util.List; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Kontaktinformasjon.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Kontaktinformasjon.java similarity index 73% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Kontaktinformasjon.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Kontaktinformasjon.java index b0742603..5cda095d 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Kontaktinformasjon.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Kontaktinformasjon.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.kompleksedatatyper; +package no.novari.fint.model.felles.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,17 +6,7 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; -import java.util.Collections; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Matrikkelnummer.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Matrikkelnummer.java similarity index 88% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Matrikkelnummer.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Matrikkelnummer.java index 3a5edf88..a4359e77 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Matrikkelnummer.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Matrikkelnummer.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.kompleksedatatyper; +package no.novari.fint.model.felles.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,16 +11,12 @@ import java.util.Collections; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Adresse; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Periode.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Periode.java similarity index 77% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Periode.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Periode.java index 5d0bab06..4eaa7c18 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Periode.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Periode.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.kompleksedatatyper; +package no.novari.fint.model.felles.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,17 +6,10 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; -import java.util.Collections; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.HashMap; + import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; diff --git a/fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Personnavn.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Personnavn.java similarity index 75% rename from fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Personnavn.java rename to fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Personnavn.java index 7a391ea1..ac31a92d 100644 --- a/fint-felles-model-java/src/main/java/no/fint/model/felles/kompleksedatatyper/Personnavn.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Personnavn.java @@ -1,4 +1,4 @@ -package no.fint.model.felles.kompleksedatatyper; +package no.novari.fint.model.felles.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,17 +6,9 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; -import java.util.Collections; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; + import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; diff --git a/fint-felles-resource-model-java/build.gradle b/fint-felles-resource-model-java/build.gradle index d7c5cf42..bef02425 100644 --- a/fint-felles-resource-model-java/build.gradle +++ b/fint-felles-resource-model-java/build.gradle @@ -1,10 +1,11 @@ dependencies { api project(":fint-felles-model-java") - api('no.novari:fint-model-resource:${fintModelResourceVersion}') + api("no.fintlabs:fint-model-resource:${fintModelResourceVersion}") testImplementation("org.spockframework:spock-spring:${spockSpringVersion}") testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") testImplementation('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') testImplementation('org.springframework.hateoas:spring-hateoas:0.25.1.RELEASE') + testImplementation("org.apache.groovy:groovy-json:4.0.26") } diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/KontaktpersonResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/KontaktpersonResource.java similarity index 85% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/KontaktpersonResource.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/KontaktpersonResource.java index 8e212256..5fe056c1 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/KontaktpersonResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/KontaktpersonResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles; +package no.novari.fint.model.resource.felles; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,14 +15,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; -import no.fint.model.felles.kompleksedatatyper.Personnavn; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; +import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; @Data @NoArgsConstructor diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/KontaktpersonResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/KontaktpersonResources.java similarity index 93% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/KontaktpersonResources.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/KontaktpersonResources.java index eb55496b..d091deb5 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/KontaktpersonResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/KontaktpersonResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles; +package no.novari.fint.model.resource.felles; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/PersonResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/PersonResource.java similarity index 92% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/PersonResource.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/PersonResource.java index b1f4e982..eb303a1e 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/PersonResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/PersonResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles; +package no.novari.fint.model.resource.felles; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,16 +15,16 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.felles.kompleksedatatyper.AdresseResource; +import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.felles.kompleksedatatyper.Personnavn; -import no.fint.model.resource.felles.basisklasser.AktorResource; + +import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; +import no.novari.fint.model.resource.felles.basisklasser.AktorResource; @Data @NoArgsConstructor diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/PersonResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/PersonResources.java similarity index 93% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/PersonResources.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/PersonResources.java index 41b5067e..3b7291b3 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/PersonResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/PersonResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles; +package no.novari.fint.model.resource.felles; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/VirksomhetResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/VirksomhetResource.java similarity index 86% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/VirksomhetResource.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/VirksomhetResource.java index da1c13cb..d3285eac 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/VirksomhetResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/VirksomhetResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles; +package no.novari.fint.model.resource.felles; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.felles.basisklasser.EnhetResource; +import no.novari.fint.model.resource.felles.basisklasser.EnhetResource; @Data @NoArgsConstructor diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/VirksomhetResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/VirksomhetResources.java similarity index 93% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/VirksomhetResources.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/VirksomhetResources.java index 167e7dc8..96460c60 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/VirksomhetResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/VirksomhetResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles; +package no.novari.fint.model.resource.felles; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/AktorResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/AktorResource.java similarity index 74% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/AktorResource.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/AktorResource.java index 99022dc5..3debfaec 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/AktorResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/AktorResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.basisklasser; +package no.novari.fint.model.resource.felles.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -8,20 +8,16 @@ import lombok.NoArgsConstructor; import lombok.ToString; -import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintAbstractObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; -import no.fint.model.resource.felles.kompleksedatatyper.AdresseResource; +import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; +import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource; @Data @NoArgsConstructor diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/AktorResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/AktorResources.java similarity index 91% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/AktorResources.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/AktorResources.java index 0ad26431..ad7ecc46 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/AktorResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/AktorResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.basisklasser; +package no.novari.fint.model.resource.felles.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/BegrepResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/BegrepResource.java similarity index 84% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/BegrepResource.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/BegrepResource.java index 03644269..6b84846a 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/BegrepResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/BegrepResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.basisklasser; +package no.novari.fint.model.resource.felles.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintAbstractObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/BegrepResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/BegrepResources.java similarity index 91% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/BegrepResources.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/BegrepResources.java index 1e7e3470..d260fa19 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/BegrepResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/BegrepResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.basisklasser; +package no.novari.fint.model.resource.felles.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/EnhetResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/EnhetResource.java similarity index 80% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/EnhetResource.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/EnhetResource.java index 50bbe066..cfa28795 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/EnhetResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/EnhetResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.basisklasser; +package no.novari.fint.model.resource.felles.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,16 +13,13 @@ import java.util.Map; import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintAbstractObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.felles.kompleksedatatyper.AdresseResource; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.felles.basisklasser.AktorResource; +import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource; @Data @NoArgsConstructor diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/EnhetResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/EnhetResources.java similarity index 91% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/EnhetResources.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/EnhetResources.java index e28f7972..32b4ad5d 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/basisklasser/EnhetResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/EnhetResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.basisklasser; +package no.novari.fint.model.resource.felles.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/FylkeResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/FylkeResource.java similarity index 84% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/FylkeResource.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/FylkeResource.java index 801f0613..1265635f 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/FylkeResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/FylkeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.kodeverk; +package no.novari.fint.model.resource.felles.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/FylkeResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/FylkeResources.java similarity index 91% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/FylkeResources.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/FylkeResources.java index 5966ce35..bd041fc1 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/FylkeResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/FylkeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.kodeverk; +package no.novari.fint.model.resource.felles.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/KommuneResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/KommuneResource.java similarity index 83% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/KommuneResource.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/KommuneResource.java index 5422c43b..473152f3 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/KommuneResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/KommuneResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.kodeverk; +package no.novari.fint.model.resource.felles.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/KommuneResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/KommuneResources.java similarity index 92% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/KommuneResources.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/KommuneResources.java index 3584e67b..2c4bb501 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/KommuneResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/KommuneResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.kodeverk; +package no.novari.fint.model.resource.felles.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/ValutaResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/ValutaResource.java similarity index 87% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/ValutaResource.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/ValutaResource.java index 2915d24c..7f8c4b12 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/ValutaResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/ValutaResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.kodeverk; +package no.novari.fint.model.resource.felles.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/ValutaResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/ValutaResources.java similarity index 91% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/ValutaResources.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/ValutaResources.java index b5c4f926..e466bde7 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/ValutaResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/ValutaResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.kodeverk; +package no.novari.fint.model.resource.felles.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/KjonnResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/KjonnResource.java similarity index 80% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/KjonnResource.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/KjonnResource.java index 36273f5f..d0ac6194 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/KjonnResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/KjonnResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.kodeverk.iso; +package no.novari.fint.model.resource.felles.kodeverk.iso; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/KjonnResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/KjonnResources.java similarity index 91% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/KjonnResources.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/KjonnResources.java index 4d7caafd..aaef1be6 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/KjonnResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/KjonnResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.kodeverk.iso; +package no.novari.fint.model.resource.felles.kodeverk.iso; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/LandkodeResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/LandkodeResource.java similarity index 80% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/LandkodeResource.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/LandkodeResource.java index 682640e6..cb6b11ca 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/LandkodeResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/LandkodeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.kodeverk.iso; +package no.novari.fint.model.resource.felles.kodeverk.iso; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/LandkodeResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/LandkodeResources.java similarity index 91% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/LandkodeResources.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/LandkodeResources.java index d9909f71..6258f10a 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/LandkodeResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/LandkodeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.kodeverk.iso; +package no.novari.fint.model.resource.felles.kodeverk.iso; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/SprakResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/SprakResource.java similarity index 80% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/SprakResource.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/SprakResource.java index 781f4407..d60be253 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/SprakResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/SprakResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.kodeverk.iso; +package no.novari.fint.model.resource.felles.kodeverk.iso; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/SprakResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/SprakResources.java similarity index 91% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/SprakResources.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/SprakResources.java index 4b3d8ba2..d3929525 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kodeverk/iso/SprakResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/SprakResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.kodeverk.iso; +package no.novari.fint.model.resource.felles.kodeverk.iso; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kompleksedatatyper/AdresseResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/AdresseResource.java similarity index 82% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kompleksedatatyper/AdresseResource.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/AdresseResource.java index a8b82d53..8765598a 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kompleksedatatyper/AdresseResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/AdresseResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.kompleksedatatyper; +package no.novari.fint.model.resource.felles.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,11 +11,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.resource.Link; diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kompleksedatatyper/AdresseResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/AdresseResources.java similarity index 90% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kompleksedatatyper/AdresseResources.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/AdresseResources.java index 7d48961d..76972c5d 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kompleksedatatyper/AdresseResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/AdresseResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.kompleksedatatyper; +package no.novari.fint.model.resource.felles.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResource.java similarity index 84% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResource.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResource.java index 9bfc80c3..96ebf3f1 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.kompleksedatatyper; +package no.novari.fint.model.resource.felles.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,16 +11,12 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.felles.kompleksedatatyper.AdresseResource; @Data @NoArgsConstructor diff --git a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResources.java similarity index 91% rename from fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResources.java rename to fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResources.java index a40c3313..ce33998d 100644 --- a/fint-felles-resource-model-java/src/main/java/no/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.felles.kompleksedatatyper; +package no.novari.fint.model.resource.felles.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy b/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy similarity index 94% rename from fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy rename to fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy index cd58bbdd..7beaeede 100644 --- a/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy +++ b/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy @@ -1,12 +1,12 @@ -package no.novari.test.model +package no.novari.fint.test.model import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException -import no.novari.model.felles.Person -import no.novari.model.resource.felles.KontaktpersonResource -import no.novari.model.resource.felles.PersonResource -import no.novari.model.resource.felles.PersonResources +import no.novari.fint.model.felles.Person +import no.novari.fint.model.resource.felles.KontaktpersonResource +import no.novari.fint.model.resource.felles.PersonResource +import no.novari.fint.model.resource.felles.PersonResources import spock.lang.Specification diff --git a/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy b/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy similarity index 87% rename from fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy rename to fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy index ffe5d205..114723d6 100644 --- a/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy +++ b/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy @@ -1,15 +1,15 @@ -package no.novari.test.model +package no.novari.fint.test.model import com.fasterxml.jackson.databind.ObjectMapper import groovy.json.JsonSlurper -import no.novari.model.felles.Person -import no.novari.model.felles.kompleksedatatyper.Adresse -import no.novari.model.felles.kompleksedatatyper.Identifikator -import no.novari.model.felles.kompleksedatatyper.Personnavn -import no.novari.model.resource.Link -import no.novari.model.resource.felles.KontaktpersonResource -import no.novari.model.resource.felles.PersonResource -import no.novari.model.resource.felles.kompleksedatatyper.AdresseResource +import no.novari.fint.model.felles.Person +import no.novari.fint.model.felles.kompleksedatatyper.Adresse +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator +import no.novari.fint.model.felles.kompleksedatatyper.Personnavn +import no.fint.model.resource.Link +import no.novari.fint.model.resource.felles.KontaktpersonResource +import no.novari.fint.model.resource.felles.PersonResource +import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource import spock.lang.Specification class ModelSerializationSpec extends Specification { diff --git a/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy b/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy similarity index 92% rename from fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy rename to fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy index 18fe8448..e1e49c11 100644 --- a/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy +++ b/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy @@ -1,9 +1,9 @@ -package no.novari.test.model +package no.novari.fint.test.model import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.ObjectMapper -import no.novari.model.felles.Person -import no.novari.test.model.utils.TestApplication +import no.novari.fint.model.felles.Person +import no.novari.fint.test.model.utils.TestApplication import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest import org.springframework.hateoas.Resource diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java b/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java similarity index 89% rename from fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java rename to fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java index e1f3756b..2ed95a03 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java +++ b/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java @@ -1,8 +1,8 @@ -package no.novari.test.model.utils; +package no.novari.fint.test.model.utils; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Import; import org.springframework.hateoas.config.EnableHypermediaSupport; +import org.springframework.context.annotation.Import; @EnableHypermediaSupport(type = EnableHypermediaSupport.HypermediaType.HAL) @SpringBootApplication diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java b/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java similarity index 93% rename from fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java rename to fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java index 1395b189..30f67c1c 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java +++ b/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java @@ -1,4 +1,4 @@ -package no.novari.test.model.utils; +package no.novari.fint.test.model.utils; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.context.annotation.Bean; diff --git a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/Faktura.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Faktura.java similarity index 92% rename from fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/Faktura.java rename to fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Faktura.java index 1ec52097..d6b502aa 100644 --- a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/Faktura.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Faktura.java @@ -1,4 +1,4 @@ -package no.fint.model.okonomi.faktura; +package no.novari.fint.model.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,13 +16,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Adresse; +import no.novari.fint.model.felles.kompleksedatatyper.Adresse; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/FakturaActions.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/FakturaActions.java similarity index 92% rename from fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/FakturaActions.java rename to fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/FakturaActions.java index 1f59a87c..2ced0296 100644 --- a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/FakturaActions.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/FakturaActions.java @@ -1,4 +1,4 @@ -package no.fint.model.okonomi.faktura; +package no.novari.fint.model.okonomi.faktura; import java.util.Arrays; import java.util.List; diff --git a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/Fakturagrunnlag.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturagrunnlag.java similarity index 90% rename from fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/Fakturagrunnlag.java rename to fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturagrunnlag.java index 6e50e3ef..368d8190 100644 --- a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/Fakturagrunnlag.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturagrunnlag.java @@ -1,4 +1,4 @@ -package no.fint.model.okonomi.faktura; +package no.novari.fint.model.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,14 +16,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.okonomi.faktura.Fakturalinje; + import java.util.Date; -import no.fint.model.okonomi.faktura.Fakturamottaker; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/Fakturalinje.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturalinje.java similarity index 91% rename from fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/Fakturalinje.java rename to fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturalinje.java index a5acb6ff..b987eca4 100644 --- a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/Fakturalinje.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturalinje.java @@ -1,4 +1,4 @@ -package no.fint.model.okonomi.faktura; +package no.novari.fint.model.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,12 +11,8 @@ import java.util.Collections; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; diff --git a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/Fakturamottaker.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturamottaker.java similarity index 89% rename from fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/Fakturamottaker.java rename to fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturamottaker.java index b99a580a..7e7aa70b 100644 --- a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/Fakturamottaker.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturamottaker.java @@ -1,4 +1,4 @@ -package no.fint.model.okonomi.faktura; +package no.novari.fint.model.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,12 +11,8 @@ import java.util.Collections; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; diff --git a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/Fakturautsteder.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturautsteder.java similarity index 93% rename from fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/Fakturautsteder.java rename to fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturautsteder.java index f9f5c8b6..cd483c40 100644 --- a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/faktura/Fakturautsteder.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturautsteder.java @@ -1,4 +1,4 @@ -package no.fint.model.okonomi.faktura; +package no.novari.fint.model.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/kodeverk/KodeverkActions.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/KodeverkActions.java similarity index 91% rename from fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/kodeverk/KodeverkActions.java rename to fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/KodeverkActions.java index d7a9662b..a17d9386 100644 --- a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/kodeverk/KodeverkActions.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/KodeverkActions.java @@ -1,4 +1,4 @@ -package no.fint.model.okonomi.kodeverk; +package no.novari.fint.model.okonomi.kodeverk; import java.util.Arrays; import java.util.List; diff --git a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/kodeverk/Merverdiavgift.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/Merverdiavgift.java similarity index 82% rename from fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/kodeverk/Merverdiavgift.java rename to fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/Merverdiavgift.java index 8dbceb9f..4fba2d05 100644 --- a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/kodeverk/Merverdiavgift.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/Merverdiavgift.java @@ -1,4 +1,4 @@ -package no.fint.model.okonomi.kodeverk; +package no.novari.fint.model.okonomi.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/kodeverk/Vare.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/Vare.java similarity index 91% rename from fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/kodeverk/Vare.java rename to fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/Vare.java index 5a8782ba..9120f37a 100644 --- a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/kodeverk/Vare.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/Vare.java @@ -1,4 +1,4 @@ -package no.fint.model.okonomi.kodeverk; +package no.novari.fint.model.okonomi.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.kompleksedatatyper.Kontostreng; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.administrasjon.kompleksedatatyper.Kontostreng; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/Bilag.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Bilag.java similarity index 77% rename from fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/Bilag.java rename to fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Bilag.java index 8eb8d437..6c8bba01 100644 --- a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/Bilag.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Bilag.java @@ -1,4 +1,4 @@ -package no.fint.model.okonomi.regnskap; +package no.novari.fint.model.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,17 +6,9 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; -import java.util.Collections; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; + import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; diff --git a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/Leverandor.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Leverandor.java similarity index 93% rename from fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/Leverandor.java rename to fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Leverandor.java index 862cbf23..32a3c1f4 100644 --- a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/Leverandor.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Leverandor.java @@ -1,4 +1,4 @@ -package no.fint.model.okonomi.regnskap; +package no.novari.fint.model.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/Leverandorgruppe.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Leverandorgruppe.java similarity index 93% rename from fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/Leverandorgruppe.java rename to fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Leverandorgruppe.java index 6a6c2990..52e4db17 100644 --- a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/Leverandorgruppe.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Leverandorgruppe.java @@ -1,4 +1,4 @@ -package no.fint.model.okonomi.regnskap; +package no.novari.fint.model.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/Postering.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Postering.java similarity index 91% rename from fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/Postering.java rename to fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Postering.java index 819879a8..d8e74a4e 100644 --- a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/Postering.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Postering.java @@ -1,4 +1,4 @@ -package no.fint.model.okonomi.regnskap; +package no.novari.fint.model.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.administrasjon.kompleksedatatyper.Kontostreng; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.administrasjon.kompleksedatatyper.Kontostreng; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/RegnskapActions.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/RegnskapActions.java similarity index 93% rename from fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/RegnskapActions.java rename to fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/RegnskapActions.java index 9a55027c..5f4b92a8 100644 --- a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/RegnskapActions.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/RegnskapActions.java @@ -1,4 +1,4 @@ -package no.fint.model.okonomi.regnskap; +package no.novari.fint.model.okonomi.regnskap; import java.util.Arrays; import java.util.List; diff --git a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/Transaksjon.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Transaksjon.java similarity index 92% rename from fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/Transaksjon.java rename to fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Transaksjon.java index 63e5db08..7639f23d 100644 --- a/fint-okonomi-model-java/src/main/java/no/fint/model/okonomi/regnskap/Transaksjon.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Transaksjon.java @@ -1,4 +1,4 @@ -package no.fint.model.okonomi.regnskap; +package no.novari.fint.model.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,13 +16,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.okonomi.regnskap.Bilag; + import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturaResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturaResource.java similarity index 88% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturaResource.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturaResource.java index 7573cb8d..dfe6fd45 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturaResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturaResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.faktura; +package no.novari.fint.model.resource.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,14 +15,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.felles.kompleksedatatyper.AdresseResource; +import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturaResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturaResources.java similarity index 92% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturaResources.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturaResources.java index 5493ce27..8e46c9d8 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturaResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturaResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.faktura; +package no.novari.fint.model.resource.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturagrunnlagResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturagrunnlagResource.java similarity index 87% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturagrunnlagResource.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturagrunnlagResource.java index 655d4d69..3f996c7d 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturagrunnlagResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturagrunnlagResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.faktura; +package no.novari.fint.model.resource.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,15 +15,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.okonomi.faktura.FakturalinjeResource; + import java.util.Date; -import no.fint.model.resource.okonomi.faktura.FakturamottakerResource; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturagrunnlagResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturagrunnlagResources.java similarity index 92% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturagrunnlagResources.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturagrunnlagResources.java index 0c87c282..45deeb89 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturagrunnlagResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturagrunnlagResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.faktura; +package no.novari.fint.model.resource.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturalinjeResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturalinjeResource.java similarity index 86% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturalinjeResource.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturalinjeResource.java index ca6942cf..f3ed5aec 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturalinjeResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturalinjeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.faktura; +package no.novari.fint.model.resource.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,11 +11,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.resource.Link; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturalinjeResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturalinjeResources.java similarity index 92% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturalinjeResources.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturalinjeResources.java index 530e63d7..d2ea18b5 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturalinjeResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturalinjeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.faktura; +package no.novari.fint.model.resource.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturamottakerResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturamottakerResource.java similarity index 81% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturamottakerResource.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturamottakerResource.java index 0f58c2c9..fb2b8c9d 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturamottakerResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturamottakerResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.faktura; +package no.novari.fint.model.resource.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,11 +11,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.resource.Link; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturamottakerResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturamottakerResources.java similarity index 92% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturamottakerResources.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturamottakerResources.java index 3095ad5e..bacbd7ce 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturamottakerResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturamottakerResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.faktura; +package no.novari.fint.model.resource.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturautstederResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturautstederResource.java similarity index 91% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturautstederResource.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturautstederResource.java index a890b525..4bbe7526 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturautstederResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturautstederResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.faktura; +package no.novari.fint.model.resource.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturautstederResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturautstederResources.java similarity index 92% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturautstederResources.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturautstederResources.java index dff6b4bf..d7395c0c 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/faktura/FakturautstederResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturautstederResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.faktura; +package no.novari.fint.model.resource.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResource.java similarity index 84% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResource.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResource.java index d33be696..90dd7cd9 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.kodeverk; +package no.novari.fint.model.resource.okonomi.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,13 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResources.java similarity index 92% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResources.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResources.java index 2c1812ae..b764e2e8 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.kodeverk; +package no.novari.fint.model.resource.okonomi.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/kodeverk/VareResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/VareResource.java similarity index 88% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/kodeverk/VareResource.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/VareResource.java index 272df6c1..1ffe1858 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/kodeverk/VareResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/VareResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.kodeverk; +package no.novari.fint.model.resource.okonomi.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.kompleksedatatyper.KontostrengResource; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.resource.administrasjon.kompleksedatatyper.KontostrengResource; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/kodeverk/VareResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/VareResources.java similarity index 91% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/kodeverk/VareResources.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/VareResources.java index 7fb0d4c7..df26a124 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/kodeverk/VareResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/VareResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.kodeverk; +package no.novari.fint.model.resource.okonomi.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/LeverandorResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorResource.java similarity index 91% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/LeverandorResource.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorResource.java index 1f7f3218..6be64f1a 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/LeverandorResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.regnskap; +package no.novari.fint.model.resource.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/LeverandorResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorResources.java similarity index 92% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/LeverandorResources.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorResources.java index 8161a0b0..b36efcd9 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/LeverandorResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.regnskap; +package no.novari.fint.model.resource.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/LeverandorgruppeResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorgruppeResource.java similarity index 88% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/LeverandorgruppeResource.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorgruppeResource.java index c629b00f..5341eaa8 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/LeverandorgruppeResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorgruppeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.regnskap; +package no.novari.fint.model.resource.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/LeverandorgruppeResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorgruppeResources.java similarity index 92% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/LeverandorgruppeResources.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorgruppeResources.java index 10a980b3..8a3ae0c9 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/LeverandorgruppeResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorgruppeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.regnskap; +package no.novari.fint.model.resource.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/PosteringResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/PosteringResource.java similarity index 87% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/PosteringResource.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/PosteringResource.java index ca2e15f3..3a75fa2c 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/PosteringResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/PosteringResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.regnskap; +package no.novari.fint.model.resource.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.administrasjon.kompleksedatatyper.KontostrengResource; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.resource.administrasjon.kompleksedatatyper.KontostrengResource; @Data @NoArgsConstructor diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/PosteringResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/PosteringResources.java similarity index 92% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/PosteringResources.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/PosteringResources.java index bde944f1..e8e705ba 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/PosteringResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/PosteringResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.regnskap; +package no.novari.fint.model.resource.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/TransaksjonResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/TransaksjonResource.java similarity index 91% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/TransaksjonResource.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/TransaksjonResource.java index 7979e80e..e057abfa 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/TransaksjonResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/TransaksjonResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.regnskap; +package no.novari.fint.model.resource.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,14 +15,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.okonomi.regnskap.Bilag; +import no.novari.fint.model.okonomi.regnskap.Bilag; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/TransaksjonResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/TransaksjonResources.java similarity index 92% rename from fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/TransaksjonResources.java rename to fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/TransaksjonResources.java index 1e00a693..12ddcf1f 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/fint/model/resource/okonomi/regnskap/TransaksjonResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/TransaksjonResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.okonomi.regnskap; +package no.novari.fint.model.resource.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-personvern-model-java/src/main/java/no/fint/model/personvern/kodeverk/Behandlingsgrunnlag.java b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/Behandlingsgrunnlag.java similarity index 78% rename from fint-personvern-model-java/src/main/java/no/fint/model/personvern/kodeverk/Behandlingsgrunnlag.java rename to fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/Behandlingsgrunnlag.java index 784833f2..c638f364 100644 --- a/fint-personvern-model-java/src/main/java/no/fint/model/personvern/kodeverk/Behandlingsgrunnlag.java +++ b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/Behandlingsgrunnlag.java @@ -1,4 +1,4 @@ -package no.fint.model.personvern.kodeverk; +package no.novari.fint.model.personvern.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-personvern-model-java/src/main/java/no/fint/model/personvern/kodeverk/KodeverkActions.java b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/KodeverkActions.java similarity index 91% rename from fint-personvern-model-java/src/main/java/no/fint/model/personvern/kodeverk/KodeverkActions.java rename to fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/KodeverkActions.java index 36e112d9..ec4a42c5 100644 --- a/fint-personvern-model-java/src/main/java/no/fint/model/personvern/kodeverk/KodeverkActions.java +++ b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/KodeverkActions.java @@ -1,4 +1,4 @@ -package no.fint.model.personvern.kodeverk; +package no.novari.fint.model.personvern.kodeverk; import java.util.Arrays; import java.util.List; diff --git a/fint-personvern-model-java/src/main/java/no/fint/model/personvern/kodeverk/Personopplysning.java b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/Personopplysning.java similarity index 78% rename from fint-personvern-model-java/src/main/java/no/fint/model/personvern/kodeverk/Personopplysning.java rename to fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/Personopplysning.java index feb317a9..0211966c 100644 --- a/fint-personvern-model-java/src/main/java/no/fint/model/personvern/kodeverk/Personopplysning.java +++ b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/Personopplysning.java @@ -1,4 +1,4 @@ -package no.fint.model.personvern.kodeverk; +package no.novari.fint.model.personvern.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-personvern-model-java/src/main/java/no/fint/model/personvern/samtykke/Behandling.java b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Behandling.java similarity index 94% rename from fint-personvern-model-java/src/main/java/no/fint/model/personvern/samtykke/Behandling.java rename to fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Behandling.java index 45939006..bbed2eb7 100644 --- a/fint-personvern-model-java/src/main/java/no/fint/model/personvern/samtykke/Behandling.java +++ b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Behandling.java @@ -1,4 +1,4 @@ -package no.fint.model.personvern.samtykke; +package no.novari.fint.model.personvern.samtykke; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-personvern-model-java/src/main/java/no/fint/model/personvern/samtykke/Samtykke.java b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Samtykke.java similarity index 92% rename from fint-personvern-model-java/src/main/java/no/fint/model/personvern/samtykke/Samtykke.java rename to fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Samtykke.java index 00a117eb..20b5d31d 100644 --- a/fint-personvern-model-java/src/main/java/no/fint/model/personvern/samtykke/Samtykke.java +++ b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Samtykke.java @@ -1,4 +1,4 @@ -package no.fint.model.personvern.samtykke; +package no.novari.fint.model.personvern.samtykke; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,13 +16,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Periode; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-personvern-model-java/src/main/java/no/fint/model/personvern/samtykke/SamtykkeActions.java b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/SamtykkeActions.java similarity index 91% rename from fint-personvern-model-java/src/main/java/no/fint/model/personvern/samtykke/SamtykkeActions.java rename to fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/SamtykkeActions.java index 1e48aa78..8e95d59d 100644 --- a/fint-personvern-model-java/src/main/java/no/fint/model/personvern/samtykke/SamtykkeActions.java +++ b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/SamtykkeActions.java @@ -1,4 +1,4 @@ -package no.fint.model.personvern.samtykke; +package no.novari.fint.model.personvern.samtykke; import java.util.Arrays; import java.util.List; diff --git a/fint-personvern-model-java/src/main/java/no/fint/model/personvern/samtykke/Tjeneste.java b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Tjeneste.java similarity index 93% rename from fint-personvern-model-java/src/main/java/no/fint/model/personvern/samtykke/Tjeneste.java rename to fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Tjeneste.java index decb32a4..d54ec594 100644 --- a/fint-personvern-model-java/src/main/java/no/fint/model/personvern/samtykke/Tjeneste.java +++ b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Tjeneste.java @@ -1,4 +1,4 @@ -package no.fint.model.personvern.samtykke; +package no.novari.fint.model.personvern.samtykke; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResource.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResource.java similarity index 81% rename from fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResource.java rename to fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResource.java index 9249a04c..ed19f39e 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResource.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.personvern.kodeverk; +package no.novari.fint.model.resource.personvern.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResources.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResources.java similarity index 92% rename from fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResources.java rename to fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResources.java index e2d8d5bc..53070264 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResources.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.personvern.kodeverk; +package no.novari.fint.model.resource.personvern.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/kodeverk/PersonopplysningResource.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/PersonopplysningResource.java similarity index 80% rename from fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/kodeverk/PersonopplysningResource.java rename to fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/PersonopplysningResource.java index c0e488d8..a7d0bd30 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/kodeverk/PersonopplysningResource.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/PersonopplysningResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.personvern.kodeverk; +package no.novari.fint.model.resource.personvern.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/kodeverk/PersonopplysningResources.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/PersonopplysningResources.java similarity index 92% rename from fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/kodeverk/PersonopplysningResources.java rename to fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/PersonopplysningResources.java index 02c62123..08a3e634 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/kodeverk/PersonopplysningResources.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/PersonopplysningResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.personvern.kodeverk; +package no.novari.fint.model.resource.personvern.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/BehandlingResource.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/BehandlingResource.java similarity index 92% rename from fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/BehandlingResource.java rename to fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/BehandlingResource.java index 9054f54c..2fbd739e 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/BehandlingResource.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/BehandlingResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.personvern.samtykke; +package no.novari.fint.model.resource.personvern.samtykke; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/BehandlingResources.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/BehandlingResources.java similarity index 91% rename from fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/BehandlingResources.java rename to fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/BehandlingResources.java index 61c01a5f..55a4cc3b 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/BehandlingResources.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/BehandlingResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.personvern.samtykke; +package no.novari.fint.model.resource.personvern.samtykke; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/SamtykkeResource.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/SamtykkeResource.java similarity index 89% rename from fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/SamtykkeResource.java rename to fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/SamtykkeResource.java index 4bc4f3b3..c59302ce 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/SamtykkeResource.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/SamtykkeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.personvern.samtykke; +package no.novari.fint.model.resource.personvern.samtykke; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,14 +15,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/SamtykkeResources.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/SamtykkeResources.java similarity index 91% rename from fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/SamtykkeResources.java rename to fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/SamtykkeResources.java index 13d32a31..9bf8b74f 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/SamtykkeResources.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/SamtykkeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.personvern.samtykke; +package no.novari.fint.model.resource.personvern.samtykke; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/TjenesteResource.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/TjenesteResource.java similarity index 88% rename from fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/TjenesteResource.java rename to fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/TjenesteResource.java index 7d0fb46c..ae7b05df 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/TjenesteResource.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/TjenesteResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.personvern.samtykke; +package no.novari.fint.model.resource.personvern.samtykke; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/TjenesteResources.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/TjenesteResources.java similarity index 91% rename from fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/TjenesteResources.java rename to fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/TjenesteResources.java index c7bf3ff5..532364c6 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/fint/model/resource/personvern/samtykke/TjenesteResources.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/TjenesteResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.personvern.samtykke; +package no.novari.fint.model.resource.personvern.samtykke; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/eiendel/Applikasjon.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjon.java similarity index 92% rename from fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/eiendel/Applikasjon.java rename to fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjon.java index 4af05299..44a5b456 100644 --- a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/eiendel/Applikasjon.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjon.java @@ -1,4 +1,4 @@ -package no.fint.model.ressurs.eiendel; +package no.novari.fint.model.ressurs.eiendel; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/eiendel/Applikasjonsressurs.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjonsressurs.java similarity index 93% rename from fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/eiendel/Applikasjonsressurs.java rename to fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjonsressurs.java index 6d369036..1d6a3902 100644 --- a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/eiendel/Applikasjonsressurs.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjonsressurs.java @@ -1,4 +1,4 @@ -package no.fint.model.ressurs.eiendel; +package no.novari.fint.model.ressurs.eiendel; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/eiendel/Applikasjonsressurstilgjengelighet.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjonsressurstilgjengelighet.java similarity index 91% rename from fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/eiendel/Applikasjonsressurstilgjengelighet.java rename to fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjonsressurstilgjengelighet.java index 2e683fbb..3fe0726f 100644 --- a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/eiendel/Applikasjonsressurstilgjengelighet.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjonsressurstilgjengelighet.java @@ -1,4 +1,4 @@ -package no.fint.model.ressurs.eiendel; +package no.novari.fint.model.ressurs.eiendel; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/eiendel/EiendelActions.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/EiendelActions.java similarity index 93% rename from fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/eiendel/EiendelActions.java rename to fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/EiendelActions.java index a3b9e6b5..297a19b7 100644 --- a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/eiendel/EiendelActions.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/EiendelActions.java @@ -1,4 +1,4 @@ -package no.fint.model.ressurs.eiendel; +package no.novari.fint.model.ressurs.eiendel; import java.util.Arrays; import java.util.List; diff --git a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/Applikasjonskategori.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Applikasjonskategori.java similarity index 79% rename from fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/Applikasjonskategori.java rename to fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Applikasjonskategori.java index 0e516d21..ef8718bf 100644 --- a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/Applikasjonskategori.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Applikasjonskategori.java @@ -1,4 +1,4 @@ -package no.fint.model.ressurs.kodeverk; +package no.novari.fint.model.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/Brukertype.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Brukertype.java similarity index 78% rename from fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/Brukertype.java rename to fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Brukertype.java index 57076942..09dbdbd8 100644 --- a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/Brukertype.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Brukertype.java @@ -1,4 +1,4 @@ -package no.fint.model.ressurs.kodeverk; +package no.novari.fint.model.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/Handhevingstype.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Handhevingstype.java similarity index 79% rename from fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/Handhevingstype.java rename to fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Handhevingstype.java index 9bd38178..85b22f92 100644 --- a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/Handhevingstype.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Handhevingstype.java @@ -1,4 +1,4 @@ -package no.fint.model.ressurs.kodeverk; +package no.novari.fint.model.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/KodeverkActions.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/KodeverkActions.java similarity index 94% rename from fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/KodeverkActions.java rename to fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/KodeverkActions.java index 09d883d3..d12c249a 100644 --- a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/KodeverkActions.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/KodeverkActions.java @@ -1,4 +1,4 @@ -package no.fint.model.ressurs.kodeverk; +package no.novari.fint.model.ressurs.kodeverk; import java.util.Arrays; import java.util.List; diff --git a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/Lisensmodell.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Lisensmodell.java similarity index 78% rename from fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/Lisensmodell.java rename to fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Lisensmodell.java index 34e3e1e7..c00c9b18 100644 --- a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/Lisensmodell.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Lisensmodell.java @@ -1,4 +1,4 @@ -package no.fint.model.ressurs.kodeverk; +package no.novari.fint.model.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/Plattform.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Plattform.java similarity index 78% rename from fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/Plattform.java rename to fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Plattform.java index ea07cc3e..534a8bc2 100644 --- a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/kodeverk/Plattform.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Plattform.java @@ -1,4 +1,4 @@ -package no.fint.model.ressurs.kodeverk; +package no.novari.fint.model.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/tilgang/Identitet.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/Identitet.java similarity index 93% rename from fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/tilgang/Identitet.java rename to fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/Identitet.java index 39391c98..dde91302 100644 --- a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/tilgang/Identitet.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/Identitet.java @@ -1,4 +1,4 @@ -package no.fint.model.ressurs.tilgang; +package no.novari.fint.model.ressurs.tilgang; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/tilgang/Rettighet.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/Rettighet.java similarity index 92% rename from fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/tilgang/Rettighet.java rename to fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/Rettighet.java index f9307fda..9bd60d61 100644 --- a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/tilgang/Rettighet.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/Rettighet.java @@ -1,4 +1,4 @@ -package no.fint.model.ressurs.tilgang; +package no.novari.fint.model.ressurs.tilgang; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/tilgang/TilgangActions.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/TilgangActions.java similarity index 91% rename from fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/tilgang/TilgangActions.java rename to fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/TilgangActions.java index e17202a3..b4a4648c 100644 --- a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/tilgang/TilgangActions.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/TilgangActions.java @@ -1,4 +1,4 @@ -package no.fint.model.ressurs.tilgang; +package no.novari.fint.model.ressurs.tilgang; import java.util.Arrays; import java.util.List; diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonResource.java similarity index 89% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonResource.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonResource.java index 6f0c7098..9d4053a7 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.eiendel; +package no.novari.fint.model.resource.ressurs.eiendel; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonResources.java similarity index 92% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonResources.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonResources.java index 1db40e78..9cd8d247 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.eiendel; +package no.novari.fint.model.resource.ressurs.eiendel; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResource.java similarity index 92% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResource.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResource.java index 7fa86ddb..125ce6fb 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.eiendel; +package no.novari.fint.model.resource.ressurs.eiendel; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResources.java similarity index 92% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResources.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResources.java index 30d1f86d..dcdf32ae 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.eiendel; +package no.novari.fint.model.resource.ressurs.eiendel; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResource.java similarity index 87% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResource.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResource.java index e40af6cd..142e1648 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.eiendel; +package no.novari.fint.model.resource.ressurs.eiendel; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResources.java similarity index 93% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResources.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResources.java index f90b36d2..b53a6cfb 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.eiendel; +package no.novari.fint.model.resource.ressurs.eiendel; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResource.java similarity index 81% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResource.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResource.java index 6fd03708..5a433266 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.kodeverk; +package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResources.java similarity index 92% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResources.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResources.java index 8110110e..501153d1 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.kodeverk; +package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/BrukertypeResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/BrukertypeResource.java similarity index 81% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/BrukertypeResource.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/BrukertypeResource.java index 465a90fc..3fe39a7c 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/BrukertypeResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/BrukertypeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.kodeverk; +package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/BrukertypeResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/BrukertypeResources.java similarity index 92% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/BrukertypeResources.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/BrukertypeResources.java index 28ce2d83..c604b648 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/BrukertypeResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/BrukertypeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.kodeverk; +package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/HandhevingstypeResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/HandhevingstypeResource.java similarity index 81% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/HandhevingstypeResource.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/HandhevingstypeResource.java index a0555d92..7112bc80 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/HandhevingstypeResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/HandhevingstypeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.kodeverk; +package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/HandhevingstypeResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/HandhevingstypeResources.java similarity index 92% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/HandhevingstypeResources.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/HandhevingstypeResources.java index 3890196f..812fc194 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/HandhevingstypeResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/HandhevingstypeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.kodeverk; +package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/LisensmodellResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/LisensmodellResource.java similarity index 81% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/LisensmodellResource.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/LisensmodellResource.java index 8b04d002..83deb370 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/LisensmodellResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/LisensmodellResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.kodeverk; +package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/LisensmodellResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/LisensmodellResources.java similarity index 92% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/LisensmodellResources.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/LisensmodellResources.java index 874788e7..24bb740d 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/LisensmodellResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/LisensmodellResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.kodeverk; +package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/PlattformResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/PlattformResource.java similarity index 81% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/PlattformResource.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/PlattformResource.java index 5dad8821..78ce740e 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/PlattformResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/PlattformResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.kodeverk; +package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/PlattformResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/PlattformResources.java similarity index 92% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/PlattformResources.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/PlattformResources.java index 7641472f..4fd5ea57 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/kodeverk/PlattformResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/PlattformResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.kodeverk; +package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/tilgang/IdentitetResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/IdentitetResource.java similarity index 90% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/tilgang/IdentitetResource.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/IdentitetResource.java index 9e5ccab3..e02b66fb 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/tilgang/IdentitetResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/IdentitetResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.tilgang; +package no.novari.fint.model.resource.ressurs.tilgang; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/tilgang/IdentitetResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/IdentitetResources.java similarity index 92% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/tilgang/IdentitetResources.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/IdentitetResources.java index 490d4839..cd637e65 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/tilgang/IdentitetResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/IdentitetResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.tilgang; +package no.novari.fint.model.resource.ressurs.tilgang; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/tilgang/RettighetResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/RettighetResource.java similarity index 87% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/tilgang/RettighetResource.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/RettighetResource.java index 40a3d372..9e9f9ff6 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/tilgang/RettighetResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/RettighetResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.tilgang; +package no.novari.fint.model.resource.ressurs.tilgang; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,13 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/tilgang/RettighetResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/RettighetResources.java similarity index 92% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/tilgang/RettighetResources.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/RettighetResources.java index 597b9521..f7928bf4 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/tilgang/RettighetResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/RettighetResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.ressurs.tilgang; +package no.novari.fint.model.resource.ressurs.tilgang; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/basisklasser/BasisklasserActions.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/BasisklasserActions.java similarity index 88% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/basisklasser/BasisklasserActions.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/BasisklasserActions.java index 94895821..4f3d8da3 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/basisklasser/BasisklasserActions.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/BasisklasserActions.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.basisklasser; +package no.novari.fint.model.utdanning.basisklasser; import java.util.Arrays; import java.util.List; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/basisklasser/Gruppe.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Gruppe.java similarity index 91% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/basisklasser/Gruppe.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Gruppe.java index cefc8fb5..dab42395 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/basisklasser/Gruppe.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Gruppe.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.basisklasser; +package no.novari.fint.model.utdanning.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintAbstractObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/basisklasser/Gruppemedlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Gruppemedlemskap.java similarity index 80% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/basisklasser/Gruppemedlemskap.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Gruppemedlemskap.java index 74ef77c8..af01e64a 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/basisklasser/Gruppemedlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Gruppemedlemskap.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.basisklasser; +package no.novari.fint.model.utdanning.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,22 +6,18 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintAbstractObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/basisklasser/Utdanningsforhold.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Utdanningsforhold.java similarity index 93% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/basisklasser/Utdanningsforhold.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Utdanningsforhold.java index 44bef1e1..eb9cdee9 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/basisklasser/Utdanningsforhold.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Utdanningsforhold.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.basisklasser; +package no.novari.fint.model.utdanning.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintAbstractObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Basisgruppe.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Basisgruppe.java similarity index 92% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Basisgruppe.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Basisgruppe.java index a46123e9..1fee63b9 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Basisgruppe.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Basisgruppe.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.elev; +package no.novari.fint.model.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.basisklasser.Gruppe; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Basisgruppemedlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Basisgruppemedlemskap.java similarity index 90% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Basisgruppemedlemskap.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Basisgruppemedlemskap.java index eb41e521..4d1b881e 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Basisgruppemedlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Basisgruppemedlemskap.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.elev; +package no.novari.fint.model.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.basisklasser.Gruppemedlemskap; +import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Elev.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elev.java similarity index 90% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Elev.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elev.java index 916b289a..d9bca174 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Elev.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elev.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.elev; +package no.novari.fint.model.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,13 +16,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.felles.kompleksedatatyper.Adresse; -import no.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; +import no.novari.fint.model.felles.kompleksedatatyper.Adresse; +import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/ElevActions.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/ElevActions.java similarity index 96% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/ElevActions.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/ElevActions.java index b4641e6d..50beca78 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/ElevActions.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/ElevActions.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.elev; +package no.novari.fint.model.utdanning.elev; import java.util.Arrays; import java.util.List; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Elevforhold.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elevforhold.java similarity index 94% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Elevforhold.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elevforhold.java index 73c18638..55fe15ef 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Elevforhold.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elevforhold.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.elev; +package no.novari.fint.model.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -14,16 +14,15 @@ import java.util.Map; import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.vurdering.Anmerkninger; +import no.novari.fint.model.utdanning.vurdering.Anmerkninger; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.utdanning.basisklasser.Utdanningsforhold; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; +import no.novari.fint.model.utdanning.basisklasser.Utdanningsforhold; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Elevtilrettelegging.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elevtilrettelegging.java similarity index 93% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Elevtilrettelegging.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elevtilrettelegging.java index 744f1d3e..a5f65de6 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Elevtilrettelegging.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elevtilrettelegging.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.elev; +package no.novari.fint.model.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Kontaktlarergruppe.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Kontaktlarergruppe.java similarity index 92% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Kontaktlarergruppe.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Kontaktlarergruppe.java index c0978b92..9f952511 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Kontaktlarergruppe.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Kontaktlarergruppe.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.elev; +package no.novari.fint.model.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.basisklasser.Gruppe; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Kontaktlarergruppemedlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Kontaktlarergruppemedlemskap.java similarity index 90% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Kontaktlarergruppemedlemskap.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Kontaktlarergruppemedlemskap.java index 8241f7ca..e176c05c 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Kontaktlarergruppemedlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Kontaktlarergruppemedlemskap.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.elev; +package no.novari.fint.model.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.basisklasser.Gruppemedlemskap; +import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Medlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Medlemskap.java similarity index 94% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Medlemskap.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Medlemskap.java index d07045cc..dda2f7f7 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Medlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Medlemskap.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.elev; +package no.novari.fint.model.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Persongruppe.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Persongruppe.java similarity index 92% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Persongruppe.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Persongruppe.java index edaa2349..de55291a 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Persongruppe.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Persongruppe.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.elev; +package no.novari.fint.model.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.basisklasser.Gruppe; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Persongruppemedlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Persongruppemedlemskap.java similarity index 90% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Persongruppemedlemskap.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Persongruppemedlemskap.java index cc46f3c3..492b3df8 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Persongruppemedlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Persongruppemedlemskap.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.elev; +package no.novari.fint.model.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.basisklasser.Gruppemedlemskap; +import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Skoleressurs.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Skoleressurs.java similarity index 94% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Skoleressurs.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Skoleressurs.java index 65453261..33f83529 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Skoleressurs.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Skoleressurs.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.elev; +package no.novari.fint.model.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Undervisningsforhold.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Undervisningsforhold.java similarity index 92% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Undervisningsforhold.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Undervisningsforhold.java index d63ff370..932a35c9 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Undervisningsforhold.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Undervisningsforhold.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.elev; +package no.novari.fint.model.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.basisklasser.Utdanningsforhold; +import no.novari.fint.model.utdanning.basisklasser.Utdanningsforhold; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Varsel.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Varsel.java similarity index 94% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Varsel.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Varsel.java index 66099bb2..2b634d2f 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/elev/Varsel.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Varsel.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.elev; +package no.novari.fint.model.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Avbruddsarsak.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Avbruddsarsak.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Avbruddsarsak.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Avbruddsarsak.java index c39550cc..b575e80c 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Avbruddsarsak.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Avbruddsarsak.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Betalingsstatus.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Betalingsstatus.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Betalingsstatus.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Betalingsstatus.java index e3f53f53..97b7f86f 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Betalingsstatus.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Betalingsstatus.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Bevistype.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Bevistype.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Bevistype.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Bevistype.java index 1ca9f186..1b641588 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Bevistype.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Bevistype.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Brevtype.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Brevtype.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Brevtype.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Brevtype.java index 9781759a..181cde99 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Brevtype.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Brevtype.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Eksamensform.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Eksamensform.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Eksamensform.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Eksamensform.java index e4457a33..41a009b4 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Eksamensform.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Eksamensform.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Elevkategori.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Elevkategori.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Elevkategori.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Elevkategori.java index e047348d..98fa1702 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Elevkategori.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Elevkategori.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Fagmerknad.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fagmerknad.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Fagmerknad.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fagmerknad.java index 1ea9605d..e0354b64 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Fagmerknad.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fagmerknad.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Fagstatus.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fagstatus.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Fagstatus.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fagstatus.java index 134edb2f..19834ed1 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Fagstatus.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fagstatus.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Fravarstype.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fravarstype.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Fravarstype.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fravarstype.java index 60ec91c4..fc1d9141 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Fravarstype.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fravarstype.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Fullfortkode.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fullfortkode.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Fullfortkode.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fullfortkode.java index 79274f93..578306a4 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Fullfortkode.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fullfortkode.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Grepreferanse.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Grepreferanse.java similarity index 69% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Grepreferanse.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Grepreferanse.java index 41cb1646..a675e215 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Grepreferanse.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Grepreferanse.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,17 +6,7 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; -import java.util.Collections; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintReference; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Karakterskala.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Karakterskala.java similarity index 91% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Karakterskala.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Karakterskala.java index a0c58f83..a0640915 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Karakterskala.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Karakterskala.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Karakterstatus.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Karakterstatus.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Karakterstatus.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Karakterstatus.java index 1cf56faa..b5782846 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Karakterstatus.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Karakterstatus.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/KodeverkActions.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/KodeverkActions.java similarity index 97% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/KodeverkActions.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/KodeverkActions.java index 9d9d870a..42b59968 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/KodeverkActions.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/KodeverkActions.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import java.util.Arrays; import java.util.List; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/OtEnhet.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/OtEnhet.java similarity index 90% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/OtEnhet.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/OtEnhet.java index 8ea683a8..91c7973d 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/OtEnhet.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/OtEnhet.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/OtStatus.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/OtStatus.java similarity index 82% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/OtStatus.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/OtStatus.java index e5835f28..0daa36ce 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/OtStatus.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/OtStatus.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Provestatus.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Provestatus.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Provestatus.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Provestatus.java index 86cc8b6f..d5dc5aeb 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Provestatus.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Provestatus.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Skolear.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Skolear.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Skolear.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Skolear.java index dc2293d1..9de6f838 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Skolear.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Skolear.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Skoleeiertype.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Skoleeiertype.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Skoleeiertype.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Skoleeiertype.java index 78b70b9b..0fa24f3b 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Skoleeiertype.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Skoleeiertype.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Termin.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Termin.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Termin.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Termin.java index b3f7b326..959b3b60 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Termin.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Termin.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Tilrettelegging.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Tilrettelegging.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Tilrettelegging.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Tilrettelegging.java index 8c4c2203..7763547e 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Tilrettelegging.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Tilrettelegging.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Varseltype.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Varseltype.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Varseltype.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Varseltype.java index 12187e3a..97c64c83 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Varseltype.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Varseltype.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Vigoreferanse.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Vigoreferanse.java similarity index 69% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Vigoreferanse.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Vigoreferanse.java index 34065da3..b48946e0 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Vigoreferanse.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Vigoreferanse.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,17 +6,7 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; -import java.util.Collections; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintReference; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Vitnemalsmerknad.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Vitnemalsmerknad.java similarity index 78% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Vitnemalsmerknad.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Vitnemalsmerknad.java index d7829dc6..5f288ad3 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/kodeverk/Vitnemalsmerknad.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Vitnemalsmerknad.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.kodeverk; +package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,21 +6,16 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; + import java.util.Collections; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/larling/AvlagtProve.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/AvlagtProve.java similarity index 94% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/larling/AvlagtProve.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/AvlagtProve.java index cf1336b3..630ed410 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/larling/AvlagtProve.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/AvlagtProve.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.larling; +package no.novari.fint.model.utdanning.larling; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/larling/Larling.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/Larling.java similarity index 92% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/larling/Larling.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/Larling.java index ee3cac07..049d5adb 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/larling/Larling.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/Larling.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.larling; +package no.novari.fint.model.utdanning.larling; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/larling/LarlingActions.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/LarlingActions.java similarity index 91% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/larling/LarlingActions.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/LarlingActions.java index 31dca3e0..a2f2ea74 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/larling/LarlingActions.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/LarlingActions.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.larling; +package no.novari.fint.model.utdanning.larling; import java.util.Arrays; import java.util.List; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/ot/OtActions.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/ot/OtActions.java similarity index 91% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/ot/OtActions.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/ot/OtActions.java index fc81654a..ffa40776 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/ot/OtActions.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/ot/OtActions.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.ot; +package no.novari.fint.model.utdanning.ot; import java.util.Arrays; import java.util.List; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/ot/OtUngdom.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/ot/OtUngdom.java similarity index 93% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/ot/OtUngdom.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/ot/OtUngdom.java index c8e68ae5..12da3f1c 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/ot/OtUngdom.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/ot/OtUngdom.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.ot; +package no.novari.fint.model.utdanning.ot; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Eksamen.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Eksamen.java similarity index 91% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Eksamen.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Eksamen.java index 9d05f642..8b53c48b 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Eksamen.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Eksamen.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.timeplan; +package no.novari.fint.model.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Fag.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Fag.java similarity index 92% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Fag.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Fag.java index 6818c2bd..009e71b3 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Fag.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Fag.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.timeplan; +package no.novari.fint.model.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.basisklasser.Gruppe; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Faggruppe.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Faggruppe.java similarity index 91% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Faggruppe.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Faggruppe.java index fbb86789..d86eabee 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Faggruppe.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Faggruppe.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.timeplan; +package no.novari.fint.model.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.basisklasser.Gruppe; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Faggruppemedlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Faggruppemedlemskap.java similarity index 91% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Faggruppemedlemskap.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Faggruppemedlemskap.java index bc2dc1f5..546f20b1 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Faggruppemedlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Faggruppemedlemskap.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.timeplan; +package no.novari.fint.model.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.basisklasser.Gruppemedlemskap; +import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Rom.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Rom.java similarity index 93% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Rom.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Rom.java index 6e4136e7..ddeba5f4 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Rom.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Rom.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.timeplan; +package no.novari.fint.model.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Time.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Time.java similarity index 92% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Time.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Time.java index 1c71913d..20363222 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Time.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Time.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.timeplan; +package no.novari.fint.model.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/TimeplanActions.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/TimeplanActions.java similarity index 94% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/TimeplanActions.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/TimeplanActions.java index 64961374..385bd608 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/TimeplanActions.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/TimeplanActions.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.timeplan; +package no.novari.fint.model.utdanning.timeplan; import java.util.Arrays; import java.util.List; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Undervisningsgruppe.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Undervisningsgruppe.java similarity index 92% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Undervisningsgruppe.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Undervisningsgruppe.java index c32b750b..04774c79 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Undervisningsgruppe.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Undervisningsgruppe.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.timeplan; +package no.novari.fint.model.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.basisklasser.Gruppe; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Undervisningsgruppemedlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Undervisningsgruppemedlemskap.java similarity index 90% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Undervisningsgruppemedlemskap.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Undervisningsgruppemedlemskap.java index 65bb23f8..d9719bf1 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/timeplan/Undervisningsgruppemedlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Undervisningsgruppemedlemskap.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.timeplan; +package no.novari.fint.model.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.basisklasser.Gruppemedlemskap; +import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/Arstrinn.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Arstrinn.java similarity index 90% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/Arstrinn.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Arstrinn.java index bd3a57c2..31fac4ab 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/Arstrinn.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Arstrinn.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.utdanningsprogram; +package no.novari.fint.model.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.basisklasser.Gruppe; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/Programomrade.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Programomrade.java similarity index 91% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/Programomrade.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Programomrade.java index cf4de3b5..8774676f 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/Programomrade.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Programomrade.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.utdanningsprogram; +package no.novari.fint.model.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.basisklasser.Gruppe; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/Programomrademedlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Programomrademedlemskap.java similarity index 90% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/Programomrademedlemskap.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Programomrademedlemskap.java index d0bd762d..73b6afdb 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/Programomrademedlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Programomrademedlemskap.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.utdanningsprogram; +package no.novari.fint.model.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.basisklasser.Gruppemedlemskap; +import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/Skole.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Skole.java similarity index 94% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/Skole.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Skole.java index af091f19..6fa6feb2 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/Skole.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Skole.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.utdanningsprogram; +package no.novari.fint.model.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.felles.basisklasser.Enhet; +import no.novari.fint.model.felles.basisklasser.Enhet; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/Utdanningsprogram.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Utdanningsprogram.java similarity index 90% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/Utdanningsprogram.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Utdanningsprogram.java index 38553319..7f4662a7 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/Utdanningsprogram.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Utdanningsprogram.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.utdanningsprogram; +package no.novari.fint.model.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.basisklasser.Gruppe; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/UtdanningsprogramActions.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/UtdanningsprogramActions.java similarity index 92% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/UtdanningsprogramActions.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/UtdanningsprogramActions.java index 9888d38e..03b9eb7b 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/utdanningsprogram/UtdanningsprogramActions.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/UtdanningsprogramActions.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.utdanningsprogram; +package no.novari.fint.model.utdanning.utdanningsprogram; import java.util.Arrays; import java.util.List; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Anmerkninger.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Anmerkninger.java similarity index 93% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Anmerkninger.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Anmerkninger.java index bb44ba7c..6d788f06 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Anmerkninger.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Anmerkninger.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Eksamensgruppe.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensgruppe.java similarity index 94% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Eksamensgruppe.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensgruppe.java index c88092bb..7b488900 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Eksamensgruppe.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensgruppe.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -14,14 +14,13 @@ import java.util.Map; import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; import java.util.Date; -import no.fint.model.utdanning.basisklasser.Gruppe; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Eksamensgruppemedlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensgruppemedlemskap.java similarity index 92% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Eksamensgruppemedlemskap.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensgruppemedlemskap.java index 176acae3..0ff9ed84 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Eksamensgruppemedlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensgruppemedlemskap.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.basisklasser.Gruppemedlemskap; +import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Eksamensvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensvurdering.java similarity index 91% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Eksamensvurdering.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensvurdering.java index 3288b617..ef3e06b6 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Eksamensvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensvurdering.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.vurdering.Fagvurdering; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Elevfravar.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Elevfravar.java similarity index 93% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Elevfravar.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Elevfravar.java index d2aba5de..41377917 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Elevfravar.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Elevfravar.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Elevvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Elevvurdering.java similarity index 95% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Elevvurdering.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Elevvurdering.java index 0feade64..308c7d5c 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Elevvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Elevvurdering.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Fagvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fagvurdering.java similarity index 94% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Fagvurdering.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fagvurdering.java index b2d17220..1d5cdb95 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Fagvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fagvurdering.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintAbstractObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; + import java.util.Date; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Fravar.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravar.java similarity index 92% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Fravar.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravar.java index 714d587f..3bf94fac 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Fravar.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravar.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Fravarsoversikt.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsoversikt.java similarity index 91% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Fravarsoversikt.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsoversikt.java index 8f2d81e4..adf65450 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Fravarsoversikt.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsoversikt.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.vurdering.Fravarsprosent; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Fravarsprosent.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsprosent.java similarity index 76% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Fravarsprosent.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsprosent.java index 36bc48b1..8a08adee 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Fravarsprosent.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsprosent.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,17 +6,9 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Getter; -import java.util.Arrays; -import java.util.Collections; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.HashMap; -import javax.validation.Valid; + import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintComplexDatatypeObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Fravarsregistrering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsregistrering.java similarity index 92% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Fravarsregistrering.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsregistrering.java index 212c709a..ba60f9ba 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Fravarsregistrering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsregistrering.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Halvarsfagvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Halvarsfagvurdering.java similarity index 91% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Halvarsfagvurdering.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Halvarsfagvurdering.java index 7a0a7490..139c627c 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Halvarsfagvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Halvarsfagvurdering.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.vurdering.Fagvurdering; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Halvarsordensvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Halvarsordensvurdering.java similarity index 90% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Halvarsordensvurdering.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Halvarsordensvurdering.java index 54e74ce2..7da213a6 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Halvarsordensvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Halvarsordensvurdering.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.vurdering.Ordensvurdering; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Karakterhistorie.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Karakterhistorie.java similarity index 94% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Karakterhistorie.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Karakterhistorie.java index 36939552..a7cb64e3 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Karakterhistorie.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Karakterhistorie.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,12 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Karakterverdi.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Karakterverdi.java similarity index 90% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Karakterverdi.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Karakterverdi.java index 940c8fce..2fdff008 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Karakterverdi.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Karakterverdi.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Ordensvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Ordensvurdering.java similarity index 93% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Ordensvurdering.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Ordensvurdering.java index 110afd19..9b8af094 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Ordensvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Ordensvurdering.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintAbstractObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; + import java.util.Date; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Sensor.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sensor.java similarity index 93% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Sensor.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sensor.java index 2465450c..20ee3d21 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Sensor.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sensor.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Sluttfagvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sluttfagvurdering.java similarity index 91% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Sluttfagvurdering.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sluttfagvurdering.java index 0a07962c..9b77ffe7 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Sluttfagvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sluttfagvurdering.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.vurdering.Fagvurdering; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Sluttordensvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sluttordensvurdering.java similarity index 90% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Sluttordensvurdering.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sluttordensvurdering.java index 0266562b..8a9d1cc2 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Sluttordensvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sluttordensvurdering.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.vurdering.Ordensvurdering; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Underveisfagvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Underveisfagvurdering.java similarity index 91% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Underveisfagvurdering.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Underveisfagvurdering.java index 4be0351e..4fb5e692 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Underveisfagvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Underveisfagvurdering.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.vurdering.Fagvurdering; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Underveisordensvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Underveisordensvurdering.java similarity index 90% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Underveisordensvurdering.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Underveisordensvurdering.java index d907ca7d..1ec2a10c 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Underveisordensvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Underveisordensvurdering.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,14 +13,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; + import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.utdanning.vurdering.Ordensvurdering; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Vurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Vurdering.java similarity index 94% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Vurdering.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Vurdering.java index 0e247253..5b8e976f 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/Vurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Vurdering.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -16,11 +16,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; import no.fint.model.FintMultiplicity; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.FintModelObject; import no.fint.model.FintIdentifikator; import no.fint.model.FintRelation; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import static no.fint.model.FintMultiplicity.ONE_TO_ONE; import static no.fint.model.FintMultiplicity.ONE_TO_MANY; diff --git a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/VurderingActions.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/VurderingActions.java similarity index 97% rename from fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/VurderingActions.java rename to fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/VurderingActions.java index 9bed3c4f..6b89c36f 100644 --- a/fint-utdanning-model-java/src/main/java/no/fint/model/utdanning/vurdering/VurderingActions.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/VurderingActions.java @@ -1,4 +1,4 @@ -package no.fint.model.utdanning.vurdering; +package no.novari.fint.model.utdanning.vurdering; import java.util.Arrays; import java.util.List; diff --git a/fint-utdanning-resource-model-java/build.gradle b/fint-utdanning-resource-model-java/build.gradle index c8ff68a7..d01faa0a 100644 --- a/fint-utdanning-resource-model-java/build.gradle +++ b/fint-utdanning-resource-model-java/build.gradle @@ -8,4 +8,5 @@ dependencies { testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") testImplementation('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') testImplementation('org.springframework.hateoas:spring-hateoas:0.25.1.RELEASE') + testImplementation("org.apache.groovy:groovy-json:4.0.26") } diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/GruppeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppeResource.java similarity index 89% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/GruppeResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppeResource.java index 197f5032..558fadab 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/GruppeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.basisklasser; +package no.novari.fint.model.resource.utdanning.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintAbstractObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/GruppeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppeResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/GruppeResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppeResources.java index ab46b79a..7bb748c0 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/GruppeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.basisklasser; +package no.novari.fint.model.resource.utdanning.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResource.java similarity index 83% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResource.java index e108ab0f..00c130fc 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.basisklasser; +package no.novari.fint.model.resource.utdanning.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintAbstractObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResources.java index 582a4dc8..0c4f3fa4 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.basisklasser; +package no.novari.fint.model.resource.utdanning.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResource.java similarity index 88% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResource.java index 95f92757..28aa9a85 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.basisklasser; +package no.novari.fint.model.resource.utdanning.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintAbstractObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResources.java index 2ad4ec6f..da396889 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.basisklasser; +package no.novari.fint.model.resource.utdanning.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/BasisgruppeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppeResource.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/BasisgruppeResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppeResource.java index e2110143..8939ea99 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/BasisgruppeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.basisklasser.GruppeResource; +import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/BasisgruppeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppeResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/BasisgruppeResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppeResources.java index ffea23fb..be575e3e 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/BasisgruppeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResource.java similarity index 85% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResource.java index c7d10a89..62dd9408 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.utdanning.basisklasser.Gruppemedlemskap; +import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResources.java similarity index 93% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResources.java index 4eccdb38..097a9c66 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevResource.java similarity index 87% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevResource.java index 63cd06d8..1c724963 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,14 +15,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.felles.kompleksedatatyper.AdresseResource; -import no.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; +import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource; +import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevResources.java index 5215248e..66e75626 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevforholdResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevforholdResource.java similarity index 96% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevforholdResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevforholdResource.java index 6d5532a6..93df5e72 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevforholdResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevforholdResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,17 +13,15 @@ import java.util.Map; import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.vurdering.AnmerkningerResource; +import no.novari.fint.model.resource.utdanning.vurdering.AnmerkningerResource; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.resource.utdanning.basisklasser.UtdanningsforholdResource; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; +import no.novari.fint.model.resource.utdanning.basisklasser.UtdanningsforholdResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevforholdResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevforholdResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevforholdResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevforholdResources.java index d3e5f811..89c4801a 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevforholdResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevforholdResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevtilretteleggingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevtilretteleggingResource.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevtilretteleggingResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevtilretteleggingResource.java index ef2a94aa..6a20092f 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevtilretteleggingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevtilretteleggingResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevtilretteleggingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevtilretteleggingResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevtilretteleggingResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevtilretteleggingResources.java index 7234e76c..e9954b87 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/ElevtilretteleggingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevtilretteleggingResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/KontaktlarergruppeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppeResource.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/KontaktlarergruppeResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppeResource.java index f8ddf582..baf2390e 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/KontaktlarergruppeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.basisklasser.GruppeResource; +import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/KontaktlarergruppeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppeResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/KontaktlarergruppeResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppeResources.java index cf4b5b65..b98008c0 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/KontaktlarergruppeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResource.java similarity index 86% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResource.java index 167f6aca..a0a484c1 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.utdanning.basisklasser.Gruppemedlemskap; +import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResources.java similarity index 93% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResources.java index c2b13459..4a300da8 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/MedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/MedlemskapResource.java similarity index 93% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/MedlemskapResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/MedlemskapResource.java index 345533aa..4bede302 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/MedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/MedlemskapResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/MedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/MedlemskapResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/MedlemskapResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/MedlemskapResources.java index 5bf81634..d648e6f8 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/MedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/MedlemskapResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/PersongruppeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppeResource.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/PersongruppeResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppeResource.java index b1a31c19..20a4d273 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/PersongruppeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.basisklasser.GruppeResource; +import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/PersongruppeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppeResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/PersongruppeResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppeResources.java index c2d56df1..6320cc66 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/PersongruppeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/PersongruppemedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppemedlemskapResource.java similarity index 86% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/PersongruppemedlemskapResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppemedlemskapResource.java index 1dd0311b..96a582c8 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/PersongruppemedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppemedlemskapResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.utdanning.basisklasser.Gruppemedlemskap; +import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/PersongruppemedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppemedlemskapResources.java similarity index 93% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/PersongruppemedlemskapResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppemedlemskapResources.java index 3a1436d7..6a6fd5f5 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/PersongruppemedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppemedlemskapResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/SkoleressursResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/SkoleressursResource.java similarity index 93% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/SkoleressursResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/SkoleressursResource.java index 387c26c2..44f7b55e 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/SkoleressursResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/SkoleressursResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/SkoleressursResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/SkoleressursResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/SkoleressursResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/SkoleressursResources.java index dcb6c37f..7098e892 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/SkoleressursResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/SkoleressursResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/UndervisningsforholdResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/UndervisningsforholdResource.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/UndervisningsforholdResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/UndervisningsforholdResource.java index 7a6e8746..35cd1bd3 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/UndervisningsforholdResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/UndervisningsforholdResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.basisklasser.UtdanningsforholdResource; +import no.novari.fint.model.resource.utdanning.basisklasser.UtdanningsforholdResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/UndervisningsforholdResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/UndervisningsforholdResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/UndervisningsforholdResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/UndervisningsforholdResources.java index cc46c678..ba6e2149 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/UndervisningsforholdResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/UndervisningsforholdResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/VarselResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/VarselResource.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/VarselResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/VarselResource.java index a4c91c73..c03b471c 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/VarselResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/VarselResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/VarselResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/VarselResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/VarselResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/VarselResources.java index d70cc009..3656fa3f 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/elev/VarselResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/VarselResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.elev; +package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResource.java similarity index 80% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResource.java index d43ef799..24a20017 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResources.java index 887e6d82..a580513e 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BetalingsstatusResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BetalingsstatusResource.java similarity index 81% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BetalingsstatusResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BetalingsstatusResource.java index fdcb33bd..8552026e 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BetalingsstatusResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BetalingsstatusResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BetalingsstatusResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BetalingsstatusResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BetalingsstatusResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BetalingsstatusResources.java index 918e8a6c..3834bfd2 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BetalingsstatusResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BetalingsstatusResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BevistypeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BevistypeResource.java similarity index 80% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BevistypeResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BevistypeResource.java index 37b80d8d..f97e04b4 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BevistypeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BevistypeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BevistypeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BevistypeResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BevistypeResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BevistypeResources.java index 40b21610..839d6dfb 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BevistypeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BevistypeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BrevtypeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BrevtypeResource.java similarity index 80% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BrevtypeResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BrevtypeResource.java index 51fd68bb..1969a930 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BrevtypeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BrevtypeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BrevtypeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BrevtypeResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BrevtypeResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BrevtypeResources.java index 914e150b..be5c8bb5 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/BrevtypeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BrevtypeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/EksamensformResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/EksamensformResource.java similarity index 80% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/EksamensformResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/EksamensformResource.java index fc3bfb4c..3b96c15a 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/EksamensformResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/EksamensformResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/EksamensformResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/EksamensformResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/EksamensformResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/EksamensformResources.java index a72b5896..f66529ce 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/EksamensformResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/EksamensformResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/ElevkategoriResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ElevkategoriResource.java similarity index 80% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/ElevkategoriResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ElevkategoriResource.java index 05868646..8f548563 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/ElevkategoriResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ElevkategoriResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/ElevkategoriResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ElevkategoriResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/ElevkategoriResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ElevkategoriResources.java index 86230400..8b68b657 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/ElevkategoriResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ElevkategoriResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FagmerknadResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagmerknadResource.java similarity index 80% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FagmerknadResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagmerknadResource.java index 6e20ae90..01d32f5a 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FagmerknadResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagmerknadResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FagmerknadResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagmerknadResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FagmerknadResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagmerknadResources.java index 0bc8e23d..aca29165 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FagmerknadResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagmerknadResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FagstatusResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagstatusResource.java similarity index 80% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FagstatusResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagstatusResource.java index 6717ab76..2c526e25 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FagstatusResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagstatusResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FagstatusResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagstatusResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FagstatusResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagstatusResources.java index 7d130014..82a84d5c 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FagstatusResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagstatusResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FravarstypeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FravarstypeResource.java similarity index 80% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FravarstypeResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FravarstypeResource.java index ead9bb63..5122bb1d 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FravarstypeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FravarstypeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FravarstypeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FravarstypeResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FravarstypeResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FravarstypeResources.java index e98a7a67..cbe05af0 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FravarstypeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FravarstypeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FullfortkodeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FullfortkodeResource.java similarity index 80% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FullfortkodeResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FullfortkodeResource.java index 01d4b0dd..e0b5f54c 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FullfortkodeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FullfortkodeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FullfortkodeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FullfortkodeResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FullfortkodeResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FullfortkodeResources.java index ce83ea3d..a84fd76f 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/FullfortkodeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FullfortkodeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/KarakterskalaResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterskalaResource.java similarity index 86% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/KarakterskalaResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterskalaResource.java index 7871504f..d5123f52 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/KarakterskalaResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterskalaResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/KarakterskalaResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterskalaResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/KarakterskalaResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterskalaResources.java index d3f68278..7c19670b 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/KarakterskalaResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterskalaResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/KarakterstatusResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterstatusResource.java similarity index 80% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/KarakterstatusResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterstatusResource.java index 16b2b359..ab8142d7 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/KarakterstatusResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterstatusResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/KarakterstatusResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterstatusResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/KarakterstatusResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterstatusResources.java index 73f7a15d..adc0aa14 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/KarakterstatusResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterstatusResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/OtEnhetResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtEnhetResource.java similarity index 83% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/OtEnhetResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtEnhetResource.java index 3e3ddaca..a08849b1 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/OtEnhetResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtEnhetResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/OtEnhetResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtEnhetResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/OtEnhetResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtEnhetResources.java index 780ab9bb..f01b8667 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/OtEnhetResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtEnhetResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/OtStatusResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtStatusResource.java similarity index 85% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/OtStatusResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtStatusResource.java index 93552685..61018d67 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/OtStatusResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtStatusResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,13 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/OtStatusResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtStatusResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/OtStatusResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtStatusResources.java index 3af63a67..4b0d9441 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/OtStatusResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtStatusResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/ProvestatusResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ProvestatusResource.java similarity index 80% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/ProvestatusResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ProvestatusResource.java index 18db9912..146c04b2 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/ProvestatusResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ProvestatusResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/ProvestatusResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ProvestatusResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/ProvestatusResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ProvestatusResources.java index 4e033fe8..2c4a513e 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/ProvestatusResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ProvestatusResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/SkolearResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkolearResource.java similarity index 80% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/SkolearResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkolearResource.java index ffeaae2c..2dc32dfa 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/SkolearResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkolearResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/SkolearResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkolearResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/SkolearResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkolearResources.java index 82024599..5d136f06 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/SkolearResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkolearResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResource.java similarity index 80% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResource.java index 995ecb94..73d283f2 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResources.java index b5ca0ecc..26a43886 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/TerminResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TerminResource.java similarity index 80% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/TerminResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TerminResource.java index 95547877..36591162 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/TerminResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TerminResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/TerminResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TerminResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/TerminResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TerminResources.java index fc786fb6..0763b409 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/TerminResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TerminResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/TilretteleggingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TilretteleggingResource.java similarity index 81% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/TilretteleggingResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TilretteleggingResource.java index ab93c7fb..c5ea4f3b 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/TilretteleggingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TilretteleggingResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/TilretteleggingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TilretteleggingResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/TilretteleggingResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TilretteleggingResources.java index 9ac24d17..efeb52fd 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/TilretteleggingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TilretteleggingResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/VarseltypeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VarseltypeResource.java similarity index 80% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/VarseltypeResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VarseltypeResource.java index 6f45ca5e..ffd1de6b 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/VarseltypeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VarseltypeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/VarseltypeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VarseltypeResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/VarseltypeResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VarseltypeResources.java index df8a8168..725aad01 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/VarseltypeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VarseltypeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResource.java similarity index 81% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResource.java index 6d22c53e..50234357 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResources.java index 518ece74..7ddcd7e1 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.kodeverk; +package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/larling/AvlagtProveResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/AvlagtProveResource.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/larling/AvlagtProveResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/AvlagtProveResource.java index 74321d22..eff05468 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/larling/AvlagtProveResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/AvlagtProveResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.larling; +package no.novari.fint.model.resource.utdanning.larling; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/larling/AvlagtProveResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/AvlagtProveResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/larling/AvlagtProveResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/AvlagtProveResources.java index 5d218d7d..335d3df5 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/larling/AvlagtProveResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/AvlagtProveResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.larling; +package no.novari.fint.model.resource.utdanning.larling; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/larling/LarlingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/LarlingResource.java similarity index 89% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/larling/LarlingResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/LarlingResource.java index 7a188c91..2913bf74 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/larling/LarlingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/LarlingResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.larling; +package no.novari.fint.model.resource.utdanning.larling; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/larling/LarlingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/LarlingResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/larling/LarlingResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/LarlingResources.java index 6245ab00..5a9785c1 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/larling/LarlingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/LarlingResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.larling; +package no.novari.fint.model.resource.utdanning.larling; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/ot/OtUngdomResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/ot/OtUngdomResource.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/ot/OtUngdomResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/ot/OtUngdomResource.java index 262c5f41..980cf4e9 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/ot/OtUngdomResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/ot/OtUngdomResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.ot; +package no.novari.fint.model.resource.utdanning.ot; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/ot/OtUngdomResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/ot/OtUngdomResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/ot/OtUngdomResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/ot/OtUngdomResources.java index 8be0c97b..e02469d4 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/ot/OtUngdomResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/ot/OtUngdomResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.ot; +package no.novari.fint.model.resource.utdanning.ot; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/EksamenResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/EksamenResource.java similarity index 87% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/EksamenResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/EksamenResource.java index 5ee2a43e..332c5481 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/EksamenResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/EksamenResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.timeplan; +package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/EksamenResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/EksamenResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/EksamenResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/EksamenResources.java index 74c5c089..af6f0529 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/EksamenResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/EksamenResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.timeplan; +package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FagResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FagResource.java similarity index 90% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FagResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FagResource.java index d5c0d459..ec23e34b 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FagResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FagResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.timeplan; +package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.basisklasser.GruppeResource; +import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FagResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FagResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FagResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FagResources.java index a0aaff22..7298847b 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FagResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FagResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.timeplan; +package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FaggruppeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppeResource.java similarity index 88% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FaggruppeResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppeResource.java index 70999026..d0b5a5aa 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FaggruppeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.timeplan; +package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.basisklasser.GruppeResource; +import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FaggruppeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppeResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FaggruppeResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppeResources.java index 0f1b282f..0fd59a2c 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FaggruppeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.timeplan; +package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResource.java similarity index 89% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResource.java index 64f44e24..8072d91f 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.timeplan; +package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.utdanning.basisklasser.Gruppemedlemskap; +import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResources.java index 3741447a..3eaf99c7 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.timeplan; +package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/RomResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/RomResource.java similarity index 89% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/RomResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/RomResource.java index a62911f9..e823a879 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/RomResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/RomResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.timeplan; +package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/RomResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/RomResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/RomResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/RomResources.java index be350e6b..97968f3b 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/RomResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/RomResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.timeplan; +package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/TimeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/TimeResource.java similarity index 89% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/TimeResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/TimeResource.java index dad77322..ad0256a6 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/TimeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/TimeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.timeplan; +package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/TimeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/TimeResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/TimeResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/TimeResources.java index 452f85c8..943c0d6a 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/TimeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/TimeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.timeplan; +package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResource.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResource.java index d7906dbb..b8425d50 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.timeplan; +package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.basisklasser.GruppeResource; +import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResources.java index 56bc2771..202f17b0 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.timeplan; +package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResource.java similarity index 86% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResource.java index 24516e6a..1ba52014 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.timeplan; +package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.utdanning.basisklasser.Gruppemedlemskap; +import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResources.java index 5c431b52..0f26aa4f 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.timeplan; +package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResource.java similarity index 84% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResource.java index 60a82a09..d9bc22c3 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.utdanningsprogram; +package no.novari.fint.model.resource.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.basisklasser.GruppeResource; +import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResources.java similarity index 90% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResources.java index ce100e58..38cf25c7 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.utdanningsprogram; +package no.novari.fint.model.resource.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResource.java similarity index 89% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResource.java index 0a82d528..aa3b9497 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.utdanningsprogram; +package no.novari.fint.model.resource.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.basisklasser.GruppeResource; +import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResources.java similarity index 90% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResources.java index 808682f7..7818d664 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.utdanningsprogram; +package no.novari.fint.model.resource.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResource.java similarity index 85% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResource.java index 19d44115..e4acf268 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.utdanningsprogram; +package no.novari.fint.model.resource.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.utdanning.basisklasser.Gruppemedlemskap; +import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResources.java index 137a5633..cf77845a 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.utdanningsprogram; +package no.novari.fint.model.resource.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/SkoleResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/SkoleResource.java similarity index 94% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/SkoleResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/SkoleResource.java index ef5fbf55..5cae00f6 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/SkoleResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/SkoleResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.utdanningsprogram; +package no.novari.fint.model.resource.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.felles.basisklasser.EnhetResource; +import no.novari.fint.model.resource.felles.basisklasser.EnhetResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/SkoleResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/SkoleResources.java similarity index 90% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/SkoleResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/SkoleResources.java index fd41628d..148658f8 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/SkoleResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/SkoleResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.utdanningsprogram; +package no.novari.fint.model.resource.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResource.java similarity index 84% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResource.java index 6f2c95b5..50aba2ee 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.utdanningsprogram; +package no.novari.fint.model.resource.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.basisklasser.GruppeResource; +import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResources.java index 833d0f11..1d1fef7b 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.utdanningsprogram; +package no.novari.fint.model.resource.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/AnmerkningerResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/AnmerkningerResource.java similarity index 88% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/AnmerkningerResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/AnmerkningerResource.java index 238d4cf5..7e2a715f 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/AnmerkningerResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/AnmerkningerResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/AnmerkningerResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/AnmerkningerResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/AnmerkningerResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/AnmerkningerResources.java index 5124ca5b..876a54ef 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/AnmerkningerResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/AnmerkningerResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensgruppeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppeResource.java similarity index 93% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensgruppeResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppeResource.java index f73cf7be..656fe0ac 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensgruppeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppeResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -13,15 +13,13 @@ import java.util.Map; import java.util.HashMap; import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; import java.util.Date; -import no.fint.model.resource.utdanning.basisklasser.GruppeResource; +import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensgruppeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppeResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensgruppeResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppeResources.java index e95eb9e1..61fbc80b 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensgruppeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppeResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResource.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResource.java index b4859446..6b4e4ad4 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.utdanning.basisklasser.Gruppemedlemskap; +import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResources.java index 59515fa7..8d6cbe4a 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensvurderingResource.java similarity index 87% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensvurderingResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensvurderingResource.java index 122fe4bc..6ce9c2f6 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensvurderingResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.vurdering.FagvurderingResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensvurderingResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensvurderingResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensvurderingResources.java index 67ccc159..510bd448 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/EksamensvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensvurderingResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/ElevfravarResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevfravarResource.java similarity index 90% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/ElevfravarResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevfravarResource.java index 72a950ce..04b506a8 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/ElevfravarResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevfravarResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/ElevfravarResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevfravarResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/ElevfravarResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevfravarResources.java index b3a8cb7f..07b5228f 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/ElevfravarResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevfravarResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/ElevvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevvurderingResource.java similarity index 95% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/ElevvurderingResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevvurderingResource.java index 12935c1e..e51912d7 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/ElevvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevvurderingResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/ElevvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevvurderingResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/ElevvurderingResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevvurderingResources.java index 2e6bdbeb..63d318e6 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/ElevvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevvurderingResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FagvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FagvurderingResource.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FagvurderingResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FagvurderingResource.java index 52395be3..958e0dbb 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FagvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FagvurderingResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintAbstractObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; + import java.util.Date; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FagvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FagvurderingResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FagvurderingResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FagvurderingResources.java index 817fd41d..9f0c461a 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FagvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FagvurderingResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarResource.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarResource.java index 03845fa5..95f62ce3 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarResources.java index 33fcb415..8e5b1574 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarsoversiktResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsoversiktResource.java similarity index 87% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarsoversiktResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsoversiktResource.java index d58af9b0..51aa1f52 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarsoversiktResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsoversiktResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.utdanning.vurdering.Fravarsprosent; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.utdanning.vurdering.Fravarsprosent; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarsoversiktResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsoversiktResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarsoversiktResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsoversiktResources.java index e1b12e30..d40bab6d 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarsoversiktResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsoversiktResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarsregistreringResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsregistreringResource.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarsregistreringResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsregistreringResource.java index 92011347..deb211c2 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarsregistreringResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsregistreringResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Periode; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarsregistreringResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsregistreringResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarsregistreringResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsregistreringResources.java index cf56a91d..067b98fb 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/FravarsregistreringResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsregistreringResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResource.java similarity index 85% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResource.java index 1874aa1e..68575416 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.vurdering.FagvurderingResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResources.java index 593a8b6f..adedeb73 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResource.java similarity index 85% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResource.java index ef476704..16e2d40b 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.vurdering.OrdensvurderingResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResources.java index 7312a78d..401c600b 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/KarakterhistorieResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterhistorieResource.java similarity index 93% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/KarakterhistorieResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterhistorieResource.java index b8fe06e6..69cb341b 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/KarakterhistorieResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterhistorieResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,13 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; import java.util.Date; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/KarakterhistorieResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterhistorieResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/KarakterhistorieResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterhistorieResources.java index a56c29d7..0995e4ac 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/KarakterhistorieResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterhistorieResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/KarakterverdiResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterverdiResource.java similarity index 83% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/KarakterverdiResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterverdiResource.java index 90c8a507..c973baf1 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/KarakterverdiResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterverdiResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,12 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.basisklasser.Begrep; +import no.novari.fint.model.felles.basisklasser.Begrep; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/KarakterverdiResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterverdiResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/KarakterverdiResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterverdiResources.java index 5b4b6b65..f18e2dd7 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/KarakterverdiResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterverdiResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/OrdensvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/OrdensvurderingResource.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/OrdensvurderingResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/OrdensvurderingResource.java index 2d0b0ab8..80e0131c 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/OrdensvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/OrdensvurderingResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,12 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.FintAbstractObject; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; + import java.util.Date; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/OrdensvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/OrdensvurderingResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/OrdensvurderingResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/OrdensvurderingResources.java index 284bb17f..23059c47 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/OrdensvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/OrdensvurderingResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SensorResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SensorResource.java similarity index 90% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SensorResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SensorResource.java index f4a40f68..400cbc49 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SensorResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SensorResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SensorResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SensorResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SensorResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SensorResources.java index 10df9be5..b9d42456 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SensorResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SensorResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SluttfagvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttfagvurderingResource.java similarity index 88% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SluttfagvurderingResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttfagvurderingResource.java index 9b01d67d..ec9440d1 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SluttfagvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttfagvurderingResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.vurdering.FagvurderingResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SluttfagvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttfagvurderingResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SluttfagvurderingResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttfagvurderingResources.java index f6ce4e8f..a2ae42b0 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SluttfagvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttfagvurderingResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SluttordensvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttordensvurderingResource.java similarity index 85% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SluttordensvurderingResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttordensvurderingResource.java index aba19822..6f504f36 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SluttordensvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttordensvurderingResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.vurdering.OrdensvurderingResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SluttordensvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttordensvurderingResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SluttordensvurderingResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttordensvurderingResources.java index 714e8d92..c6e77f63 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/SluttordensvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttordensvurderingResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResource.java similarity index 85% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResource.java index 5ca322e9..ec46cbde 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.vurdering.FagvurderingResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResources.java index badcbc5c..89d42779 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResource.java similarity index 85% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResource.java index 12025554..28a8b747 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,15 +12,11 @@ import java.util.List; import java.util.Map; import java.util.HashMap; -import javax.validation.Valid; -import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.resource.utdanning.vurdering.OrdensvurderingResource; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResources.java similarity index 92% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResources.java index d642b0a1..0149f973 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/VurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/VurderingResource.java similarity index 93% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/VurderingResource.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/VurderingResource.java index c488b2b9..fcb713d6 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/VurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/VurderingResource.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -15,12 +15,11 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.fint.model.resource.FintLinks; import no.fint.model.resource.FintResource; import no.fint.model.resource.Link; import no.fint.model.FintIdentifikator; -import no.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/VurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/VurderingResources.java similarity index 91% rename from fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/VurderingResources.java rename to fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/VurderingResources.java index ecd595c7..6fff4972 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/fint/model/resource/utdanning/vurdering/VurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/VurderingResources.java @@ -1,4 +1,4 @@ -package no.fint.model.resource.utdanning.vurdering; +package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy similarity index 91% rename from fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy rename to fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy index 51687658..d247cfde 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/ModelDeserializationSpec.groovy +++ b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy @@ -1,11 +1,11 @@ -package no.novari.test.model +package no.novari.fint.test.model import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException -import no.novari.model.resource.felles.PersonResource -import no.novari.model.resource.utdanning.elev.KlasseResource -import no.novari.model.utdanning.elev.Klasse +import no.novari.fint.model.resource.felles.PersonResource +import no.novari.fint.model.resource.utdanning.elev.BasisgruppeResource +import no.novari.fint.model.utdanning.elev.Basisgruppe import spock.lang.Specification class ModelDeserializationSpec extends Specification { diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy similarity index 79% rename from fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy rename to fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy index 1bfcfe3e..bae427f2 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/ModelSerializationSpec.groovy +++ b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy @@ -1,14 +1,14 @@ -package no.novari.test.model +package no.novari.fint.test.model import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.databind.util.ISO8601DateFormat import groovy.json.JsonSlurper -import no.novari.model.felles.kompleksedatatyper.Identifikator -import no.novari.model.resource.Link -import no.novari.model.resource.utdanning.elev.KlasseResource -import no.novari.model.utdanning.elev.Klasse -import no.novari.model.utdanning.elev.Klassemedlemskap +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator +import no.fint.model.resource.Link +import no.novari.fint.model.resource.utdanning.elev.BasisgruppeResource +import no.novari.fint.model.utdanning.elev.Basisgruppe +import no.novari.fint.model.utdanning.elev.Basisgruppemedlemskap import spock.lang.Specification class ModelSerializationSpec extends Specification { @@ -24,7 +24,7 @@ class ModelSerializationSpec extends Specification { def "Serialize Klasse without Links"() { given: - def klasse = new Klasse( + def klasse = new Basisgruppe( systemId: new Identifikator(identifikatorverdi: "ABC123"), beskrivelse: "Klasse 123", navn: "ABC123" @@ -42,7 +42,7 @@ class ModelSerializationSpec extends Specification { def "Serialize KlasseResource with links"() { given: - def klasse = new KlasseResource( + def klasse = new BasisgruppeResource( systemId: new Identifikator(identifikatorverdi: "ABC123"), beskrivelse: "Klasse 123", navn: "ABC123" diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy similarity index 82% rename from fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy rename to fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy index cabb463d..e8c1922e 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/test/model/SpringModelDeserializationSpec.groovy +++ b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy @@ -1,9 +1,9 @@ -package no.novari.test.model +package no.novari.fint.test.model import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.ObjectMapper -import no.novari.model.utdanning.elev.Klasse -import no.novari.test.model.utils.TestApplication +import no.novari.fint.model.utdanning.elev.Basisgruppe +import no.novari.fint.test.model.utils.TestApplication import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest import org.springframework.hateoas.Resource @@ -20,7 +20,7 @@ class SpringModelDeserializationSpec extends Specification { def input = getClass().getClassLoader().getResourceAsStream("klasseresource.json") when: - def result = objectMapper.readValue(input, new TypeReference>() {}) + def result = objectMapper.readValue(input, new TypeReference>() {}) then: result diff --git a/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java similarity index 89% rename from fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java rename to fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java index 283b3b72..98594f18 100644 --- a/fint-felles-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestApplication.java +++ b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java @@ -1,8 +1,8 @@ -package no.novari.test.model.utils; +package no.novari.fint.test.model.utils; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.hateoas.config.EnableHypermediaSupport; import org.springframework.context.annotation.Import; +import org.springframework.hateoas.config.EnableHypermediaSupport; @EnableHypermediaSupport(type = EnableHypermediaSupport.HypermediaType.HAL) @SpringBootApplication diff --git a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java similarity index 93% rename from fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java rename to fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java index 1395b189..30f67c1c 100644 --- a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/test/model/utils/TestConfiguration.java +++ b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java @@ -1,4 +1,4 @@ -package no.novari.test.model.utils; +package no.novari.fint.test.model.utils; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.context.annotation.Bean; diff --git a/gradle.properties b/gradle.properties index 110cded1..c4215046 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,5 +2,5 @@ version=3.19.0 springBootVersion=2.7.12 lombokVersion=1.18.38 spockSpringVersion=2.4-M6-groovy-4.0 -fintModelResourceVersion=1.0.0-rc-2 -fintModelCoreVersion=1.0.0-rc-1 \ No newline at end of file +fintModelResourceVersion=0.5.0 +fintModelCoreVersion=0.5.0 \ No newline at end of file From ecd347035a868559380da06f93c95fa69fbcc7ec Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 17 Sep 2025 09:13:22 +0200 Subject: [PATCH 07/24] Upgraded github action tasks --- .github/workflows/build.yaml | 6 +++--- .github/workflows/release.yaml | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d0e8a8a3..78e8f53d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -7,16 +7,16 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 - name: Setup Java 8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: distribution: adopt java-version: 8 - name: Gradle Build - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: gradle-version: 4.10.3 arguments: clean build diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 047edde0..8fe58bf0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 - name: Set version run: | @@ -18,16 +18,16 @@ jobs: TAG_NAME: ${{github.event.release.tag_name}} - name: Setup Java 8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: distribution: adopt java-version: 8 - - name: Gradle Build - uses: gradle/gradle-build-action@v2 - with: - gradle-version: 4.10.3 - arguments: clean build publish -Pversion=${{env.RELEASE_VERSION}} + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Publish Build + run: ./gradlew clean build publish -Pversion=${{ env.RELEASE_VERSION }} env: - REPOSILITE_USERNAME: ${{secrets.REPOSILITE_USERNAME}} - REPOSILITE_PASSWORD: ${{secrets.REPOSILITE_PASSWORD}} + REPOSILITE_USERNAME: ${{ secrets.REPOSILITE_USERNAME }} + REPOSILITE_PASSWORD: ${{ secrets.REPOSILITE_PASSWORD }} From 82de0a1ab869ab895743223e8b39202a12e5ef22 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 17 Sep 2025 09:23:37 +0200 Subject: [PATCH 08/24] Updated github action to Java 11 --- .github/workflows/build.yaml | 4 ++-- .github/workflows/release.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 78e8f53d..4b69c04e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -9,11 +9,11 @@ jobs: steps: - uses: actions/checkout@v5 - - name: Setup Java 8 + - name: Setup Java 11 uses: actions/setup-java@v5 with: distribution: adopt - java-version: 8 + java-version: 11 - name: Gradle Build uses: gradle/gradle-build-action@v3 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8fe58bf0..4772edff 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -17,11 +17,11 @@ jobs: env: TAG_NAME: ${{github.event.release.tag_name}} - - name: Setup Java 8 + - name: Setup Java 11 uses: actions/setup-java@v5 with: distribution: adopt - java-version: 8 + java-version: 11 - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 From bfc9cad44c2ee3d79cbe882f1b7b83a94374d3ed Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 17 Sep 2025 09:29:33 +0200 Subject: [PATCH 09/24] Downgraded Gradle --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 77c0b4f0..3994438e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From a3292b8fcd96c363c5bc5999b90ac386e4d7e45c Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 17 Sep 2025 09:32:40 +0200 Subject: [PATCH 10/24] Updated gradle build --- .github/workflows/build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4b69c04e..373a6f5a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,8 +15,8 @@ jobs: distribution: adopt java-version: 11 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + - name: Gradle Build - uses: gradle/gradle-build-action@v3 - with: - gradle-version: 4.10.3 - arguments: clean build + run: ./gradlew clean build \ No newline at end of file From 2a8b2e8987fbb93e450c4d7029c566e05fe6dec3 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 17 Sep 2025 11:39:43 +0200 Subject: [PATCH 11/24] Upgraded model-resource og model-core with new package structure --- build.gradle | 5 +- .../administrasjon/fullmakt/Fullmakt.java | 50 ++++++------ .../model/administrasjon/fullmakt/Rolle.java | 18 ++--- .../administrasjon/kodeverk/Aktivitet.java | 18 ++--- .../model/administrasjon/kodeverk/Anlegg.java | 18 ++--- .../model/administrasjon/kodeverk/Ansvar.java | 22 +++--- .../kodeverk/Arbeidsforholdstype.java | 18 ++--- .../model/administrasjon/kodeverk/Art.java | 18 ++--- .../administrasjon/kodeverk/Diverse.java | 18 ++--- .../model/administrasjon/kodeverk/Formal.java | 18 ++--- .../administrasjon/kodeverk/Fravarsgrunn.java | 16 ++-- .../administrasjon/kodeverk/Fravarstype.java | 18 ++--- .../administrasjon/kodeverk/Funksjon.java | 20 ++--- .../kodeverk/Kontodimensjon.java | 18 ++--- .../administrasjon/kodeverk/Kontrakt.java | 18 ++--- .../administrasjon/kodeverk/Lonnsart.java | 18 ++--- .../administrasjon/kodeverk/Lopenummer.java | 18 ++--- .../model/administrasjon/kodeverk/Objekt.java | 18 ++--- .../kodeverk/Personalressurskategori.java | 16 ++-- .../administrasjon/kodeverk/Prosjekt.java | 18 ++--- .../administrasjon/kodeverk/Prosjektart.java | 22 +++--- .../model/administrasjon/kodeverk/Ramme.java | 18 ++--- .../kodeverk/Stillingskode.java | 18 ++--- .../administrasjon/kodeverk/Uketimetall.java | 16 ++-- .../kompleksedatatyper/Kontostreng.java | 42 +++++----- .../organisasjon/Arbeidslokasjon.java | 18 ++--- .../organisasjon/Organisasjonselement.java | 28 +++---- .../personal/Arbeidsforhold.java | 66 ++++++++-------- .../administrasjon/personal/Fastlonn.java | 20 ++--- .../administrasjon/personal/Fasttillegg.java | 20 ++--- .../model/administrasjon/personal/Fravar.java | 28 +++---- .../model/administrasjon/personal/Lonn.java | 22 +++--- .../personal/Personalressurs.java | 32 ++++---- .../administrasjon/personal/Variabellonn.java | 20 ++--- .../build.gradle | 2 +- .../fullmakt/FullmaktResource.java | 8 +- .../fullmakt/FullmaktResources.java | 2 +- .../fullmakt/RolleResource.java | 8 +- .../fullmakt/RolleResources.java | 2 +- .../kodeverk/AktivitetResource.java | 8 +- .../kodeverk/AktivitetResources.java | 2 +- .../kodeverk/AnleggResource.java | 8 +- .../kodeverk/AnleggResources.java | 2 +- .../kodeverk/AnsvarResource.java | 8 +- .../kodeverk/AnsvarResources.java | 2 +- .../kodeverk/ArbeidsforholdstypeResource.java | 8 +- .../ArbeidsforholdstypeResources.java | 2 +- .../administrasjon/kodeverk/ArtResource.java | 8 +- .../administrasjon/kodeverk/ArtResources.java | 2 +- .../kodeverk/DiverseResource.java | 8 +- .../kodeverk/DiverseResources.java | 2 +- .../kodeverk/FormalResource.java | 8 +- .../kodeverk/FormalResources.java | 2 +- .../kodeverk/FravarsgrunnResource.java | 8 +- .../kodeverk/FravarsgrunnResources.java | 2 +- .../kodeverk/FravarstypeResource.java | 8 +- .../kodeverk/FravarstypeResources.java | 2 +- .../kodeverk/FunksjonResource.java | 8 +- .../kodeverk/FunksjonResources.java | 2 +- .../kodeverk/KontodimensjonResource.java | 8 +- .../kodeverk/KontodimensjonResources.java | 2 +- .../kodeverk/KontraktResource.java | 8 +- .../kodeverk/KontraktResources.java | 2 +- .../kodeverk/LonnsartResource.java | 8 +- .../kodeverk/LonnsartResources.java | 2 +- .../kodeverk/LopenummerResource.java | 8 +- .../kodeverk/LopenummerResources.java | 2 +- .../kodeverk/ObjektResource.java | 8 +- .../kodeverk/ObjektResources.java | 2 +- .../PersonalressurskategoriResource.java | 8 +- .../PersonalressurskategoriResources.java | 2 +- .../kodeverk/ProsjektResource.java | 8 +- .../kodeverk/ProsjektResources.java | 2 +- .../kodeverk/ProsjektartResource.java | 8 +- .../kodeverk/ProsjektartResources.java | 2 +- .../kodeverk/RammeResource.java | 8 +- .../kodeverk/RammeResources.java | 2 +- .../kodeverk/StillingskodeResource.java | 8 +- .../kodeverk/StillingskodeResources.java | 2 +- .../kodeverk/UketimetallResource.java | 8 +- .../kodeverk/UketimetallResources.java | 2 +- .../KontostrengResource.java | 8 +- .../KontostrengResources.java | 2 +- .../organisasjon/ArbeidslokasjonResource.java | 8 +- .../ArbeidslokasjonResources.java | 2 +- .../OrganisasjonselementResource.java | 8 +- .../OrganisasjonselementResources.java | 2 +- .../personal/ArbeidsforholdResource.java | 8 +- .../personal/ArbeidsforholdResources.java | 2 +- .../personal/FastlonnResource.java | 8 +- .../personal/FastlonnResources.java | 2 +- .../personal/FasttilleggResource.java | 8 +- .../personal/FasttilleggResources.java | 2 +- .../personal/FravarResource.java | 8 +- .../personal/FravarResources.java | 2 +- .../administrasjon/personal/LonnResource.java | 8 +- .../personal/LonnResources.java | 2 +- .../personal/PersonalressursResource.java | 8 +- .../personal/PersonalressursResources.java | 2 +- .../personal/VariabellonnResource.java | 8 +- .../personal/VariabellonnResources.java | 2 +- .../test/model/ModelSerializationSpec.groovy | 2 +- .../model/arkiv/kodeverk/DokumentStatus.java | 16 ++-- .../model/arkiv/kodeverk/DokumentType.java | 16 ++-- .../fint/model/arkiv/kodeverk/Format.java | 16 ++-- .../model/arkiv/kodeverk/JournalStatus.java | 16 ++-- .../model/arkiv/kodeverk/JournalpostType.java | 16 ++-- .../arkiv/kodeverk/Klassifikasjonstype.java | 16 ++-- .../kodeverk/KorrespondansepartType.java | 16 ++-- .../model/arkiv/kodeverk/Merknadstype.java | 16 ++-- .../fint/model/arkiv/kodeverk/PartRolle.java | 16 ++-- .../fint/model/arkiv/kodeverk/Rolle.java | 16 ++-- .../model/arkiv/kodeverk/Saksmappetype.java | 16 ++-- .../fint/model/arkiv/kodeverk/Saksstatus.java | 16 ++-- .../arkiv/kodeverk/Skjermingshjemmel.java | 16 ++-- .../model/arkiv/kodeverk/Tilgangsgruppe.java | 16 ++-- .../arkiv/kodeverk/Tilgangsrestriksjon.java | 16 ++-- .../kodeverk/TilknyttetRegistreringSom.java | 16 ++-- .../model/arkiv/kodeverk/Variantformat.java | 16 ++-- ...ispensasjonAutomatiskFredaKulturminne.java | 16 ++-- .../arkiv/kulturminnevern/TilskuddFartoy.java | 16 ++-- .../TilskuddFredaBygningPrivatEie.java | 16 ++-- .../model/arkiv/noark/AdministrativEnhet.java | 18 ++--- .../fint/model/arkiv/noark/Arkivdel.java | 22 +++--- .../fint/model/arkiv/noark/Arkivressurs.java | 22 +++--- .../fint/model/arkiv/noark/Autorisasjon.java | 22 +++--- .../fint/model/arkiv/noark/Avskrivning.java | 16 ++-- .../arkiv/noark/Dokumentbeskrivelse.java | 26 +++---- .../fint/model/arkiv/noark/Dokumentfil.java | 18 ++--- .../model/arkiv/noark/Dokumentobjekt.java | 24 +++--- .../fint/model/arkiv/noark/Journalpost.java | 22 +++--- .../novari/fint/model/arkiv/noark/Klasse.java | 18 ++--- .../arkiv/noark/Klassifikasjonssystem.java | 20 ++--- .../model/arkiv/noark/Korrespondansepart.java | 18 ++--- .../novari/fint/model/arkiv/noark/Mappe.java | 22 +++--- .../fint/model/arkiv/noark/Merknad.java | 20 ++--- .../novari/fint/model/arkiv/noark/Part.java | 18 ++--- .../fint/model/arkiv/noark/Registrering.java | 28 +++---- .../no/novari/fint/model/arkiv/noark/Sak.java | 18 ++--- .../fint/model/arkiv/noark/Saksmappe.java | 28 +++---- .../fint/model/arkiv/noark/Skjerming.java | 20 ++--- .../fint/model/arkiv/noark/Tilgang.java | 24 +++--- .../model/arkiv/personal/Personalmappe.java | 24 +++--- .../arkiv/samferdsel/SoknadDrosjeloyve.java | 16 ++-- .../kodeverk/DokumentStatusResource.java | 8 +- .../kodeverk/DokumentStatusResources.java | 2 +- .../arkiv/kodeverk/DokumentTypeResource.java | 8 +- .../arkiv/kodeverk/DokumentTypeResources.java | 2 +- .../arkiv/kodeverk/FormatResource.java | 8 +- .../arkiv/kodeverk/FormatResources.java | 2 +- .../arkiv/kodeverk/JournalStatusResource.java | 8 +- .../kodeverk/JournalStatusResources.java | 2 +- .../kodeverk/JournalpostTypeResource.java | 8 +- .../kodeverk/JournalpostTypeResources.java | 2 +- .../kodeverk/KlassifikasjonstypeResource.java | 8 +- .../KlassifikasjonstypeResources.java | 2 +- .../KorrespondansepartTypeResource.java | 8 +- .../KorrespondansepartTypeResources.java | 2 +- .../arkiv/kodeverk/MerknadstypeResource.java | 8 +- .../arkiv/kodeverk/MerknadstypeResources.java | 2 +- .../arkiv/kodeverk/PartRolleResource.java | 8 +- .../arkiv/kodeverk/PartRolleResources.java | 2 +- .../arkiv/kodeverk/RolleResource.java | 8 +- .../arkiv/kodeverk/RolleResources.java | 2 +- .../arkiv/kodeverk/SaksmappetypeResource.java | 8 +- .../kodeverk/SaksmappetypeResources.java | 2 +- .../arkiv/kodeverk/SaksstatusResource.java | 8 +- .../arkiv/kodeverk/SaksstatusResources.java | 2 +- .../kodeverk/SkjermingshjemmelResource.java | 8 +- .../kodeverk/SkjermingshjemmelResources.java | 2 +- .../kodeverk/TilgangsgruppeResource.java | 8 +- .../kodeverk/TilgangsgruppeResources.java | 2 +- .../kodeverk/TilgangsrestriksjonResource.java | 8 +- .../TilgangsrestriksjonResources.java | 2 +- .../TilknyttetRegistreringSomResource.java | 8 +- .../TilknyttetRegistreringSomResources.java | 2 +- .../arkiv/kodeverk/VariantformatResource.java | 8 +- .../kodeverk/VariantformatResources.java | 2 +- ...jonAutomatiskFredaKulturminneResource.java | 8 +- ...onAutomatiskFredaKulturminneResources.java | 2 +- .../TilskuddFartoyResource.java | 8 +- .../TilskuddFartoyResources.java | 2 +- ...TilskuddFredaBygningPrivatEieResource.java | 8 +- ...ilskuddFredaBygningPrivatEieResources.java | 2 +- .../noark/AdministrativEnhetResource.java | 8 +- .../noark/AdministrativEnhetResources.java | 2 +- .../arkiv/noark/ArkivdelResource.java | 8 +- .../arkiv/noark/ArkivdelResources.java | 2 +- .../arkiv/noark/ArkivressursResource.java | 8 +- .../arkiv/noark/ArkivressursResources.java | 2 +- .../arkiv/noark/AutorisasjonResource.java | 8 +- .../arkiv/noark/AutorisasjonResources.java | 2 +- .../noark/DokumentbeskrivelseResource.java | 8 +- .../noark/DokumentbeskrivelseResources.java | 2 +- .../arkiv/noark/DokumentfilResource.java | 8 +- .../arkiv/noark/DokumentfilResources.java | 2 +- .../arkiv/noark/DokumentobjektResource.java | 8 +- .../arkiv/noark/DokumentobjektResources.java | 2 +- .../arkiv/noark/JournalpostResource.java | 8 +- .../arkiv/noark/JournalpostResources.java | 2 +- .../resource/arkiv/noark/KlasseResource.java | 8 +- .../resource/arkiv/noark/KlasseResources.java | 2 +- .../noark/KlassifikasjonssystemResource.java | 8 +- .../noark/KlassifikasjonssystemResources.java | 2 +- .../noark/KorrespondansepartResource.java | 8 +- .../noark/KorrespondansepartResources.java | 2 +- .../resource/arkiv/noark/MappeResource.java | 8 +- .../resource/arkiv/noark/MappeResources.java | 2 +- .../resource/arkiv/noark/MerknadResource.java | 8 +- .../arkiv/noark/MerknadResources.java | 2 +- .../resource/arkiv/noark/PartResource.java | 8 +- .../resource/arkiv/noark/PartResources.java | 2 +- .../arkiv/noark/RegistreringResource.java | 8 +- .../arkiv/noark/RegistreringResources.java | 2 +- .../resource/arkiv/noark/SakResource.java | 8 +- .../resource/arkiv/noark/SakResources.java | 2 +- .../arkiv/noark/SaksmappeResource.java | 8 +- .../arkiv/noark/SaksmappeResources.java | 2 +- .../arkiv/noark/SkjermingResource.java | 8 +- .../arkiv/noark/SkjermingResources.java | 2 +- .../resource/arkiv/noark/TilgangResource.java | 8 +- .../arkiv/noark/TilgangResources.java | 2 +- .../arkiv/personal/PersonalmappeResource.java | 8 +- .../personal/PersonalmappeResources.java | 2 +- .../samferdsel/SoknadDrosjeloyveResource.java | 8 +- .../SoknadDrosjeloyveResources.java | 2 +- fint-felles-model-java/build.gradle | 2 +- .../fint/model/felles/Kontaktperson.java | 20 ++--- .../no/novari/fint/model/felles/Person.java | 40 +++++----- .../novari/fint/model/felles/Virksomhet.java | 18 ++--- .../fint/model/felles/basisklasser/Aktor.java | 16 ++-- .../model/felles/basisklasser/Begrep.java | 16 ++-- .../fint/model/felles/basisklasser/Enhet.java | 16 ++-- .../fint/model/felles/kodeverk/Fylke.java | 18 ++--- .../fint/model/felles/kodeverk/Kommune.java | 18 ++--- .../fint/model/felles/kodeverk/Valuta.java | 18 ++--- .../fint/model/felles/kodeverk/iso/Kjonn.java | 16 ++-- .../model/felles/kodeverk/iso/Landkode.java | 16 ++-- .../fint/model/felles/kodeverk/iso/Sprak.java | 16 ++-- .../felles/kompleksedatatyper/Adresse.java | 18 ++--- .../kompleksedatatyper/Identifikator.java | 16 ++-- .../Kontaktinformasjon.java | 16 ++-- .../kompleksedatatyper/Matrikkelnummer.java | 18 ++--- .../felles/kompleksedatatyper/Periode.java | 16 ++-- .../felles/kompleksedatatyper/Personnavn.java | 16 ++-- fint-felles-resource-model-java/build.gradle | 4 +- .../felles/KontaktpersonResource.java | 8 +- .../felles/KontaktpersonResources.java | 2 +- .../model/resource/felles/PersonResource.java | 8 +- .../resource/felles/PersonResources.java | 2 +- .../resource/felles/VirksomhetResource.java | 8 +- .../resource/felles/VirksomhetResources.java | 2 +- .../felles/basisklasser/AktorResource.java | 8 +- .../felles/basisklasser/AktorResources.java | 2 +- .../felles/basisklasser/BegrepResource.java | 8 +- .../felles/basisklasser/BegrepResources.java | 2 +- .../felles/basisklasser/EnhetResource.java | 8 +- .../felles/basisklasser/EnhetResources.java | 2 +- .../felles/kodeverk/FylkeResource.java | 8 +- .../felles/kodeverk/FylkeResources.java | 2 +- .../felles/kodeverk/KommuneResource.java | 8 +- .../felles/kodeverk/KommuneResources.java | 2 +- .../felles/kodeverk/ValutaResource.java | 8 +- .../felles/kodeverk/ValutaResources.java | 2 +- .../felles/kodeverk/iso/KjonnResource.java | 8 +- .../felles/kodeverk/iso/KjonnResources.java | 2 +- .../felles/kodeverk/iso/LandkodeResource.java | 8 +- .../kodeverk/iso/LandkodeResources.java | 2 +- .../felles/kodeverk/iso/SprakResource.java | 8 +- .../felles/kodeverk/iso/SprakResources.java | 2 +- .../kompleksedatatyper/AdresseResource.java | 8 +- .../kompleksedatatyper/AdresseResources.java | 2 +- .../MatrikkelnummerResource.java | 8 +- .../MatrikkelnummerResources.java | 2 +- .../test/model/ModelSerializationSpec.groovy | 2 +- .../fint/model/okonomi/faktura/Faktura.java | 18 ++--- .../okonomi/faktura/Fakturagrunnlag.java | 20 ++--- .../model/okonomi/faktura/Fakturalinje.java | 18 ++--- .../okonomi/faktura/Fakturamottaker.java | 18 ++--- .../okonomi/faktura/Fakturautsteder.java | 22 +++--- .../okonomi/kodeverk/Merverdiavgift.java | 16 ++-- .../fint/model/okonomi/kodeverk/Vare.java | 20 ++--- .../fint/model/okonomi/regnskap/Bilag.java | 16 ++-- .../model/okonomi/regnskap/Leverandor.java | 22 +++--- .../okonomi/regnskap/Leverandorgruppe.java | 18 ++--- .../model/okonomi/regnskap/Postering.java | 18 ++--- .../model/okonomi/regnskap/Transaksjon.java | 24 +++--- .../okonomi/faktura/FakturaResource.java | 8 +- .../okonomi/faktura/FakturaResources.java | 2 +- .../faktura/FakturagrunnlagResource.java | 8 +- .../faktura/FakturagrunnlagResources.java | 2 +- .../okonomi/faktura/FakturalinjeResource.java | 8 +- .../faktura/FakturalinjeResources.java | 2 +- .../faktura/FakturamottakerResource.java | 8 +- .../faktura/FakturamottakerResources.java | 2 +- .../faktura/FakturautstederResource.java | 8 +- .../faktura/FakturautstederResources.java | 2 +- .../kodeverk/MerverdiavgiftResource.java | 8 +- .../kodeverk/MerverdiavgiftResources.java | 2 +- .../okonomi/kodeverk/VareResource.java | 8 +- .../okonomi/kodeverk/VareResources.java | 2 +- .../okonomi/regnskap/LeverandorResource.java | 8 +- .../okonomi/regnskap/LeverandorResources.java | 2 +- .../regnskap/LeverandorgruppeResource.java | 8 +- .../regnskap/LeverandorgruppeResources.java | 2 +- .../okonomi/regnskap/PosteringResource.java | 8 +- .../okonomi/regnskap/PosteringResources.java | 2 +- .../okonomi/regnskap/TransaksjonResource.java | 8 +- .../regnskap/TransaksjonResources.java | 2 +- .../kodeverk/Behandlingsgrunnlag.java | 16 ++-- .../personvern/kodeverk/Personopplysning.java | 16 ++-- .../model/personvern/samtykke/Behandling.java | 24 +++--- .../model/personvern/samtykke/Samtykke.java | 22 +++--- .../model/personvern/samtykke/Tjeneste.java | 18 ++--- .../kodeverk/BehandlingsgrunnlagResource.java | 8 +- .../BehandlingsgrunnlagResources.java | 2 +- .../kodeverk/PersonopplysningResource.java | 8 +- .../kodeverk/PersonopplysningResources.java | 2 +- .../samtykke/BehandlingResource.java | 8 +- .../samtykke/BehandlingResources.java | 2 +- .../personvern/samtykke/SamtykkeResource.java | 8 +- .../samtykke/SamtykkeResources.java | 2 +- .../personvern/samtykke/TjenesteResource.java | 8 +- .../samtykke/TjenesteResources.java | 2 +- .../model/ressurs/eiendel/Applikasjon.java | 22 +++--- .../ressurs/eiendel/Applikasjonsressurs.java | 28 +++---- .../Applikasjonsressurstilgjengelighet.java | 20 ++--- .../kodeverk/Applikasjonskategori.java | 16 ++-- .../model/ressurs/kodeverk/Brukertype.java | 16 ++-- .../ressurs/kodeverk/Handhevingstype.java | 16 ++-- .../model/ressurs/kodeverk/Lisensmodell.java | 16 ++-- .../model/ressurs/kodeverk/Plattform.java | 16 ++-- .../fint/model/ressurs/tilgang/Identitet.java | 20 ++--- .../fint/model/ressurs/tilgang/Rettighet.java | 18 ++--- fint-ressurs-resource-model-java/build.gradle | 2 +- .../ressurs/eiendel/ApplikasjonResource.java | 8 +- .../ressurs/eiendel/ApplikasjonResources.java | 2 +- .../eiendel/ApplikasjonsressursResource.java | 8 +- .../eiendel/ApplikasjonsressursResources.java | 2 +- ...kasjonsressurstilgjengelighetResource.java | 8 +- ...asjonsressurstilgjengelighetResources.java | 2 +- .../ApplikasjonskategoriResource.java | 8 +- .../ApplikasjonskategoriResources.java | 2 +- .../ressurs/kodeverk/BrukertypeResource.java | 8 +- .../ressurs/kodeverk/BrukertypeResources.java | 2 +- .../kodeverk/HandhevingstypeResource.java | 8 +- .../kodeverk/HandhevingstypeResources.java | 2 +- .../kodeverk/LisensmodellResource.java | 8 +- .../kodeverk/LisensmodellResources.java | 2 +- .../ressurs/kodeverk/PlattformResource.java | 8 +- .../ressurs/kodeverk/PlattformResources.java | 2 +- .../ressurs/tilgang/IdentitetResource.java | 8 +- .../ressurs/tilgang/IdentitetResources.java | 2 +- .../ressurs/tilgang/RettighetResource.java | 8 +- .../ressurs/tilgang/RettighetResources.java | 2 +- .../model/utdanning/basisklasser/Gruppe.java | 22 +++--- .../basisklasser/Gruppemedlemskap.java | 16 ++-- .../basisklasser/Utdanningsforhold.java | 18 ++--- .../model/utdanning/elev/Basisgruppe.java | 32 ++++---- .../utdanning/elev/Basisgruppemedlemskap.java | 20 ++--- .../fint/model/utdanning/elev/Elev.java | 20 ++--- .../model/utdanning/elev/Elevforhold.java | 78 +++++++++---------- .../utdanning/elev/Elevtilrettelegging.java | 24 +++--- .../utdanning/elev/Kontaktlarergruppe.java | 30 +++---- .../elev/Kontaktlarergruppemedlemskap.java | 20 ++--- .../fint/model/utdanning/elev/Medlemskap.java | 26 +++---- .../model/utdanning/elev/Persongruppe.java | 30 +++---- .../elev/Persongruppemedlemskap.java | 20 ++--- .../model/utdanning/elev/Skoleressurs.java | 26 +++---- .../utdanning/elev/Undervisningsforhold.java | 32 ++++---- .../fint/model/utdanning/elev/Varsel.java | 24 +++--- .../utdanning/kodeverk/Avbruddsarsak.java | 16 ++-- .../utdanning/kodeverk/Betalingsstatus.java | 16 ++-- .../model/utdanning/kodeverk/Bevistype.java | 16 ++-- .../model/utdanning/kodeverk/Brevtype.java | 16 ++-- .../utdanning/kodeverk/Eksamensform.java | 16 ++-- .../utdanning/kodeverk/Elevkategori.java | 16 ++-- .../model/utdanning/kodeverk/Fagmerknad.java | 16 ++-- .../model/utdanning/kodeverk/Fagstatus.java | 16 ++-- .../model/utdanning/kodeverk/Fravarstype.java | 16 ++-- .../utdanning/kodeverk/Fullfortkode.java | 16 ++-- .../utdanning/kodeverk/Grepreferanse.java | 16 ++-- .../utdanning/kodeverk/Karakterskala.java | 20 ++--- .../utdanning/kodeverk/Karakterstatus.java | 16 ++-- .../model/utdanning/kodeverk/OtEnhet.java | 18 ++--- .../model/utdanning/kodeverk/OtStatus.java | 16 ++-- .../model/utdanning/kodeverk/Provestatus.java | 16 ++-- .../model/utdanning/kodeverk/Skolear.java | 16 ++-- .../utdanning/kodeverk/Skoleeiertype.java | 16 ++-- .../fint/model/utdanning/kodeverk/Termin.java | 16 ++-- .../utdanning/kodeverk/Tilrettelegging.java | 16 ++-- .../model/utdanning/kodeverk/Varseltype.java | 16 ++-- .../utdanning/kodeverk/Vigoreferanse.java | 16 ++-- .../utdanning/kodeverk/Vitnemalsmerknad.java | 16 ++-- .../model/utdanning/larling/AvlagtProve.java | 26 +++---- .../fint/model/utdanning/larling/Larling.java | 24 +++--- .../fint/model/utdanning/ot/OtUngdom.java | 24 +++--- .../model/utdanning/timeplan/Eksamen.java | 20 ++--- .../fint/model/utdanning/timeplan/Fag.java | 28 +++---- .../model/utdanning/timeplan/Faggruppe.java | 24 +++--- .../timeplan/Faggruppemedlemskap.java | 26 +++---- .../fint/model/utdanning/timeplan/Rom.java | 20 ++--- .../fint/model/utdanning/timeplan/Time.java | 22 +++--- .../timeplan/Undervisningsgruppe.java | 32 ++++---- .../Undervisningsgruppemedlemskap.java | 20 ++--- .../utdanning/utdanningsprogram/Arstrinn.java | 20 ++--- .../utdanningsprogram/Programomrade.java | 26 +++---- .../Programomrademedlemskap.java | 20 ++--- .../utdanning/utdanningsprogram/Skole.java | 42 +++++----- .../utdanningsprogram/Utdanningsprogram.java | 20 ++--- .../utdanning/vurdering/Anmerkninger.java | 18 ++--- .../utdanning/vurdering/Eksamensgruppe.java | 36 ++++----- .../vurdering/Eksamensgruppemedlemskap.java | 30 +++---- .../vurdering/Eksamensvurdering.java | 22 +++--- .../model/utdanning/vurdering/Elevfravar.java | 20 ++--- .../utdanning/vurdering/Elevvurdering.java | 34 ++++---- .../utdanning/vurdering/Fagvurdering.java | 24 +++--- .../model/utdanning/vurdering/Fravar.java | 26 +++---- .../utdanning/vurdering/Fravarsoversikt.java | 20 ++--- .../utdanning/vurdering/Fravarsprosent.java | 16 ++-- .../vurdering/Fravarsregistrering.java | 26 +++---- .../vurdering/Halvarsfagvurdering.java | 20 ++--- .../vurdering/Halvarsordensvurdering.java | 20 ++--- .../utdanning/vurdering/Karakterhistorie.java | 26 +++---- .../utdanning/vurdering/Karakterverdi.java | 18 ++--- .../utdanning/vurdering/Ordensvurdering.java | 22 +++--- .../model/utdanning/vurdering/Sensor.java | 20 ++--- .../vurdering/Sluttfagvurdering.java | 24 +++--- .../vurdering/Sluttordensvurdering.java | 20 ++--- .../vurdering/Underveisfagvurdering.java | 20 ++--- .../vurdering/Underveisordensvurdering.java | 20 ++--- .../model/utdanning/vurdering/Vurdering.java | 26 +++---- .../build.gradle | 2 +- .../basisklasser/GruppeResource.java | 8 +- .../basisklasser/GruppeResources.java | 2 +- .../GruppemedlemskapResource.java | 8 +- .../GruppemedlemskapResources.java | 2 +- .../UtdanningsforholdResource.java | 8 +- .../UtdanningsforholdResources.java | 2 +- .../utdanning/elev/BasisgruppeResource.java | 8 +- .../utdanning/elev/BasisgruppeResources.java | 2 +- .../elev/BasisgruppemedlemskapResource.java | 8 +- .../elev/BasisgruppemedlemskapResources.java | 2 +- .../resource/utdanning/elev/ElevResource.java | 8 +- .../utdanning/elev/ElevResources.java | 2 +- .../utdanning/elev/ElevforholdResource.java | 8 +- .../utdanning/elev/ElevforholdResources.java | 2 +- .../elev/ElevtilretteleggingResource.java | 8 +- .../elev/ElevtilretteleggingResources.java | 2 +- .../elev/KontaktlarergruppeResource.java | 8 +- .../elev/KontaktlarergruppeResources.java | 2 +- .../KontaktlarergruppemedlemskapResource.java | 8 +- ...KontaktlarergruppemedlemskapResources.java | 2 +- .../utdanning/elev/MedlemskapResource.java | 8 +- .../utdanning/elev/MedlemskapResources.java | 2 +- .../utdanning/elev/PersongruppeResource.java | 8 +- .../utdanning/elev/PersongruppeResources.java | 2 +- .../elev/PersongruppemedlemskapResource.java | 8 +- .../elev/PersongruppemedlemskapResources.java | 2 +- .../utdanning/elev/SkoleressursResource.java | 8 +- .../utdanning/elev/SkoleressursResources.java | 2 +- .../elev/UndervisningsforholdResource.java | 8 +- .../elev/UndervisningsforholdResources.java | 2 +- .../utdanning/elev/VarselResource.java | 8 +- .../utdanning/elev/VarselResources.java | 2 +- .../kodeverk/AvbruddsarsakResource.java | 8 +- .../kodeverk/AvbruddsarsakResources.java | 2 +- .../kodeverk/BetalingsstatusResource.java | 8 +- .../kodeverk/BetalingsstatusResources.java | 2 +- .../utdanning/kodeverk/BevistypeResource.java | 8 +- .../kodeverk/BevistypeResources.java | 2 +- .../utdanning/kodeverk/BrevtypeResource.java | 8 +- .../utdanning/kodeverk/BrevtypeResources.java | 2 +- .../kodeverk/EksamensformResource.java | 8 +- .../kodeverk/EksamensformResources.java | 2 +- .../kodeverk/ElevkategoriResource.java | 8 +- .../kodeverk/ElevkategoriResources.java | 2 +- .../kodeverk/FagmerknadResource.java | 8 +- .../kodeverk/FagmerknadResources.java | 2 +- .../utdanning/kodeverk/FagstatusResource.java | 8 +- .../kodeverk/FagstatusResources.java | 2 +- .../kodeverk/FravarstypeResource.java | 8 +- .../kodeverk/FravarstypeResources.java | 2 +- .../kodeverk/FullfortkodeResource.java | 8 +- .../kodeverk/FullfortkodeResources.java | 2 +- .../kodeverk/KarakterskalaResource.java | 8 +- .../kodeverk/KarakterskalaResources.java | 2 +- .../kodeverk/KarakterstatusResource.java | 8 +- .../kodeverk/KarakterstatusResources.java | 2 +- .../utdanning/kodeverk/OtEnhetResource.java | 8 +- .../utdanning/kodeverk/OtEnhetResources.java | 2 +- .../utdanning/kodeverk/OtStatusResource.java | 8 +- .../utdanning/kodeverk/OtStatusResources.java | 2 +- .../kodeverk/ProvestatusResource.java | 8 +- .../kodeverk/ProvestatusResources.java | 2 +- .../utdanning/kodeverk/SkolearResource.java | 8 +- .../utdanning/kodeverk/SkolearResources.java | 2 +- .../kodeverk/SkoleeiertypeResource.java | 8 +- .../kodeverk/SkoleeiertypeResources.java | 2 +- .../utdanning/kodeverk/TerminResource.java | 8 +- .../utdanning/kodeverk/TerminResources.java | 2 +- .../kodeverk/TilretteleggingResource.java | 8 +- .../kodeverk/TilretteleggingResources.java | 2 +- .../kodeverk/VarseltypeResource.java | 8 +- .../kodeverk/VarseltypeResources.java | 2 +- .../kodeverk/VitnemalsmerknadResource.java | 8 +- .../kodeverk/VitnemalsmerknadResources.java | 2 +- .../larling/AvlagtProveResource.java | 8 +- .../larling/AvlagtProveResources.java | 2 +- .../utdanning/larling/LarlingResource.java | 8 +- .../utdanning/larling/LarlingResources.java | 2 +- .../utdanning/ot/OtUngdomResource.java | 8 +- .../utdanning/ot/OtUngdomResources.java | 2 +- .../utdanning/timeplan/EksamenResource.java | 8 +- .../utdanning/timeplan/EksamenResources.java | 2 +- .../utdanning/timeplan/FagResource.java | 8 +- .../utdanning/timeplan/FagResources.java | 2 +- .../utdanning/timeplan/FaggruppeResource.java | 8 +- .../timeplan/FaggruppeResources.java | 2 +- .../timeplan/FaggruppemedlemskapResource.java | 8 +- .../FaggruppemedlemskapResources.java | 2 +- .../utdanning/timeplan/RomResource.java | 8 +- .../utdanning/timeplan/RomResources.java | 2 +- .../utdanning/timeplan/TimeResource.java | 8 +- .../utdanning/timeplan/TimeResources.java | 2 +- .../timeplan/UndervisningsgruppeResource.java | 8 +- .../UndervisningsgruppeResources.java | 2 +- ...UndervisningsgruppemedlemskapResource.java | 8 +- ...ndervisningsgruppemedlemskapResources.java | 2 +- .../utdanningsprogram/ArstrinnResource.java | 8 +- .../utdanningsprogram/ArstrinnResources.java | 2 +- .../ProgramomradeResource.java | 8 +- .../ProgramomradeResources.java | 2 +- .../ProgramomrademedlemskapResource.java | 8 +- .../ProgramomrademedlemskapResources.java | 2 +- .../utdanningsprogram/SkoleResource.java | 8 +- .../utdanningsprogram/SkoleResources.java | 2 +- .../UtdanningsprogramResource.java | 8 +- .../UtdanningsprogramResources.java | 2 +- .../vurdering/AnmerkningerResource.java | 8 +- .../vurdering/AnmerkningerResources.java | 2 +- .../vurdering/EksamensgruppeResource.java | 8 +- .../vurdering/EksamensgruppeResources.java | 2 +- .../EksamensgruppemedlemskapResource.java | 8 +- .../EksamensgruppemedlemskapResources.java | 2 +- .../vurdering/EksamensvurderingResource.java | 8 +- .../vurdering/EksamensvurderingResources.java | 2 +- .../vurdering/ElevfravarResource.java | 8 +- .../vurdering/ElevfravarResources.java | 2 +- .../vurdering/ElevvurderingResource.java | 8 +- .../vurdering/ElevvurderingResources.java | 2 +- .../vurdering/FagvurderingResource.java | 8 +- .../vurdering/FagvurderingResources.java | 2 +- .../utdanning/vurdering/FravarResource.java | 8 +- .../utdanning/vurdering/FravarResources.java | 2 +- .../vurdering/FravarsoversiktResource.java | 8 +- .../vurdering/FravarsoversiktResources.java | 2 +- .../FravarsregistreringResource.java | 8 +- .../FravarsregistreringResources.java | 2 +- .../HalvarsfagvurderingResource.java | 8 +- .../HalvarsfagvurderingResources.java | 2 +- .../HalvarsordensvurderingResource.java | 8 +- .../HalvarsordensvurderingResources.java | 2 +- .../vurdering/KarakterhistorieResource.java | 8 +- .../vurdering/KarakterhistorieResources.java | 2 +- .../vurdering/KarakterverdiResource.java | 8 +- .../vurdering/KarakterverdiResources.java | 2 +- .../vurdering/OrdensvurderingResource.java | 8 +- .../vurdering/OrdensvurderingResources.java | 2 +- .../utdanning/vurdering/SensorResource.java | 8 +- .../utdanning/vurdering/SensorResources.java | 2 +- .../vurdering/SluttfagvurderingResource.java | 8 +- .../vurdering/SluttfagvurderingResources.java | 2 +- .../SluttordensvurderingResource.java | 8 +- .../SluttordensvurderingResources.java | 2 +- .../UnderveisfagvurderingResource.java | 8 +- .../UnderveisfagvurderingResources.java | 2 +- .../UnderveisordensvurderingResource.java | 8 +- .../UnderveisordensvurderingResources.java | 2 +- .../vurdering/VurderingResource.java | 8 +- .../vurdering/VurderingResources.java | 2 +- .../test/model/ModelSerializationSpec.groovy | 2 +- gradle.properties | 9 ++- 583 files changed, 2999 insertions(+), 2999 deletions(-) diff --git a/build.gradle b/build.gradle index a8af2ba7..6210553a 100644 --- a/build.gradle +++ b/build.gradle @@ -39,10 +39,9 @@ subprojects { dependencies { annotationProcessor("org.projectlombok:lombok:${lombokVersion}") compileOnly("org.projectlombok:lombok:${lombokVersion}") - implementation("com.fasterxml.jackson.core:jackson-annotations:2.18.0") - implementation("com.fasterxml.jackson.core:jackson-core:2.18.0") + implementation("com.fasterxml.jackson.core:jackson-annotations:2.20") + implementation("com.fasterxml.jackson.core:jackson-core:2.20.0") implementation("javax.validation:validation-api:2.0.1.Final") - implementation("org.hibernate.validator:hibernate-validator:6.0.23.Final") } test { diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/Fullmakt.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/Fullmakt.java index a2603873..ccf6ad4b 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/Fullmakt.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/Fullmakt.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,23 +34,23 @@ public class Fullmakt implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - MYNDIGHET("myndighet", "no.fint.model.administrasjon.kodeverk.Kontodimensjon", NONE_TO_MANY), - RAMME("ramme", "no.fint.model.administrasjon.kodeverk.Ramme", NONE_TO_ONE), - FUNKSJON("funksjon", "no.fint.model.administrasjon.kodeverk.Funksjon", NONE_TO_ONE), - OBJEKT("objekt", "no.fint.model.administrasjon.kodeverk.Objekt", NONE_TO_ONE), - ORGANISASJONSELEMENT("organisasjonselement", "no.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_ONE), - ART("art", "no.fint.model.administrasjon.kodeverk.Art", NONE_TO_ONE), - ANLEGG("anlegg", "no.fint.model.administrasjon.kodeverk.Anlegg", NONE_TO_ONE), - DIVERSE("diverse", "no.fint.model.administrasjon.kodeverk.Diverse", NONE_TO_ONE), - AKTIVITET("aktivitet", "no.fint.model.administrasjon.kodeverk.Aktivitet", NONE_TO_ONE), - ANSVAR("ansvar", "no.fint.model.administrasjon.kodeverk.Ansvar", NONE_TO_ONE), - STEDFORTREDER("stedfortreder", "no.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), - KONTRAKT("kontrakt", "no.fint.model.administrasjon.kodeverk.Kontrakt", NONE_TO_ONE), - FULLMEKTIG("fullmektig", "no.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), - PROSJEKT("prosjekt", "no.fint.model.administrasjon.kodeverk.Prosjekt", NONE_TO_ONE), - FORMAL("formal", "no.fint.model.administrasjon.kodeverk.Formal", NONE_TO_ONE), - ROLLE("rolle", "no.fint.model.administrasjon.fullmakt.Rolle", ONE_TO_ONE), - LOPENUMMER("lopenummer", "no.fint.model.administrasjon.kodeverk.Lopenummer", NONE_TO_ONE); + MYNDIGHET("myndighet", "no.novari.fint.model.administrasjon.kodeverk.Kontodimensjon", NONE_TO_MANY), + RAMME("ramme", "no.novari.fint.model.administrasjon.kodeverk.Ramme", NONE_TO_ONE), + FUNKSJON("funksjon", "no.novari.fint.model.administrasjon.kodeverk.Funksjon", NONE_TO_ONE), + OBJEKT("objekt", "no.novari.fint.model.administrasjon.kodeverk.Objekt", NONE_TO_ONE), + ORGANISASJONSELEMENT("organisasjonselement", "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_ONE), + ART("art", "no.novari.fint.model.administrasjon.kodeverk.Art", NONE_TO_ONE), + ANLEGG("anlegg", "no.novari.fint.model.administrasjon.kodeverk.Anlegg", NONE_TO_ONE), + DIVERSE("diverse", "no.novari.fint.model.administrasjon.kodeverk.Diverse", NONE_TO_ONE), + AKTIVITET("aktivitet", "no.novari.fint.model.administrasjon.kodeverk.Aktivitet", NONE_TO_ONE), + ANSVAR("ansvar", "no.novari.fint.model.administrasjon.kodeverk.Ansvar", NONE_TO_ONE), + STEDFORTREDER("stedfortreder", "no.novari.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), + KONTRAKT("kontrakt", "no.novari.fint.model.administrasjon.kodeverk.Kontrakt", NONE_TO_ONE), + FULLMEKTIG("fullmektig", "no.novari.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), + PROSJEKT("prosjekt", "no.novari.fint.model.administrasjon.kodeverk.Prosjekt", NONE_TO_ONE), + FORMAL("formal", "no.novari.fint.model.administrasjon.kodeverk.Formal", NONE_TO_ONE), + ROLLE("rolle", "no.novari.fint.model.administrasjon.fullmakt.Rolle", ONE_TO_ONE), + LOPENUMMER("lopenummer", "no.novari.fint.model.administrasjon.kodeverk.Lopenummer", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/Rolle.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/Rolle.java index e6f90057..940dcdb9 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/Rolle.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/Rolle.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,7 +33,7 @@ public class Rolle implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - FULLMAKT("fullmakt", "no.fint.model.administrasjon.fullmakt.Fullmakt", ONE_TO_MANY); + FULLMAKT("fullmakt", "no.novari.fint.model.administrasjon.fullmakt.Fullmakt", ONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Aktivitet.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Aktivitet.java index fbfddb00..767a29dd 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Aktivitet.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Aktivitet.java @@ -11,15 +11,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; - -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; + +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Anlegg.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Anlegg.java index 79b8ce1b..1bf8b0f7 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Anlegg.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Anlegg.java @@ -11,15 +11,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; - -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; + +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Ansvar.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Ansvar.java index 62fd6a9e..2495abb2 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Ansvar.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Ansvar.java @@ -14,15 +14,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -31,9 +31,9 @@ public class Ansvar extends Kontodimensjon implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - OVERORDNET("overordnet", "no.fint.model.administrasjon.kodeverk.Ansvar", NONE_TO_ONE), - UNDERORDNET("underordnet", "no.fint.model.administrasjon.kodeverk.Ansvar", NONE_TO_MANY), - ORGANISASJONSELEMENT("organisasjonselement", "no.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_MANY); + OVERORDNET("overordnet", "no.novari.fint.model.administrasjon.kodeverk.Ansvar", NONE_TO_ONE), + UNDERORDNET("underordnet", "no.novari.fint.model.administrasjon.kodeverk.Ansvar", NONE_TO_MANY), + ORGANISASJONSELEMENT("organisasjonselement", "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Arbeidsforholdstype.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Arbeidsforholdstype.java index 3f70be2c..6467b8d0 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Arbeidsforholdstype.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Arbeidsforholdstype.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,7 +32,7 @@ public class Arbeidsforholdstype extends Begrep implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - FORELDER("forelder", "no.fint.model.administrasjon.kodeverk.Arbeidsforholdstype", NONE_TO_ONE); + FORELDER("forelder", "no.novari.fint.model.administrasjon.kodeverk.Arbeidsforholdstype", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Art.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Art.java index 48a902be..71c01a5a 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Art.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Art.java @@ -11,15 +11,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; - -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; + +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Diverse.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Diverse.java index 0c45f92c..4d91861a 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Diverse.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Diverse.java @@ -11,15 +11,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; - -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; + +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Formal.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Formal.java index d9d401a0..ce601873 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Formal.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Formal.java @@ -11,15 +11,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; - -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; + +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Fravarsgrunn.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Fravarsgrunn.java index 876e1a1f..4ea347ad 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Fravarsgrunn.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Fravarsgrunn.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Fravarstype.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Fravarstype.java index 61481d5c..b6f1c041 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Fravarstype.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Fravarstype.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,7 +32,7 @@ public class Fravarstype extends Begrep implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - LONNSART("lonnsart", "no.fint.model.administrasjon.kodeverk.Lonnsart", NONE_TO_ONE); + LONNSART("lonnsart", "no.novari.fint.model.administrasjon.kodeverk.Lonnsart", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Funksjon.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Funksjon.java index 195b3099..239d978b 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Funksjon.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Funksjon.java @@ -14,15 +14,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -31,8 +31,8 @@ public class Funksjon extends Kontodimensjon implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - OVERORDNET("overordnet", "no.fint.model.administrasjon.kodeverk.Funksjon", NONE_TO_ONE), - UNDERORDNET("underordnet", "no.fint.model.administrasjon.kodeverk.Funksjon", NONE_TO_MANY); + OVERORDNET("overordnet", "no.novari.fint.model.administrasjon.kodeverk.Funksjon", NONE_TO_ONE), + UNDERORDNET("underordnet", "no.novari.fint.model.administrasjon.kodeverk.Funksjon", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Kontodimensjon.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Kontodimensjon.java index d12fa261..8d7559f3 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Kontodimensjon.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Kontodimensjon.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintAbstractObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,7 +32,7 @@ public abstract class Kontodimensjon extends Begrep implements FintAbstractObject { @Getter public enum Relasjonsnavn implements FintRelation { - FULLMAKT("fullmakt", "no.fint.model.administrasjon.fullmakt.Fullmakt", NONE_TO_MANY); + FULLMAKT("fullmakt", "no.novari.fint.model.administrasjon.fullmakt.Fullmakt", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Kontrakt.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Kontrakt.java index ead0b5ab..f698882f 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Kontrakt.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Kontrakt.java @@ -11,15 +11,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; - -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; + +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Lonnsart.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Lonnsart.java index f92b11be..7795826a 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Lonnsart.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Lonnsart.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,7 +32,7 @@ public class Lonnsart extends Begrep implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ART("art", "no.fint.model.administrasjon.kodeverk.Art", NONE_TO_ONE); + ART("art", "no.novari.fint.model.administrasjon.kodeverk.Art", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Lopenummer.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Lopenummer.java index 69f8d339..7141412e 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Lopenummer.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Lopenummer.java @@ -11,15 +11,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; - -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; + +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Objekt.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Objekt.java index 115a36d2..7aee4ad4 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Objekt.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Objekt.java @@ -11,15 +11,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; - -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; + +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Personalressurskategori.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Personalressurskategori.java index 19008165..2fc58859 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Personalressurskategori.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Personalressurskategori.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Prosjekt.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Prosjekt.java index aaaddae6..1d49de4b 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Prosjekt.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Prosjekt.java @@ -14,15 +14,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -31,7 +31,7 @@ public class Prosjekt extends Kontodimensjon implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - PROSJEKTART("prosjektart", "no.fint.model.administrasjon.kodeverk.Prosjektart", NONE_TO_MANY); + PROSJEKTART("prosjektart", "no.novari.fint.model.administrasjon.kodeverk.Prosjektart", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Prosjektart.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Prosjektart.java index 2b674f7c..bafcdecc 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Prosjektart.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Prosjektart.java @@ -14,15 +14,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -31,9 +31,9 @@ public class Prosjektart extends Kontodimensjon implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - UNDERORDNET("underordnet", "no.fint.model.administrasjon.kodeverk.Prosjektart", NONE_TO_MANY), - PROSJEKT("prosjekt", "no.fint.model.administrasjon.kodeverk.Prosjekt", NONE_TO_ONE), - OVERORDNET("overordnet", "no.fint.model.administrasjon.kodeverk.Prosjektart", NONE_TO_ONE); + UNDERORDNET("underordnet", "no.novari.fint.model.administrasjon.kodeverk.Prosjektart", NONE_TO_MANY), + PROSJEKT("prosjekt", "no.novari.fint.model.administrasjon.kodeverk.Prosjekt", NONE_TO_ONE), + OVERORDNET("overordnet", "no.novari.fint.model.administrasjon.kodeverk.Prosjektart", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Ramme.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Ramme.java index 631f499d..dbd915a0 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Ramme.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Ramme.java @@ -11,15 +11,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; - -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; + +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Stillingskode.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Stillingskode.java index 97288bba..5d0f7b14 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Stillingskode.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Stillingskode.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,7 +32,7 @@ public class Stillingskode extends Begrep implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - FORELDER("forelder", "no.fint.model.administrasjon.kodeverk.Stillingskode", NONE_TO_ONE); + FORELDER("forelder", "no.novari.fint.model.administrasjon.kodeverk.Stillingskode", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Uketimetall.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Uketimetall.java index af819560..317e5dfe 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Uketimetall.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Uketimetall.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kompleksedatatyper/Kontostreng.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kompleksedatatyper/Kontostreng.java index f1b80305..9dd7e4e5 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kompleksedatatyper/Kontostreng.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kompleksedatatyper/Kontostreng.java @@ -12,15 +12,15 @@ import java.util.ArrayList; import java.util.List; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -29,19 +29,19 @@ public class Kontostreng implements FintComplexDatatypeObject { @Getter public enum Relasjonsnavn implements FintRelation { - AKTIVITET("aktivitet", "no.fint.model.administrasjon.kodeverk.Aktivitet", NONE_TO_ONE), - ANLEGG("anlegg", "no.fint.model.administrasjon.kodeverk.Anlegg", NONE_TO_ONE), - ANSVAR("ansvar", "no.fint.model.administrasjon.kodeverk.Ansvar", ONE_TO_ONE), - ART("art", "no.fint.model.administrasjon.kodeverk.Art", ONE_TO_ONE), - DIVERSE("diverse", "no.fint.model.administrasjon.kodeverk.Diverse", NONE_TO_ONE), - FORMAL("formal", "no.fint.model.administrasjon.kodeverk.Formal", NONE_TO_ONE), - FUNKSJON("funksjon", "no.fint.model.administrasjon.kodeverk.Funksjon", ONE_TO_ONE), - KONTRAKT("kontrakt", "no.fint.model.administrasjon.kodeverk.Kontrakt", NONE_TO_ONE), - LOPENUMMER("lopenummer", "no.fint.model.administrasjon.kodeverk.Lopenummer", NONE_TO_ONE), - OBJEKT("objekt", "no.fint.model.administrasjon.kodeverk.Objekt", NONE_TO_ONE), - PROSJEKT("prosjekt", "no.fint.model.administrasjon.kodeverk.Prosjekt", NONE_TO_ONE), - PROSJEKTART("prosjektart", "no.fint.model.administrasjon.kodeverk.Prosjektart", NONE_TO_ONE), - RAMME("ramme", "no.fint.model.administrasjon.kodeverk.Ramme", NONE_TO_ONE); + AKTIVITET("aktivitet", "no.novari.fint.model.administrasjon.kodeverk.Aktivitet", NONE_TO_ONE), + ANLEGG("anlegg", "no.novari.fint.model.administrasjon.kodeverk.Anlegg", NONE_TO_ONE), + ANSVAR("ansvar", "no.novari.fint.model.administrasjon.kodeverk.Ansvar", ONE_TO_ONE), + ART("art", "no.novari.fint.model.administrasjon.kodeverk.Art", ONE_TO_ONE), + DIVERSE("diverse", "no.novari.fint.model.administrasjon.kodeverk.Diverse", NONE_TO_ONE), + FORMAL("formal", "no.novari.fint.model.administrasjon.kodeverk.Formal", NONE_TO_ONE), + FUNKSJON("funksjon", "no.novari.fint.model.administrasjon.kodeverk.Funksjon", ONE_TO_ONE), + KONTRAKT("kontrakt", "no.novari.fint.model.administrasjon.kodeverk.Kontrakt", NONE_TO_ONE), + LOPENUMMER("lopenummer", "no.novari.fint.model.administrasjon.kodeverk.Lopenummer", NONE_TO_ONE), + OBJEKT("objekt", "no.novari.fint.model.administrasjon.kodeverk.Objekt", NONE_TO_ONE), + PROSJEKT("prosjekt", "no.novari.fint.model.administrasjon.kodeverk.Prosjekt", NONE_TO_ONE), + PROSJEKTART("prosjektart", "no.novari.fint.model.administrasjon.kodeverk.Prosjektart", NONE_TO_ONE), + RAMME("ramme", "no.novari.fint.model.administrasjon.kodeverk.Ramme", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/Arbeidslokasjon.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/Arbeidslokasjon.java index 03837f58..a866741f 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/Arbeidslokasjon.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/Arbeidslokasjon.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Enhet; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,7 +34,7 @@ public class Arbeidslokasjon extends Enhet implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ARBEIDSFORHOLD("arbeidsforhold", "no.fint.model.administrasjon.personal.Arbeidsforhold", NONE_TO_MANY); + ARBEIDSFORHOLD("arbeidsforhold", "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/Organisasjonselement.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/Organisasjonselement.java index 34593ef3..810a5f44 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/Organisasjonselement.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/Organisasjonselement.java @@ -15,18 +15,18 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Periode; import no.novari.fint.model.felles.basisklasser.Enhet; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -35,12 +35,12 @@ public class Organisasjonselement extends Enhet implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ANSVAR("ansvar", "no.fint.model.administrasjon.kodeverk.Ansvar", NONE_TO_MANY), - LEDER("leder", "no.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), - OVERORDNET("overordnet", "no.fint.model.administrasjon.organisasjon.Organisasjonselement", ONE_TO_ONE), - UNDERORDNET("underordnet", "no.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_MANY), - SKOLE("skole", "no.fint.model.utdanning.utdanningsprogram.Skole", NONE_TO_ONE), - ARBEIDSFORHOLD("arbeidsforhold", "no.fint.model.administrasjon.personal.Arbeidsforhold", NONE_TO_MANY); + ANSVAR("ansvar", "no.novari.fint.model.administrasjon.kodeverk.Ansvar", NONE_TO_MANY), + LEDER("leder", "no.novari.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), + OVERORDNET("overordnet", "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", ONE_TO_ONE), + UNDERORDNET("underordnet", "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_MANY), + SKOLE("skole", "no.novari.fint.model.utdanning.utdanningsprogram.Skole", NONE_TO_ONE), + ARBEIDSFORHOLD("arbeidsforhold", "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Arbeidsforhold.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Arbeidsforhold.java index 0787a5e8..c8ecb9d0 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Arbeidsforhold.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Arbeidsforhold.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,31 +34,31 @@ public class Arbeidsforhold implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - AKTIVITET("aktivitet", "no.fint.model.administrasjon.kodeverk.Aktivitet", NONE_TO_ONE), - ANLEGG("anlegg", "no.fint.model.administrasjon.kodeverk.Anlegg", NONE_TO_ONE), - ANSVAR("ansvar", "no.fint.model.administrasjon.kodeverk.Ansvar", NONE_TO_ONE), - ARBEIDSFORHOLDSTYPE("arbeidsforholdstype", "no.fint.model.administrasjon.kodeverk.Arbeidsforholdstype", NONE_TO_ONE), - ART("art", "no.fint.model.administrasjon.kodeverk.Art", NONE_TO_ONE), - DIVERSE("diverse", "no.fint.model.administrasjon.kodeverk.Diverse", NONE_TO_ONE), - FORMAL("formal", "no.fint.model.administrasjon.kodeverk.Formal", NONE_TO_ONE), - FUNKSJON("funksjon", "no.fint.model.administrasjon.kodeverk.Funksjon", NONE_TO_ONE), - KONTRAKT("kontrakt", "no.fint.model.administrasjon.kodeverk.Kontrakt", NONE_TO_ONE), - LOPENUMMER("lopenummer", "no.fint.model.administrasjon.kodeverk.Lopenummer", NONE_TO_ONE), - OBJEKT("objekt", "no.fint.model.administrasjon.kodeverk.Objekt", NONE_TO_ONE), - PROSJEKT("prosjekt", "no.fint.model.administrasjon.kodeverk.Prosjekt", NONE_TO_ONE), - RAMME("ramme", "no.fint.model.administrasjon.kodeverk.Ramme", NONE_TO_ONE), - STILLINGSKODE("stillingskode", "no.fint.model.administrasjon.kodeverk.Stillingskode", NONE_TO_ONE), - TIMERPERUKE("timerPerUke", "no.fint.model.administrasjon.kodeverk.Uketimetall", NONE_TO_ONE), - ARBEIDSLOKASJON("arbeidslokasjon", "no.fint.model.administrasjon.organisasjon.Arbeidslokasjon", NONE_TO_ONE), - ARBEIDSSTED("arbeidssted", "no.fint.model.administrasjon.organisasjon.Organisasjonselement", ONE_TO_ONE), - PERSONALLEDER("personalleder", "no.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), - FASTLONN("fastlonn", "no.fint.model.administrasjon.personal.Fastlonn", NONE_TO_MANY), - FASTTILLEGG("fasttillegg", "no.fint.model.administrasjon.personal.Fasttillegg", NONE_TO_MANY), - FRAVAR("fravar", "no.fint.model.administrasjon.personal.Fravar", NONE_TO_MANY), - LONN("lonn", "no.fint.model.administrasjon.personal.Lonn", NONE_TO_MANY), - VARIABELLONN("variabellonn", "no.fint.model.administrasjon.personal.Variabellonn", NONE_TO_MANY), - PERSONALRESSURS("personalressurs", "no.fint.model.administrasjon.personal.Personalressurs", ONE_TO_ONE), - UNDERVISNINGSFORHOLD("undervisningsforhold", "no.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_ONE); + AKTIVITET("aktivitet", "no.novari.fint.model.administrasjon.kodeverk.Aktivitet", NONE_TO_ONE), + ANLEGG("anlegg", "no.novari.fint.model.administrasjon.kodeverk.Anlegg", NONE_TO_ONE), + ANSVAR("ansvar", "no.novari.fint.model.administrasjon.kodeverk.Ansvar", NONE_TO_ONE), + ARBEIDSFORHOLDSTYPE("arbeidsforholdstype", "no.novari.fint.model.administrasjon.kodeverk.Arbeidsforholdstype", NONE_TO_ONE), + ART("art", "no.novari.fint.model.administrasjon.kodeverk.Art", NONE_TO_ONE), + DIVERSE("diverse", "no.novari.fint.model.administrasjon.kodeverk.Diverse", NONE_TO_ONE), + FORMAL("formal", "no.novari.fint.model.administrasjon.kodeverk.Formal", NONE_TO_ONE), + FUNKSJON("funksjon", "no.novari.fint.model.administrasjon.kodeverk.Funksjon", NONE_TO_ONE), + KONTRAKT("kontrakt", "no.novari.fint.model.administrasjon.kodeverk.Kontrakt", NONE_TO_ONE), + LOPENUMMER("lopenummer", "no.novari.fint.model.administrasjon.kodeverk.Lopenummer", NONE_TO_ONE), + OBJEKT("objekt", "no.novari.fint.model.administrasjon.kodeverk.Objekt", NONE_TO_ONE), + PROSJEKT("prosjekt", "no.novari.fint.model.administrasjon.kodeverk.Prosjekt", NONE_TO_ONE), + RAMME("ramme", "no.novari.fint.model.administrasjon.kodeverk.Ramme", NONE_TO_ONE), + STILLINGSKODE("stillingskode", "no.novari.fint.model.administrasjon.kodeverk.Stillingskode", NONE_TO_ONE), + TIMERPERUKE("timerPerUke", "no.novari.fint.model.administrasjon.kodeverk.Uketimetall", NONE_TO_ONE), + ARBEIDSLOKASJON("arbeidslokasjon", "no.novari.fint.model.administrasjon.organisasjon.Arbeidslokasjon", NONE_TO_ONE), + ARBEIDSSTED("arbeidssted", "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", ONE_TO_ONE), + PERSONALLEDER("personalleder", "no.novari.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), + FASTLONN("fastlonn", "no.novari.fint.model.administrasjon.personal.Fastlonn", NONE_TO_MANY), + FASTTILLEGG("fasttillegg", "no.novari.fint.model.administrasjon.personal.Fasttillegg", NONE_TO_MANY), + FRAVAR("fravar", "no.novari.fint.model.administrasjon.personal.Fravar", NONE_TO_MANY), + LONN("lonn", "no.novari.fint.model.administrasjon.personal.Lonn", NONE_TO_MANY), + VARIABELLONN("variabellonn", "no.novari.fint.model.administrasjon.personal.Variabellonn", NONE_TO_MANY), + PERSONALRESSURS("personalressurs", "no.novari.fint.model.administrasjon.personal.Personalressurs", ONE_TO_ONE), + UNDERVISNINGSFORHOLD("undervisningsforhold", "no.novari.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fastlonn.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fastlonn.java index b863bd3f..62ad0959 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fastlonn.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fastlonn.java @@ -14,15 +14,15 @@ import java.util.Map; import java.util.HashMap; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -31,8 +31,8 @@ public class Fastlonn extends Lonn implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - LONNSART("lonnsart", "no.fint.model.administrasjon.kodeverk.Lonnsart", NONE_TO_ONE), - ARBEIDSFORHOLD("arbeidsforhold", "no.fint.model.administrasjon.personal.Arbeidsforhold", ONE_TO_ONE); + LONNSART("lonnsart", "no.novari.fint.model.administrasjon.kodeverk.Lonnsart", NONE_TO_ONE), + ARBEIDSFORHOLD("arbeidsforhold", "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fasttillegg.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fasttillegg.java index 782b8c04..033140d9 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fasttillegg.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fasttillegg.java @@ -14,15 +14,15 @@ import java.util.Map; import java.util.HashMap; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -31,8 +31,8 @@ public class Fasttillegg extends Lonn implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - LONNSART("lonnsart", "no.fint.model.administrasjon.kodeverk.Lonnsart", ONE_TO_ONE), - ARBEIDSFORHOLD("arbeidsforhold", "no.fint.model.administrasjon.personal.Arbeidsforhold", ONE_TO_ONE); + LONNSART("lonnsart", "no.novari.fint.model.administrasjon.kodeverk.Lonnsart", ONE_TO_ONE), + ARBEIDSFORHOLD("arbeidsforhold", "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fravar.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fravar.java index 89e80b26..9443e100 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fravar.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Fravar.java @@ -15,19 +15,19 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -36,12 +36,12 @@ public class Fravar implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - FRAVARSGRUNN("fravarsgrunn", "no.fint.model.administrasjon.kodeverk.Fravarsgrunn", NONE_TO_ONE), - FRAVARSTYPE("fravarstype", "no.fint.model.administrasjon.kodeverk.Fravarstype", ONE_TO_ONE), - ARBEIDSFORHOLD("arbeidsforhold", "no.fint.model.administrasjon.personal.Arbeidsforhold", ONE_TO_MANY), - FORTSETTELSE("fortsettelse", "no.fint.model.administrasjon.personal.Fravar", NONE_TO_ONE), - GODKJENNER("godkjenner", "no.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), - FORTSETTER("fortsetter", "no.fint.model.administrasjon.personal.Fravar", NONE_TO_ONE); + FRAVARSGRUNN("fravarsgrunn", "no.novari.fint.model.administrasjon.kodeverk.Fravarsgrunn", NONE_TO_ONE), + FRAVARSTYPE("fravarstype", "no.novari.fint.model.administrasjon.kodeverk.Fravarstype", ONE_TO_ONE), + ARBEIDSFORHOLD("arbeidsforhold", "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", ONE_TO_MANY), + FORTSETTELSE("fortsettelse", "no.novari.fint.model.administrasjon.personal.Fravar", NONE_TO_ONE), + GODKJENNER("godkjenner", "no.novari.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), + FORTSETTER("fortsetter", "no.novari.fint.model.administrasjon.personal.Fravar", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Lonn.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Lonn.java index 8df55334..e3aff93f 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Lonn.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Lonn.java @@ -15,20 +15,20 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintAbstractObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; import no.novari.fint.model.administrasjon.kompleksedatatyper.Kontostreng; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -37,9 +37,9 @@ public abstract class Lonn implements FintAbstractObject { @Getter public enum Relasjonsnavn implements FintRelation { - ANVISER("anviser", "no.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), - KONTERER("konterer", "no.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), - ATTESTANT("attestant", "no.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE); + ANVISER("anviser", "no.novari.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), + KONTERER("konterer", "no.novari.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), + ATTESTANT("attestant", "no.novari.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Personalressurs.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Personalressurs.java index b3bd6f33..c74474a6 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Personalressurs.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Personalressurs.java @@ -15,19 +15,19 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Periode; import java.util.Date; import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -36,14 +36,14 @@ public class Personalressurs implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - PERSONALRESSURSKATEGORI("personalressurskategori", "no.fint.model.administrasjon.kodeverk.Personalressurskategori", ONE_TO_ONE), - ARBEIDSFORHOLD("arbeidsforhold", "no.fint.model.administrasjon.personal.Arbeidsforhold", NONE_TO_MANY), - PERSON("person", "no.fint.model.felles.Person", ONE_TO_ONE), - STEDFORTREDER("stedfortreder", "no.fint.model.administrasjon.fullmakt.Fullmakt", NONE_TO_MANY), - FULLMAKT("fullmakt", "no.fint.model.administrasjon.fullmakt.Fullmakt", NONE_TO_MANY), - LEDER("leder", "no.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_MANY), - PERSONALANSVAR("personalansvar", "no.fint.model.administrasjon.personal.Arbeidsforhold", NONE_TO_MANY), - SKOLERESSURS("skoleressurs", "no.fint.model.utdanning.elev.Skoleressurs", NONE_TO_ONE); + PERSONALRESSURSKATEGORI("personalressurskategori", "no.novari.fint.model.administrasjon.kodeverk.Personalressurskategori", ONE_TO_ONE), + ARBEIDSFORHOLD("arbeidsforhold", "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", NONE_TO_MANY), + PERSON("person", "no.novari.fint.model.felles.Person", ONE_TO_ONE), + STEDFORTREDER("stedfortreder", "no.novari.fint.model.administrasjon.fullmakt.Fullmakt", NONE_TO_MANY), + FULLMAKT("fullmakt", "no.novari.fint.model.administrasjon.fullmakt.Fullmakt", NONE_TO_MANY), + LEDER("leder", "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_MANY), + PERSONALANSVAR("personalansvar", "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", NONE_TO_MANY), + SKOLERESSURS("skoleressurs", "no.novari.fint.model.utdanning.elev.Skoleressurs", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Variabellonn.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Variabellonn.java index efbc4ced..98548f29 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Variabellonn.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/Variabellonn.java @@ -14,15 +14,15 @@ import java.util.Map; import java.util.HashMap; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -31,8 +31,8 @@ public class Variabellonn extends Lonn implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - LONNSART("lonnsart", "no.fint.model.administrasjon.kodeverk.Lonnsart", ONE_TO_ONE), - ARBEIDSFORHOLD("arbeidsforhold", "no.fint.model.administrasjon.personal.Arbeidsforhold", ONE_TO_ONE); + LONNSART("lonnsart", "no.novari.fint.model.administrasjon.kodeverk.Lonnsart", ONE_TO_ONE), + ARBEIDSFORHOLD("arbeidsforhold", "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-administrasjon-resource-model-java/build.gradle b/fint-administrasjon-resource-model-java/build.gradle index ee6e3d68..c33bd292 100644 --- a/fint-administrasjon-resource-model-java/build.gradle +++ b/fint-administrasjon-resource-model-java/build.gradle @@ -7,7 +7,7 @@ dependencies { testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") testImplementation("org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE") - testImplementation("org.springframework.hateoas:spring-hateoas:0.25.1.RELEASE") + testImplementation("org.springframework.hateoas:spring-hateoas:${springHateoasVersion}") testImplementation("org.apache.groovy:groovy:4.0.26") testImplementation("org.apache.groovy:groovy-json:4.0.26") diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/FullmaktResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/FullmaktResource.java index 3a3ba4b2..ec4b9a91 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/FullmaktResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/FullmaktResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/FullmaktResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/FullmaktResources.java index 4f02ae6a..273e0be7 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/FullmaktResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/FullmaktResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FullmaktResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/RolleResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/RolleResource.java index 008fe96f..f286d98b 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/RolleResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/RolleResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/RolleResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/RolleResources.java index 933a8b16..ee10d50e 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/RolleResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/fullmakt/RolleResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class RolleResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AktivitetResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AktivitetResource.java index d9841912..6a27f66c 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AktivitetResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AktivitetResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AktivitetResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AktivitetResources.java index 4bde99ba..4180e6b1 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AktivitetResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AktivitetResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AktivitetResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnleggResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnleggResource.java index 6615b78c..d8f9c263 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnleggResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnleggResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnleggResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnleggResources.java index 4b4fd1ef..219d437f 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnleggResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnleggResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AnleggResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnsvarResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnsvarResource.java index 91496523..4cee66a1 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnsvarResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnsvarResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnsvarResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnsvarResources.java index 67043469..0fd152a8 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnsvarResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/AnsvarResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AnsvarResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResource.java index 1595ad1b..e9654fe2 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResources.java index 1a2012e4..36f3d2c0 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArbeidsforholdstypeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ArbeidsforholdstypeResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArtResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArtResource.java index f403cced..ceb95822 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArtResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArtResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArtResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArtResources.java index f74bd793..54c91b04 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArtResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ArtResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ArtResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/DiverseResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/DiverseResource.java index 82833bbc..a592d633 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/DiverseResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/DiverseResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/DiverseResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/DiverseResources.java index 8ea910c2..9c996f46 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/DiverseResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/DiverseResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class DiverseResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FormalResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FormalResource.java index 88e413d4..a8752e8a 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FormalResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FormalResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FormalResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FormalResources.java index 535a69fe..4ec0245b 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FormalResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FormalResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FormalResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResource.java index 3662d2a0..c368daa5 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResources.java index ecbf7dae..08fd0e3c 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarsgrunnResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FravarsgrunnResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarstypeResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarstypeResource.java index a0fedfd0..6cfc5685 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarstypeResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarstypeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarstypeResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarstypeResources.java index ae57df37..9efd1240 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarstypeResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FravarstypeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FravarstypeResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FunksjonResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FunksjonResource.java index d3f3954e..292372f5 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FunksjonResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FunksjonResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FunksjonResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FunksjonResources.java index 60eb08d6..cde5220e 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FunksjonResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/FunksjonResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FunksjonResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontodimensjonResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontodimensjonResource.java index 4d30c308..7140c9cd 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontodimensjonResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontodimensjonResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintAbstractObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontodimensjonResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontodimensjonResources.java index 1c56638e..f409e00d 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontodimensjonResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontodimensjonResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KontodimensjonResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontraktResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontraktResource.java index 046b63ae..1fe8dfbc 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontraktResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontraktResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontraktResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontraktResources.java index 4b948844..b901d570 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontraktResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/KontraktResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KontraktResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LonnsartResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LonnsartResource.java index 31d32502..7407d0d3 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LonnsartResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LonnsartResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LonnsartResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LonnsartResources.java index fb0f5925..a6416713 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LonnsartResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LonnsartResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class LonnsartResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LopenummerResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LopenummerResource.java index 9f3371b7..6390a165 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LopenummerResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LopenummerResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LopenummerResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LopenummerResources.java index 34e211df..3ede8ac1 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LopenummerResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/LopenummerResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class LopenummerResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ObjektResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ObjektResource.java index a0ae5251..9a708990 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ObjektResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ObjektResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ObjektResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ObjektResources.java index 53a9193d..ae82158f 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ObjektResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ObjektResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ObjektResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResource.java index 3024eb9d..fdf247e5 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResources.java index 7fa5bce2..3b3e9818 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/PersonalressurskategoriResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PersonalressurskategoriResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektResource.java index 71edd27b..86d66a47 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektResources.java index 94b266e6..45a3d51a 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ProsjektResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektartResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektartResource.java index 24148905..523e0664 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektartResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektartResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektartResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektartResources.java index 787d2ed8..652acf12 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektartResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/ProsjektartResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ProsjektartResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/RammeResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/RammeResource.java index 91469473..af82f5fd 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/RammeResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/RammeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/RammeResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/RammeResources.java index bb4e55ae..bf3c5cab 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/RammeResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/RammeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class RammeResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/StillingskodeResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/StillingskodeResource.java index bc99291b..8bd0c1cb 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/StillingskodeResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/StillingskodeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/StillingskodeResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/StillingskodeResources.java index f7422e9f..6e594b99 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/StillingskodeResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/StillingskodeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class StillingskodeResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/UketimetallResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/UketimetallResource.java index 2a3b313c..c6201268 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/UketimetallResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/UketimetallResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/UketimetallResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/UketimetallResources.java index bcc39cb2..a845f921 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/UketimetallResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/UketimetallResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class UketimetallResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResource.java index 5d659d16..2eef6f97 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResource.java @@ -12,10 +12,10 @@ import java.util.List; import java.util.Map; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResources.java index 053c3eb8..d945ef00 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kompleksedatatyper/KontostrengResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KontostrengResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResource.java index 960c7e22..27fc905f 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.felles.basisklasser.EnhetResource; @Data diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResources.java index e134d003..e346ed5b 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/ArbeidslokasjonResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ArbeidslokasjonResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResource.java index ad14b3f2..b3919147 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; import no.novari.fint.model.resource.felles.basisklasser.EnhetResource; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResources.java index 4c195eaa..ae73f6c7 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/organisasjon/OrganisasjonselementResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class OrganisasjonselementResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/ArbeidsforholdResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/ArbeidsforholdResource.java index 8f167633..6daaa135 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/ArbeidsforholdResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/ArbeidsforholdResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/ArbeidsforholdResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/ArbeidsforholdResources.java index 650b4094..6bb9ef4c 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/ArbeidsforholdResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/ArbeidsforholdResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ArbeidsforholdResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FastlonnResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FastlonnResource.java index 3396362c..2e0f3d4b 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FastlonnResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FastlonnResource.java @@ -14,10 +14,10 @@ import java.util.HashMap; import javax.validation.constraints.*; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FastlonnResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FastlonnResources.java index 99f543f7..d2eed4a5 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FastlonnResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FastlonnResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FastlonnResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FasttilleggResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FasttilleggResource.java index e44003f0..1df558e4 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FasttilleggResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FasttilleggResource.java @@ -14,10 +14,10 @@ import java.util.HashMap; import javax.validation.constraints.*; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FasttilleggResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FasttilleggResources.java index 5f2ebe13..0eb460fc 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FasttilleggResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FasttilleggResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FasttilleggResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FravarResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FravarResource.java index ce5c5b5a..ad0d8b82 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FravarResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FravarResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import java.util.Date; import no.novari.fint.model.felles.kompleksedatatyper.Periode; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FravarResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FravarResources.java index 973992fd..35e607cd 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FravarResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/FravarResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FravarResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/LonnResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/LonnResource.java index 9e6264f1..83608a51 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/LonnResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/LonnResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintAbstractObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import java.util.Date; import no.novari.fint.model.resource.administrasjon.kompleksedatatyper.KontostrengResource; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/LonnResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/LonnResources.java index 67e77cd7..f52512d4 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/LonnResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/LonnResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class LonnResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/PersonalressursResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/PersonalressursResource.java index 40a02873..2d44765c 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/PersonalressursResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/PersonalressursResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; import java.util.Date; import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/PersonalressursResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/PersonalressursResources.java index 0834373f..bd757b7e 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/PersonalressursResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/PersonalressursResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PersonalressursResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/VariabellonnResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/VariabellonnResource.java index a2df9f69..44ff0833 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/VariabellonnResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/VariabellonnResource.java @@ -14,10 +14,10 @@ import java.util.HashMap; import javax.validation.constraints.*; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/VariabellonnResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/VariabellonnResources.java index 4a27c03e..3ddec865 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/VariabellonnResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/personal/VariabellonnResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class VariabellonnResources extends AbstractCollectionResources { diff --git a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy index 6f349ee3..c95c3e49 100644 --- a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy +++ b/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy @@ -8,7 +8,7 @@ import no.novari.fint.model.administrasjon.kompleksedatatyper.Kontostreng import no.novari.fint.model.administrasjon.personal.Fastlonn import no.novari.fint.model.felles.kompleksedatatyper.Identifikator import no.novari.fint.model.felles.kompleksedatatyper.Periode -import no.fint.model.resource.Link +import no.novari.fint.model.resource.Link import no.novari.fint.model.resource.administrasjon.kompleksedatatyper.KontostrengResource import no.novari.fint.model.resource.administrasjon.personal.FastlonnResource import spock.lang.Specification diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/DokumentStatus.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/DokumentStatus.java index 918870dd..a9541c5a 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/DokumentStatus.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/DokumentStatus.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/DokumentType.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/DokumentType.java index 842bf4fe..880a48c9 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/DokumentType.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/DokumentType.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Format.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Format.java index 888531a7..b765f8ab 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Format.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Format.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/JournalStatus.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/JournalStatus.java index 3eb23a6d..d8199545 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/JournalStatus.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/JournalStatus.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/JournalpostType.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/JournalpostType.java index a929b852..74f808a1 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/JournalpostType.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/JournalpostType.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Klassifikasjonstype.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Klassifikasjonstype.java index 398ab777..3839f3dd 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Klassifikasjonstype.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Klassifikasjonstype.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/KorrespondansepartType.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/KorrespondansepartType.java index ffd39bff..711151b6 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/KorrespondansepartType.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/KorrespondansepartType.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Merknadstype.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Merknadstype.java index 04e3520b..07702ed9 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Merknadstype.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Merknadstype.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/PartRolle.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/PartRolle.java index facf8ded..817d62cd 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/PartRolle.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/PartRolle.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Rolle.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Rolle.java index 92e0cf78..492a6bd3 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Rolle.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Rolle.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Saksmappetype.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Saksmappetype.java index ef36df0c..ad47383b 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Saksmappetype.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Saksmappetype.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Saksstatus.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Saksstatus.java index 9aedb49f..794aa4fc 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Saksstatus.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Saksstatus.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Skjermingshjemmel.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Skjermingshjemmel.java index e58282f8..0fbb032e 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Skjermingshjemmel.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Skjermingshjemmel.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Tilgangsgruppe.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Tilgangsgruppe.java index 72a84b57..2e223ccf 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Tilgangsgruppe.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Tilgangsgruppe.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Tilgangsrestriksjon.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Tilgangsrestriksjon.java index faa96aa0..f1f76d04 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Tilgangsrestriksjon.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Tilgangsrestriksjon.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/TilknyttetRegistreringSom.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/TilknyttetRegistreringSom.java index f9393424..ce75092c 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/TilknyttetRegistreringSom.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/TilknyttetRegistreringSom.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Variantformat.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Variantformat.java index e80569c0..1f28faf5 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Variantformat.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/Variantformat.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminne.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminne.java index d1b7424d..da498c21 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminne.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminne.java @@ -12,18 +12,18 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Matrikkelnummer; import no.novari.fint.model.arkiv.noark.Saksmappe; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/TilskuddFartoy.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/TilskuddFartoy.java index 763607e2..3631d7f3 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/TilskuddFartoy.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/TilskuddFartoy.java @@ -12,17 +12,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.arkiv.noark.Saksmappe; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEie.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEie.java index 94e50d83..e12a5a55 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEie.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEie.java @@ -12,18 +12,18 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Matrikkelnummer; import no.novari.fint.model.arkiv.noark.Saksmappe; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/AdministrativEnhet.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/AdministrativEnhet.java index 992a00d5..4f27a4be 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/AdministrativEnhet.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/AdministrativEnhet.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,7 +34,7 @@ public class AdministrativEnhet implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ORGANISASJONSELEMENT("organisasjonselement", "no.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_ONE); + ORGANISASJONSELEMENT("organisasjonselement", "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Arkivdel.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Arkivdel.java index 3406d8e0..742d4ab0 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Arkivdel.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Arkivdel.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,9 +33,9 @@ public class Arkivdel implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - KLASSIFIKASJONSSYSTEM("klassifikasjonssystem", "no.fint.model.arkiv.noark.Klassifikasjonssystem", NONE_TO_MANY), - REGISTRERING("registrering", "no.fint.model.arkiv.noark.Registrering", NONE_TO_MANY), - MAPPE("mappe", "no.fint.model.arkiv.noark.Mappe", NONE_TO_MANY); + KLASSIFIKASJONSSYSTEM("klassifikasjonssystem", "no.novari.fint.model.arkiv.noark.Klassifikasjonssystem", NONE_TO_MANY), + REGISTRERING("registrering", "no.novari.fint.model.arkiv.noark.Registrering", NONE_TO_MANY), + MAPPE("mappe", "no.novari.fint.model.arkiv.noark.Mappe", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Arkivressurs.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Arkivressurs.java index 24c57be7..e6522d74 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Arkivressurs.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Arkivressurs.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,9 +33,9 @@ public class Arkivressurs implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - PERSONALRESSURS("personalressurs", "no.fint.model.administrasjon.personal.Personalressurs", ONE_TO_ONE), - AUTORISASJON("autorisasjon", "no.fint.model.arkiv.noark.Autorisasjon", NONE_TO_MANY), - TILGANG("tilgang", "no.fint.model.arkiv.noark.Tilgang", NONE_TO_MANY); + PERSONALRESSURS("personalressurs", "no.novari.fint.model.administrasjon.personal.Personalressurs", ONE_TO_ONE), + AUTORISASJON("autorisasjon", "no.novari.fint.model.arkiv.noark.Autorisasjon", NONE_TO_MANY), + TILGANG("tilgang", "no.novari.fint.model.arkiv.noark.Tilgang", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Autorisasjon.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Autorisasjon.java index 732ba5fc..6fb2b56a 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Autorisasjon.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Autorisasjon.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,9 +33,9 @@ public class Autorisasjon implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - TILGANGSRESTRIKSJON("tilgangsrestriksjon", "no.fint.model.arkiv.kodeverk.Tilgangsrestriksjon", ONE_TO_MANY), - ADMINISTRATIVENHET("administrativenhet", "no.fint.model.arkiv.noark.AdministrativEnhet", NONE_TO_MANY), - ARKIVRESSURS("arkivressurs", "no.fint.model.arkiv.noark.Arkivressurs", NONE_TO_MANY); + TILGANGSRESTRIKSJON("tilgangsrestriksjon", "no.novari.fint.model.arkiv.kodeverk.Tilgangsrestriksjon", ONE_TO_MANY), + ADMINISTRATIVENHET("administrativenhet", "no.novari.fint.model.arkiv.noark.AdministrativEnhet", NONE_TO_MANY), + ARKIVRESSURS("arkivressurs", "no.novari.fint.model.arkiv.noark.Arkivressurs", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Avskrivning.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Avskrivning.java index 2a6a63dc..2d0fa965 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Avskrivning.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Avskrivning.java @@ -9,16 +9,16 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentbeskrivelse.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentbeskrivelse.java index 033d9bf9..84281cee 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentbeskrivelse.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentbeskrivelse.java @@ -13,17 +13,17 @@ import java.util.List; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,11 +32,11 @@ public class Dokumentbeskrivelse implements FintComplexDatatypeObject { @Getter public enum Relasjonsnavn implements FintRelation { - DOKUMENTSTATUS("dokumentstatus", "no.fint.model.arkiv.kodeverk.DokumentStatus", ONE_TO_ONE), - DOKUMENTTYPE("dokumentType", "no.fint.model.arkiv.kodeverk.DokumentType", ONE_TO_ONE), - TILKNYTTETREGISTRERINGSOM("tilknyttetRegistreringSom", "no.fint.model.arkiv.kodeverk.TilknyttetRegistreringSom", ONE_TO_MANY), - TILKNYTTETAV("tilknyttetAv", "no.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE), - OPPRETTETAV("opprettetAv", "no.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE); + DOKUMENTSTATUS("dokumentstatus", "no.novari.fint.model.arkiv.kodeverk.DokumentStatus", ONE_TO_ONE), + DOKUMENTTYPE("dokumentType", "no.novari.fint.model.arkiv.kodeverk.DokumentType", ONE_TO_ONE), + TILKNYTTETREGISTRERINGSOM("tilknyttetRegistreringSom", "no.novari.fint.model.arkiv.kodeverk.TilknyttetRegistreringSom", ONE_TO_MANY), + TILKNYTTETAV("tilknyttetAv", "no.novari.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE), + OPPRETTETAV("opprettetAv", "no.novari.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentfil.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentfil.java index ff558300..1bcfcae1 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentfil.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentfil.java @@ -12,16 +12,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; - -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; + +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentobjekt.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentobjekt.java index 2b54f248..8012516f 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentobjekt.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Dokumentobjekt.java @@ -12,15 +12,15 @@ import java.util.ArrayList; import java.util.List; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -29,10 +29,10 @@ public class Dokumentobjekt implements FintComplexDatatypeObject { @Getter public enum Relasjonsnavn implements FintRelation { - FILFORMAT("filformat", "no.fint.model.arkiv.kodeverk.Format", NONE_TO_ONE), - VARIANTFORMAT("variantFormat", "no.fint.model.arkiv.kodeverk.Variantformat", ONE_TO_ONE), - OPPRETTETAV("opprettetAv", "no.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE), - REFERANSEDOKUMENTFIL("referanseDokumentfil", "no.fint.model.arkiv.noark.Dokumentfil", NONE_TO_ONE); + FILFORMAT("filformat", "no.novari.fint.model.arkiv.kodeverk.Format", NONE_TO_ONE), + VARIANTFORMAT("variantFormat", "no.novari.fint.model.arkiv.kodeverk.Variantformat", ONE_TO_ONE), + OPPRETTETAV("opprettetAv", "no.novari.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE), + REFERANSEDOKUMENTFIL("referanseDokumentfil", "no.novari.fint.model.arkiv.noark.Dokumentfil", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Journalpost.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Journalpost.java index 68b3d04c..b66509f3 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Journalpost.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Journalpost.java @@ -13,17 +13,17 @@ import java.util.List; import javax.validation.Valid; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,9 +32,9 @@ public class Journalpost extends Registrering implements FintComplexDatatypeObject { @Getter public enum Relasjonsnavn implements FintRelation { - JOURNALPOSTTYPE("journalposttype", "no.fint.model.arkiv.kodeverk.JournalpostType", ONE_TO_ONE), - JOURNALSTATUS("journalstatus", "no.fint.model.arkiv.kodeverk.JournalStatus", ONE_TO_ONE), - JOURNALENHET("journalenhet", "no.fint.model.arkiv.noark.AdministrativEnhet", NONE_TO_ONE); + JOURNALPOSTTYPE("journalposttype", "no.novari.fint.model.arkiv.kodeverk.JournalpostType", ONE_TO_ONE), + JOURNALSTATUS("journalstatus", "no.novari.fint.model.arkiv.kodeverk.JournalStatus", ONE_TO_ONE), + JOURNALENHET("journalenhet", "no.novari.fint.model.arkiv.noark.AdministrativEnhet", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Klasse.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Klasse.java index 25904924..ecd1b805 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Klasse.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Klasse.java @@ -13,15 +13,15 @@ import java.util.List; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -30,7 +30,7 @@ public class Klasse implements FintComplexDatatypeObject { @Getter public enum Relasjonsnavn implements FintRelation { - KLASSIFIKASJONSSYSTEM("klassifikasjonssystem", "no.fint.model.arkiv.noark.Klassifikasjonssystem", ONE_TO_ONE); + KLASSIFIKASJONSSYSTEM("klassifikasjonssystem", "no.novari.fint.model.arkiv.noark.Klassifikasjonssystem", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Klassifikasjonssystem.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Klassifikasjonssystem.java index 261c8dae..307fb44a 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Klassifikasjonssystem.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Klassifikasjonssystem.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,8 +34,8 @@ public class Klassifikasjonssystem implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - KLASSIFIKASJONSTYPE("klassifikasjonstype", "no.fint.model.arkiv.kodeverk.Klassifikasjonstype", NONE_TO_ONE), - ARKIVDEL("arkivdel", "no.fint.model.arkiv.noark.Arkivdel", ONE_TO_MANY); + KLASSIFIKASJONSTYPE("klassifikasjonstype", "no.novari.fint.model.arkiv.kodeverk.Klassifikasjonstype", NONE_TO_ONE), + ARKIVDEL("arkivdel", "no.novari.fint.model.arkiv.noark.Arkivdel", ONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Korrespondansepart.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Korrespondansepart.java index fdfb6733..59d37ea3 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Korrespondansepart.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Korrespondansepart.java @@ -13,17 +13,17 @@ import java.util.List; import javax.validation.Valid; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Adresse; import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,7 +32,7 @@ public class Korrespondansepart implements FintComplexDatatypeObject { @Getter public enum Relasjonsnavn implements FintRelation { - KORRESPONDANSEPARTTYPE("korrespondanseparttype", "no.fint.model.arkiv.kodeverk.KorrespondansepartType", ONE_TO_ONE); + KORRESPONDANSEPARTTYPE("korrespondanseparttype", "no.novari.fint.model.arkiv.kodeverk.KorrespondansepartType", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Mappe.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Mappe.java index deb12888..4a40edd6 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Mappe.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Mappe.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintAbstractObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,9 +34,9 @@ public abstract class Mappe implements FintAbstractObject { @Getter public enum Relasjonsnavn implements FintRelation { - ARKIVDEL("arkivdel", "no.fint.model.arkiv.noark.Arkivdel", NONE_TO_ONE), - AVSLUTTETAV("avsluttetAv", "no.fint.model.arkiv.noark.Arkivressurs", NONE_TO_ONE), - OPPRETTETAV("opprettetAv", "no.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE); + ARKIVDEL("arkivdel", "no.novari.fint.model.arkiv.noark.Arkivdel", NONE_TO_ONE), + AVSLUTTETAV("avsluttetAv", "no.novari.fint.model.arkiv.noark.Arkivressurs", NONE_TO_ONE), + OPPRETTETAV("opprettetAv", "no.novari.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Merknad.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Merknad.java index fb18a09e..e84e8d41 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Merknad.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Merknad.java @@ -13,16 +13,16 @@ import java.util.List; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -31,8 +31,8 @@ public class Merknad implements FintComplexDatatypeObject { @Getter public enum Relasjonsnavn implements FintRelation { - MERKNADSTYPE("merknadstype", "no.fint.model.arkiv.kodeverk.Merknadstype", ONE_TO_ONE), - MERKNADREGISTRERTAV("merknadRegistrertAv", "no.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE); + MERKNADSTYPE("merknadstype", "no.novari.fint.model.arkiv.kodeverk.Merknadstype", ONE_TO_ONE), + MERKNADREGISTRERTAV("merknadRegistrertAv", "no.novari.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Part.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Part.java index 401917c7..5ac3eabc 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Part.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Part.java @@ -13,17 +13,17 @@ import java.util.List; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Adresse; import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,7 +32,7 @@ public class Part implements FintComplexDatatypeObject { @Getter public enum Relasjonsnavn implements FintRelation { - PARTROLLE("partRolle", "no.fint.model.arkiv.kodeverk.PartRolle", NONE_TO_ONE); + PARTROLLE("partRolle", "no.novari.fint.model.arkiv.kodeverk.PartRolle", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Registrering.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Registrering.java index 87820033..d536c7a7 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Registrering.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Registrering.java @@ -13,16 +13,16 @@ import java.util.List; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintAbstractObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -31,12 +31,12 @@ public abstract class Registrering implements FintAbstractObject { @Getter public enum Relasjonsnavn implements FintRelation { - TILGANGSGRUPPE("tilgangsgruppe", "no.fint.model.arkiv.kodeverk.Tilgangsgruppe", NONE_TO_ONE), - ADMINISTRATIVENHET("administrativEnhet", "no.fint.model.arkiv.noark.AdministrativEnhet", NONE_TO_ONE), - ARKIVDEL("arkivdel", "no.fint.model.arkiv.noark.Arkivdel", NONE_TO_ONE), - SAKSBEHANDLER("saksbehandler", "no.fint.model.arkiv.noark.Arkivressurs", NONE_TO_ONE), - ARKIVERTAV("arkivertAv", "no.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE), - OPPRETTETAV("opprettetAv", "no.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE); + TILGANGSGRUPPE("tilgangsgruppe", "no.novari.fint.model.arkiv.kodeverk.Tilgangsgruppe", NONE_TO_ONE), + ADMINISTRATIVENHET("administrativEnhet", "no.novari.fint.model.arkiv.noark.AdministrativEnhet", NONE_TO_ONE), + ARKIVDEL("arkivdel", "no.novari.fint.model.arkiv.noark.Arkivdel", NONE_TO_ONE), + SAKSBEHANDLER("saksbehandler", "no.novari.fint.model.arkiv.noark.Arkivressurs", NONE_TO_ONE), + ARKIVERTAV("arkivertAv", "no.novari.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE), + OPPRETTETAV("opprettetAv", "no.novari.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Sak.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Sak.java index 7fd6dae2..c7bca33e 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Sak.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Sak.java @@ -11,15 +11,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; - -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; + +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Saksmappe.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Saksmappe.java index dd175638..70497563 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Saksmappe.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Saksmappe.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintAbstractObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,12 +34,12 @@ public abstract class Saksmappe extends Mappe implements FintAbstractObject { @Getter public enum Relasjonsnavn implements FintRelation { - SAKSMAPPETYPE("saksmappetype", "no.fint.model.arkiv.kodeverk.Saksmappetype", NONE_TO_ONE), - SAKSSTATUS("saksstatus", "no.fint.model.arkiv.kodeverk.Saksstatus", ONE_TO_ONE), - TILGANGSGRUPPE("tilgangsgruppe", "no.fint.model.arkiv.kodeverk.Tilgangsgruppe", NONE_TO_ONE), - JOURNALENHET("journalenhet", "no.fint.model.arkiv.noark.AdministrativEnhet", NONE_TO_ONE), - ADMINISTRATIVENHET("administrativEnhet", "no.fint.model.arkiv.noark.AdministrativEnhet", ONE_TO_ONE), - SAKSANSVARLIG("saksansvarlig", "no.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE); + SAKSMAPPETYPE("saksmappetype", "no.novari.fint.model.arkiv.kodeverk.Saksmappetype", NONE_TO_ONE), + SAKSSTATUS("saksstatus", "no.novari.fint.model.arkiv.kodeverk.Saksstatus", ONE_TO_ONE), + TILGANGSGRUPPE("tilgangsgruppe", "no.novari.fint.model.arkiv.kodeverk.Tilgangsgruppe", NONE_TO_ONE), + JOURNALENHET("journalenhet", "no.novari.fint.model.arkiv.noark.AdministrativEnhet", NONE_TO_ONE), + ADMINISTRATIVENHET("administrativEnhet", "no.novari.fint.model.arkiv.noark.AdministrativEnhet", ONE_TO_ONE), + SAKSANSVARLIG("saksansvarlig", "no.novari.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Skjerming.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Skjerming.java index 4b4bdc31..4918a84e 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Skjerming.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Skjerming.java @@ -12,15 +12,15 @@ import java.util.ArrayList; import java.util.List; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -29,8 +29,8 @@ public class Skjerming implements FintComplexDatatypeObject { @Getter public enum Relasjonsnavn implements FintRelation { - SKJERMINGSHJEMMEL("skjermingshjemmel", "no.fint.model.arkiv.kodeverk.Skjermingshjemmel", ONE_TO_ONE), - TILGANGSRESTRIKSJON("tilgangsrestriksjon", "no.fint.model.arkiv.kodeverk.Tilgangsrestriksjon", ONE_TO_ONE); + SKJERMINGSHJEMMEL("skjermingshjemmel", "no.novari.fint.model.arkiv.kodeverk.Skjermingshjemmel", ONE_TO_ONE), + TILGANGSRESTRIKSJON("tilgangsrestriksjon", "no.novari.fint.model.arkiv.kodeverk.Tilgangsrestriksjon", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Tilgang.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Tilgang.java index 7c3f0911..87dd5991 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Tilgang.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/Tilgang.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,10 +33,10 @@ public class Tilgang implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ROLLE("rolle", "no.fint.model.arkiv.kodeverk.Rolle", ONE_TO_ONE), - ADMINISTRATIVENHET("administrativEnhet", "no.fint.model.arkiv.noark.AdministrativEnhet", NONE_TO_ONE), - ARKIVDEL("arkivdel", "no.fint.model.arkiv.noark.Arkivdel", NONE_TO_ONE), - ARKIVRESSURS("arkivressurs", "no.fint.model.arkiv.noark.Arkivressurs", NONE_TO_MANY); + ROLLE("rolle", "no.novari.fint.model.arkiv.kodeverk.Rolle", ONE_TO_ONE), + ADMINISTRATIVENHET("administrativEnhet", "no.novari.fint.model.arkiv.noark.AdministrativEnhet", NONE_TO_ONE), + ARKIVDEL("arkivdel", "no.novari.fint.model.arkiv.noark.Arkivdel", NONE_TO_ONE), + ARKIVRESSURS("arkivressurs", "no.novari.fint.model.arkiv.noark.Arkivressurs", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/personal/Personalmappe.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/personal/Personalmappe.java index 87fd115a..945408ca 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/personal/Personalmappe.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/personal/Personalmappe.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; import no.novari.fint.model.arkiv.noark.Saksmappe; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,10 +34,10 @@ public class Personalmappe extends Saksmappe implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - PERSON("person", "no.fint.model.felles.Person", ONE_TO_ONE), - LEDER("leder", "no.fint.model.administrasjon.personal.Personalressurs", ONE_TO_ONE), - ARBEIDSSTED("arbeidssted", "no.fint.model.administrasjon.organisasjon.Organisasjonselement", ONE_TO_ONE), - PERSONALRESSURS("personalressurs", "no.fint.model.administrasjon.personal.Personalressurs", ONE_TO_ONE); + PERSON("person", "no.novari.fint.model.felles.Person", ONE_TO_ONE), + LEDER("leder", "no.novari.fint.model.administrasjon.personal.Personalressurs", ONE_TO_ONE), + ARBEIDSSTED("arbeidssted", "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", ONE_TO_ONE), + PERSONALRESSURS("personalressurs", "no.novari.fint.model.administrasjon.personal.Personalressurs", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/samferdsel/SoknadDrosjeloyve.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/samferdsel/SoknadDrosjeloyve.java index 93d418d2..c8ed2cfb 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/samferdsel/SoknadDrosjeloyve.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/samferdsel/SoknadDrosjeloyve.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.arkiv.noark.Saksmappe; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentStatusResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentStatusResource.java index 0369e645..a3d75959 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentStatusResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentStatusResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentStatusResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentStatusResources.java index b163951c..55597d79 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentStatusResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentStatusResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class DokumentStatusResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentTypeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentTypeResource.java index cb9633f8..0a4b5cea 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentTypeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentTypeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentTypeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentTypeResources.java index 47d98586..38c2b934 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentTypeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/DokumentTypeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class DokumentTypeResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/FormatResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/FormatResource.java index fb21d1b7..a80bb261 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/FormatResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/FormatResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/FormatResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/FormatResources.java index 51937064..62b63f04 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/FormatResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/FormatResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FormatResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalStatusResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalStatusResource.java index 7c2696ee..2f3f6f5e 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalStatusResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalStatusResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalStatusResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalStatusResources.java index f898f6df..3980f062 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalStatusResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalStatusResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class JournalStatusResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalpostTypeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalpostTypeResource.java index 0496f6e5..6668c774 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalpostTypeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalpostTypeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalpostTypeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalpostTypeResources.java index 247ee861..4444d3b1 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalpostTypeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/JournalpostTypeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class JournalpostTypeResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResource.java index d8e464a0..c1c0bc63 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResources.java index 616b3bd0..eaa420e7 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KlassifikasjonstypeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KlassifikasjonstypeResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResource.java index dc189680..75d59067 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResources.java index 1d280a2c..74dffa78 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/KorrespondansepartTypeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KorrespondansepartTypeResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/MerknadstypeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/MerknadstypeResource.java index 4d3880d7..18ee049b 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/MerknadstypeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/MerknadstypeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/MerknadstypeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/MerknadstypeResources.java index 0805926e..94b9b963 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/MerknadstypeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/MerknadstypeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class MerknadstypeResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/PartRolleResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/PartRolleResource.java index 1b620f13..f0d3b25a 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/PartRolleResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/PartRolleResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/PartRolleResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/PartRolleResources.java index 7e578dd3..13fb3135 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/PartRolleResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/PartRolleResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PartRolleResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/RolleResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/RolleResource.java index a80ba21b..0e92c2aa 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/RolleResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/RolleResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/RolleResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/RolleResources.java index 1241e4d8..6bbb129e 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/RolleResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/RolleResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class RolleResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksmappetypeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksmappetypeResource.java index cf7b7cac..c7f6e0eb 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksmappetypeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksmappetypeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksmappetypeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksmappetypeResources.java index e533c149..ce7a0c0a 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksmappetypeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksmappetypeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SaksmappetypeResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksstatusResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksstatusResource.java index bf97cb84..b36fac68 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksstatusResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksstatusResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksstatusResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksstatusResources.java index 7d19f0f5..976d99a6 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksstatusResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SaksstatusResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SaksstatusResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResource.java index 7aea8fa9..fa56f6d3 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResources.java index c278e007..49adb150 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/SkjermingshjemmelResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SkjermingshjemmelResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResource.java index a86a0775..294bcac7 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResources.java index ff142596..626ec8ec 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsgruppeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TilgangsgruppeResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResource.java index 3ef705c4..7b6095d7 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResources.java index 263cb583..9cf0f21f 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilgangsrestriksjonResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TilgangsrestriksjonResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResource.java index 820e97c2..6d18d985 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResources.java index 6669d097..cd359ab6 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/TilknyttetRegistreringSomResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TilknyttetRegistreringSomResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/VariantformatResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/VariantformatResource.java index 73a6600a..c92fd08b 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/VariantformatResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/VariantformatResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/VariantformatResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/VariantformatResources.java index f10cc338..52129ca3 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/VariantformatResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kodeverk/VariantformatResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class VariantformatResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResource.java index 825db7ba..caf861e8 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.felles.kompleksedatatyper.MatrikkelnummerResource; import no.novari.fint.model.resource.arkiv.noark.SaksmappeResource; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResources.java index 9b27709d..077b88e9 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/DispensasjonAutomatiskFredaKulturminneResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class DispensasjonAutomatiskFredaKulturminneResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResource.java index 073872b3..a113594e 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.arkiv.noark.SaksmappeResource; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResources.java index 589fc81e..797a09d4 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFartoyResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TilskuddFartoyResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResource.java index 4d5cc7f5..5f60dd6c 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.felles.kompleksedatatyper.MatrikkelnummerResource; import no.novari.fint.model.resource.arkiv.noark.SaksmappeResource; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResources.java index 25962d0d..7c7e7e08 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/kulturminnevern/TilskuddFredaBygningPrivatEieResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TilskuddFredaBygningPrivatEieResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AdministrativEnhetResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AdministrativEnhetResource.java index c07b8e6a..82568c24 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AdministrativEnhetResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AdministrativEnhetResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AdministrativEnhetResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AdministrativEnhetResources.java index 27cfa8d8..beeec383 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AdministrativEnhetResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AdministrativEnhetResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AdministrativEnhetResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivdelResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivdelResource.java index 93307b2f..dba86d2d 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivdelResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivdelResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivdelResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivdelResources.java index f47d1200..13572981 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivdelResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivdelResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ArkivdelResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivressursResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivressursResource.java index 83d8c702..097291b0 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivressursResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivressursResource.java @@ -15,10 +15,10 @@ import javax.validation.Valid; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivressursResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivressursResources.java index 193c39c2..c12dd5a9 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivressursResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/ArkivressursResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ArkivressursResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AutorisasjonResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AutorisasjonResource.java index 1b5a0251..efe78010 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AutorisasjonResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AutorisasjonResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AutorisasjonResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AutorisasjonResources.java index 2e426525..aa8f2db9 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AutorisasjonResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/AutorisasjonResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AutorisasjonResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentbeskrivelseResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentbeskrivelseResource.java index 3f4640dc..5151c561 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentbeskrivelseResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentbeskrivelseResource.java @@ -14,10 +14,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import java.util.Date; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentbeskrivelseResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentbeskrivelseResources.java index 66c21ff4..b7667c7b 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentbeskrivelseResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentbeskrivelseResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class DokumentbeskrivelseResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentfilResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentfilResource.java index 7f41e6ba..7b6277f1 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentfilResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentfilResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentfilResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentfilResources.java index 49b6a481..a0f824bf 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentfilResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentfilResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class DokumentfilResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentobjektResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentobjektResource.java index 8c039882..79692860 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentobjektResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentobjektResource.java @@ -12,10 +12,10 @@ import java.util.List; import java.util.Map; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentobjektResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentobjektResources.java index 6feb8fb1..c90e431e 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentobjektResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/DokumentobjektResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class DokumentobjektResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/JournalpostResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/JournalpostResource.java index d173f8d2..4f4a6692 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/JournalpostResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/JournalpostResource.java @@ -13,10 +13,10 @@ import java.util.Map; import javax.validation.Valid; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.arkiv.noark.Avskrivning; import java.util.Date; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/JournalpostResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/JournalpostResources.java index f4b8495a..af03cfe4 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/JournalpostResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/JournalpostResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class JournalpostResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlasseResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlasseResource.java index 055df174..c0b89484 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlasseResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlasseResource.java @@ -14,10 +14,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlasseResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlasseResources.java index 4675193c..5bd9ec42 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlasseResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlasseResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KlasseResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlassifikasjonssystemResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlassifikasjonssystemResource.java index dcbdadaf..d18734fd 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlassifikasjonssystemResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlassifikasjonssystemResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import java.util.Date; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlassifikasjonssystemResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlassifikasjonssystemResources.java index 7355ce97..53847015 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlassifikasjonssystemResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KlassifikasjonssystemResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KlassifikasjonssystemResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KorrespondansepartResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KorrespondansepartResource.java index ddf27a76..eccabad1 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KorrespondansepartResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KorrespondansepartResource.java @@ -13,10 +13,10 @@ import java.util.Map; import javax.validation.Valid; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource; import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KorrespondansepartResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KorrespondansepartResources.java index 9ad44f34..943b8808 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KorrespondansepartResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/KorrespondansepartResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KorrespondansepartResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MappeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MappeResource.java index 8dde90c3..099e5dd8 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MappeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MappeResource.java @@ -15,10 +15,10 @@ import javax.validation.Valid; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintAbstractObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import java.util.Date; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MappeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MappeResources.java index 17b1a2fb..b7a34e19 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MappeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MappeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class MappeResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MerknadResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MerknadResource.java index 3c8d3fef..1f2700cc 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MerknadResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MerknadResource.java @@ -14,10 +14,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import java.util.Date; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MerknadResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MerknadResources.java index e05b723c..b6525eaf 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MerknadResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/MerknadResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class MerknadResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/PartResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/PartResource.java index 52cf5886..7cd4eff8 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/PartResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/PartResource.java @@ -14,10 +14,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource; import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/PartResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/PartResources.java index 3676e012..30275739 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/PartResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/PartResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PartResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/RegistreringResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/RegistreringResource.java index 636db2da..61cbba8a 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/RegistreringResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/RegistreringResource.java @@ -14,10 +14,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintAbstractObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import java.util.Date; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/RegistreringResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/RegistreringResources.java index 280bb862..add39375 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/RegistreringResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/RegistreringResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class RegistreringResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SakResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SakResource.java index eb4638d2..d3ea3a43 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SakResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SakResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SakResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SakResources.java index 019a9e82..5573ac43 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SakResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SakResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SakResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SaksmappeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SaksmappeResource.java index 91b4a54b..02e72b05 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SaksmappeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SaksmappeResource.java @@ -14,10 +14,10 @@ import java.util.HashMap; import javax.validation.Valid; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintAbstractObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import java.util.Date; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SaksmappeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SaksmappeResources.java index 23cfdcb3..cc604c47 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SaksmappeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SaksmappeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SaksmappeResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SkjermingResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SkjermingResource.java index c4f2ca74..3e04b9af 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SkjermingResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SkjermingResource.java @@ -12,10 +12,10 @@ import java.util.List; import java.util.Map; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SkjermingResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SkjermingResources.java index 6a7997d9..bad33026 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SkjermingResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/SkjermingResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SkjermingResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/TilgangResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/TilgangResource.java index 06d42fe1..140dbf17 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/TilgangResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/TilgangResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/TilgangResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/TilgangResources.java index e66f5eef..0b8061b0 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/TilgangResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/noark/TilgangResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TilgangResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/personal/PersonalmappeResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/personal/PersonalmappeResource.java index 331b11b7..cc3c4cda 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/personal/PersonalmappeResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/personal/PersonalmappeResource.java @@ -15,10 +15,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; import no.novari.fint.model.resource.arkiv.noark.SaksmappeResource; diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/personal/PersonalmappeResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/personal/PersonalmappeResources.java index bd5b0342..ad285534 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/personal/PersonalmappeResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/personal/PersonalmappeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PersonalmappeResources extends AbstractCollectionResources { diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResource.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResource.java index ccb9a67e..dd28b4ab 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResource.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResource.java @@ -14,10 +14,10 @@ import java.util.HashMap; import javax.validation.constraints.*; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.arkiv.noark.SaksmappeResource; @Data diff --git a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResources.java b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResources.java index c9f7ffca..9da872f7 100644 --- a/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResources.java +++ b/fint-arkiv-resource-model-java/src/main/java/no/novari/fint/model/resource/arkiv/samferdsel/SoknadDrosjeloyveResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SoknadDrosjeloyveResources extends AbstractCollectionResources { diff --git a/fint-felles-model-java/build.gradle b/fint-felles-model-java/build.gradle index 6ceebd8b..973d0006 100644 --- a/fint-felles-model-java/build.gradle +++ b/fint-felles-model-java/build.gradle @@ -1,3 +1,3 @@ dependencies { - api("no.fintlabs:fint-model-core:${fintModelCoreVersion}") + api("no.novari:fint-model-core:${fintModelCoreVersion}") } diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Kontaktperson.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Kontaktperson.java index 2aabd415..1f65224d 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Kontaktperson.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Kontaktperson.java @@ -15,18 +15,18 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -35,8 +35,8 @@ public class Kontaktperson implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - KONTAKTPERSON("kontaktperson", "no.fint.model.felles.Person", NONE_TO_MANY), - PERSON("person", "no.fint.model.felles.Person", NONE_TO_ONE); + KONTAKTPERSON("kontaktperson", "no.novari.fint.model.felles.Person", NONE_TO_MANY), + PERSON("person", "no.novari.fint.model.felles.Person", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Person.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Person.java index deabedea..1a722663 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Person.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Person.java @@ -15,21 +15,21 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Adresse; import java.util.Date; import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; import no.novari.fint.model.felles.basisklasser.Aktor; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -38,18 +38,18 @@ public class Person extends Aktor implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - STATSBORGERSKAP("statsborgerskap", "no.fint.model.felles.kodeverk.iso.Landkode", NONE_TO_MANY), - KOMMUNE("kommune", "no.fint.model.felles.kodeverk.Kommune", NONE_TO_ONE), - KJONN("kjonn", "no.fint.model.felles.kodeverk.iso.Kjonn", NONE_TO_ONE), - FORELDREANSVAR("foreldreansvar", "no.fint.model.felles.Person", NONE_TO_MANY), - MALFORM("malform", "no.fint.model.felles.kodeverk.iso.Sprak", NONE_TO_ONE), - PERSONALRESSURS("personalressurs", "no.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), - MORSMAL("morsmal", "no.fint.model.felles.kodeverk.iso.Sprak", NONE_TO_ONE), - PARORENDE("parorende", "no.fint.model.felles.Kontaktperson", NONE_TO_MANY), - FORELDRE("foreldre", "no.fint.model.felles.Person", NONE_TO_MANY), - LARLING("larling", "no.fint.model.utdanning.larling.Larling", NONE_TO_MANY), - ELEV("elev", "no.fint.model.utdanning.elev.Elev", NONE_TO_ONE), - OTUNGDOM("otungdom", "no.fint.model.utdanning.ot.OtUngdom", NONE_TO_ONE); + STATSBORGERSKAP("statsborgerskap", "no.novari.fint.model.felles.kodeverk.iso.Landkode", NONE_TO_MANY), + KOMMUNE("kommune", "no.novari.fint.model.felles.kodeverk.Kommune", NONE_TO_ONE), + KJONN("kjonn", "no.novari.fint.model.felles.kodeverk.iso.Kjonn", NONE_TO_ONE), + FORELDREANSVAR("foreldreansvar", "no.novari.fint.model.felles.Person", NONE_TO_MANY), + MALFORM("malform", "no.novari.fint.model.felles.kodeverk.iso.Sprak", NONE_TO_ONE), + PERSONALRESSURS("personalressurs", "no.novari.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), + MORSMAL("morsmal", "no.novari.fint.model.felles.kodeverk.iso.Sprak", NONE_TO_ONE), + PARORENDE("parorende", "no.novari.fint.model.felles.Kontaktperson", NONE_TO_MANY), + FORELDRE("foreldre", "no.novari.fint.model.felles.Person", NONE_TO_MANY), + LARLING("larling", "no.novari.fint.model.utdanning.larling.Larling", NONE_TO_MANY), + ELEV("elev", "no.novari.fint.model.utdanning.elev.Elev", NONE_TO_ONE), + OTUNGDOM("otungdom", "no.novari.fint.model.utdanning.ot.OtUngdom", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Virksomhet.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Virksomhet.java index ad12309c..da58b7b0 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Virksomhet.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/Virksomhet.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Enhet; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,7 +34,7 @@ public class Virksomhet extends Enhet implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - LARLING("larling", "no.fint.model.utdanning.larling.Larling", NONE_TO_MANY); + LARLING("larling", "no.novari.fint.model.utdanning.larling.Larling", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Aktor.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Aktor.java index 3ebc871d..45c02cf5 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Aktor.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Aktor.java @@ -9,17 +9,17 @@ import javax.validation.Valid; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintAbstractObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; import no.novari.fint.model.felles.kompleksedatatyper.Adresse; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Begrep.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Begrep.java index 81f13aa8..fa768d25 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Begrep.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Begrep.java @@ -12,17 +12,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintAbstractObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Enhet.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Enhet.java index a921571f..336f2b7c 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Enhet.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/Enhet.java @@ -12,17 +12,17 @@ import java.util.HashMap; import javax.validation.Valid; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintAbstractObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Adresse; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Fylke.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Fylke.java index e7b002ce..eb90da45 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Fylke.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Fylke.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,7 +32,7 @@ public class Fylke extends Begrep implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - KOMMUNE("kommune", "no.fint.model.felles.kodeverk.Kommune", NONE_TO_MANY); + KOMMUNE("kommune", "no.novari.fint.model.felles.kodeverk.Kommune", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Kommune.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Kommune.java index ca6e58c9..1b1c75a4 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Kommune.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Kommune.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,7 +32,7 @@ public class Kommune extends Begrep implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - FYLKE("fylke", "no.fint.model.felles.kodeverk.Fylke", ONE_TO_ONE); + FYLKE("fylke", "no.novari.fint.model.felles.kodeverk.Fylke", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Valuta.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Valuta.java index 04f6978b..9929d70c 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Valuta.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/Valuta.java @@ -12,16 +12,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; - -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; + +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Kjonn.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Kjonn.java index 223085fd..c5643ca1 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Kjonn.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Kjonn.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Landkode.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Landkode.java index 8c888b0b..204dc9d0 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Landkode.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Landkode.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Sprak.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Sprak.java index b240c5d4..7724c7e6 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Sprak.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/Sprak.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Adresse.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Adresse.java index aa883f63..b7c6ef16 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Adresse.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Adresse.java @@ -12,15 +12,15 @@ import java.util.ArrayList; import java.util.List; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -29,7 +29,7 @@ public class Adresse implements FintComplexDatatypeObject { @Getter public enum Relasjonsnavn implements FintRelation { - LAND("land", "no.fint.model.felles.kodeverk.iso.Landkode", NONE_TO_ONE); + LAND("land", "no.novari.fint.model.felles.kodeverk.iso.Landkode", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Identifikator.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Identifikator.java index f60680e6..2ccac4e5 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Identifikator.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Identifikator.java @@ -9,15 +9,15 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Kontaktinformasjon.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Kontaktinformasjon.java index 5cda095d..65defbcc 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Kontaktinformasjon.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Kontaktinformasjon.java @@ -6,15 +6,15 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Matrikkelnummer.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Matrikkelnummer.java index a4359e77..0b0a3b00 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Matrikkelnummer.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Matrikkelnummer.java @@ -13,15 +13,15 @@ import java.util.List; import javax.validation.Valid; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -30,7 +30,7 @@ public class Matrikkelnummer implements FintComplexDatatypeObject { @Getter public enum Relasjonsnavn implements FintRelation { - KOMMUNENUMMER("kommunenummer", "no.fint.model.felles.kodeverk.Kommune", NONE_TO_ONE); + KOMMUNENUMMER("kommunenummer", "no.novari.fint.model.felles.kodeverk.Kommune", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Periode.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Periode.java index 4eaa7c18..f4a277fa 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Periode.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Periode.java @@ -9,16 +9,16 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Personnavn.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Personnavn.java index ac31a92d..02ea14dd 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Personnavn.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/Personnavn.java @@ -8,15 +8,15 @@ import lombok.ToString; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-felles-resource-model-java/build.gradle b/fint-felles-resource-model-java/build.gradle index bef02425..dd90a6b1 100644 --- a/fint-felles-resource-model-java/build.gradle +++ b/fint-felles-resource-model-java/build.gradle @@ -1,11 +1,11 @@ dependencies { api project(":fint-felles-model-java") - api("no.fintlabs:fint-model-resource:${fintModelResourceVersion}") + api("no.novari:fint-model-resource:${fintModelResourceVersion}") testImplementation("org.spockframework:spock-spring:${spockSpringVersion}") testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") testImplementation('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') - testImplementation('org.springframework.hateoas:spring-hateoas:0.25.1.RELEASE') + testImplementation("org.springframework.hateoas:spring-hateoas:${springHateoasVersion}") testImplementation("org.apache.groovy:groovy-json:4.0.26") } diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/KontaktpersonResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/KontaktpersonResource.java index 5fe056c1..0ca7d282 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/KontaktpersonResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/KontaktpersonResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/KontaktpersonResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/KontaktpersonResources.java index d091deb5..d56c76d4 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/KontaktpersonResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/KontaktpersonResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KontaktpersonResources extends AbstractCollectionResources { diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/PersonResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/PersonResource.java index eb303a1e..c9dac7f4 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/PersonResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/PersonResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource; import java.util.Date; diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/PersonResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/PersonResources.java index 3b7291b3..ae277d7d 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/PersonResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/PersonResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PersonResources extends AbstractCollectionResources { diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/VirksomhetResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/VirksomhetResource.java index d3285eac..10e4ab78 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/VirksomhetResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/VirksomhetResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.felles.basisklasser.EnhetResource; @Data diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/VirksomhetResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/VirksomhetResources.java index 96460c60..ee71ca6a 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/VirksomhetResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/VirksomhetResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class VirksomhetResources extends AbstractCollectionResources { diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/AktorResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/AktorResource.java index 3debfaec..501de565 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/AktorResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/AktorResource.java @@ -12,10 +12,10 @@ import java.util.Map; import javax.validation.Valid; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintAbstractObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource; diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/AktorResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/AktorResources.java index ad7ecc46..6a416e83 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/AktorResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/AktorResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AktorResources extends AbstractCollectionResources { diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/BegrepResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/BegrepResource.java index 6b84846a..f4970e73 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/BegrepResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/BegrepResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintAbstractObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/BegrepResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/BegrepResources.java index d260fa19..5de6962f 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/BegrepResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/BegrepResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class BegrepResources extends AbstractCollectionResources { diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/EnhetResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/EnhetResource.java index cfa28795..fd1f7edb 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/EnhetResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/EnhetResource.java @@ -15,10 +15,10 @@ import javax.validation.Valid; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintAbstractObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource; @Data diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/EnhetResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/EnhetResources.java index 32b4ad5d..089f62ec 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/EnhetResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/basisklasser/EnhetResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class EnhetResources extends AbstractCollectionResources { diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/FylkeResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/FylkeResource.java index 1265635f..5fbf9fdf 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/FylkeResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/FylkeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/FylkeResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/FylkeResources.java index bd041fc1..d3b6628e 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/FylkeResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/FylkeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FylkeResources extends AbstractCollectionResources { diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/KommuneResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/KommuneResource.java index 473152f3..37968169 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/KommuneResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/KommuneResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/KommuneResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/KommuneResources.java index 2c4bb501..f9c5b5cc 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/KommuneResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/KommuneResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KommuneResources extends AbstractCollectionResources { diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/ValutaResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/ValutaResource.java index 7f8c4b12..a5ca348f 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/ValutaResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/ValutaResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/ValutaResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/ValutaResources.java index e466bde7..95874955 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/ValutaResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/ValutaResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ValutaResources extends AbstractCollectionResources { diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/KjonnResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/KjonnResource.java index d0ac6194..0186221b 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/KjonnResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/KjonnResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/KjonnResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/KjonnResources.java index aaef1be6..30aff77e 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/KjonnResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/KjonnResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KjonnResources extends AbstractCollectionResources { diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/LandkodeResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/LandkodeResource.java index cb6b11ca..bb9a773a 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/LandkodeResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/LandkodeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/LandkodeResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/LandkodeResources.java index 6258f10a..995e4cbf 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/LandkodeResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/LandkodeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class LandkodeResources extends AbstractCollectionResources { diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/SprakResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/SprakResource.java index d60be253..0dd80e1c 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/SprakResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/SprakResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/SprakResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/SprakResources.java index d3929525..c94f30c9 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/SprakResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kodeverk/iso/SprakResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SprakResources extends AbstractCollectionResources { diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/AdresseResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/AdresseResource.java index 8765598a..8597fcba 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/AdresseResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/AdresseResource.java @@ -12,10 +12,10 @@ import java.util.List; import java.util.Map; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/AdresseResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/AdresseResources.java index 76972c5d..977eeee1 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/AdresseResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/AdresseResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AdresseResources extends AbstractCollectionResources { diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResource.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResource.java index 96ebf3f1..5b1d5008 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResource.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResource.java @@ -13,10 +13,10 @@ import java.util.Map; import javax.validation.Valid; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResources.java b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResources.java index ce33998d..df3be991 100644 --- a/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResources.java +++ b/fint-felles-resource-model-java/src/main/java/no/novari/fint/model/resource/felles/kompleksedatatyper/MatrikkelnummerResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class MatrikkelnummerResources extends AbstractCollectionResources { diff --git a/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy b/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy index 114723d6..9d8bb536 100644 --- a/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy +++ b/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy @@ -6,7 +6,7 @@ import no.novari.fint.model.felles.Person import no.novari.fint.model.felles.kompleksedatatyper.Adresse import no.novari.fint.model.felles.kompleksedatatyper.Identifikator import no.novari.fint.model.felles.kompleksedatatyper.Personnavn -import no.fint.model.resource.Link +import no.novari.fint.model.resource.Link import no.novari.fint.model.resource.felles.KontaktpersonResource import no.novari.fint.model.resource.felles.PersonResource import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource diff --git a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Faktura.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Faktura.java index d6b502aa..c7dcfff7 100644 --- a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Faktura.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Faktura.java @@ -15,18 +15,18 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Adresse; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -35,7 +35,7 @@ public class Faktura implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - FAKTURAGRUNNLAG("fakturagrunnlag", "no.fint.model.okonomi.faktura.Fakturagrunnlag", ONE_TO_ONE); + FAKTURAGRUNNLAG("fakturagrunnlag", "no.novari.fint.model.okonomi.faktura.Fakturagrunnlag", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturagrunnlag.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturagrunnlag.java index 368d8190..406893e2 100644 --- a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturagrunnlag.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturagrunnlag.java @@ -15,18 +15,18 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -35,8 +35,8 @@ public class Fakturagrunnlag implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - FAKTURA("faktura", "no.fint.model.okonomi.faktura.Faktura", NONE_TO_MANY), - FAKTURAUTSTEDER("fakturautsteder", "no.fint.model.okonomi.faktura.Fakturautsteder", ONE_TO_ONE); + FAKTURA("faktura", "no.novari.fint.model.okonomi.faktura.Faktura", NONE_TO_MANY), + FAKTURAUTSTEDER("fakturautsteder", "no.novari.fint.model.okonomi.faktura.Fakturautsteder", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturalinje.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturalinje.java index b987eca4..8dd6350e 100644 --- a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturalinje.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturalinje.java @@ -12,15 +12,15 @@ import java.util.ArrayList; import java.util.List; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -29,7 +29,7 @@ public class Fakturalinje implements FintComplexDatatypeObject { @Getter public enum Relasjonsnavn implements FintRelation { - VARE("vare", "no.fint.model.okonomi.kodeverk.Vare", ONE_TO_ONE); + VARE("vare", "no.novari.fint.model.okonomi.kodeverk.Vare", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturamottaker.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturamottaker.java index 7e7aa70b..7caf8e19 100644 --- a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturamottaker.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturamottaker.java @@ -12,15 +12,15 @@ import java.util.ArrayList; import java.util.List; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -29,7 +29,7 @@ public class Fakturamottaker implements FintComplexDatatypeObject { @Getter public enum Relasjonsnavn implements FintRelation { - PERSON("person", "no.fint.model.felles.Person", ONE_TO_ONE); + PERSON("person", "no.novari.fint.model.felles.Person", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturautsteder.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturautsteder.java index cd483c40..f9c10773 100644 --- a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturautsteder.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/Fakturautsteder.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,9 +33,9 @@ public class Fakturautsteder implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ORGANISASJONSELEMENT("organisasjonselement", "no.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_ONE), - FAKTURAGRUNNLAG("fakturagrunnlag", "no.fint.model.okonomi.faktura.Fakturagrunnlag", NONE_TO_MANY), - VARE("vare", "no.fint.model.okonomi.kodeverk.Vare", NONE_TO_MANY); + ORGANISASJONSELEMENT("organisasjonselement", "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_ONE), + FAKTURAGRUNNLAG("fakturagrunnlag", "no.novari.fint.model.okonomi.faktura.Fakturagrunnlag", NONE_TO_MANY), + VARE("vare", "no.novari.fint.model.okonomi.kodeverk.Vare", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/Merverdiavgift.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/Merverdiavgift.java index 4fba2d05..efad0676 100644 --- a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/Merverdiavgift.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/Merverdiavgift.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/Vare.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/Vare.java index 9120f37a..98065909 100644 --- a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/Vare.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/Vare.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.administrasjon.kompleksedatatyper.Kontostreng; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,8 +34,8 @@ public class Vare extends Begrep implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - FAKTURAUTSTEDER("fakturautsteder", "no.fint.model.okonomi.faktura.Fakturautsteder", ONE_TO_ONE), - MERVERDIAVGIFT("merverdiavgift", "no.fint.model.okonomi.kodeverk.Merverdiavgift", ONE_TO_ONE); + FAKTURAUTSTEDER("fakturautsteder", "no.novari.fint.model.okonomi.faktura.Fakturautsteder", ONE_TO_ONE), + MERVERDIAVGIFT("merverdiavgift", "no.novari.fint.model.okonomi.kodeverk.Merverdiavgift", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Bilag.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Bilag.java index 6c8bba01..e4e8c6c8 100644 --- a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Bilag.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Bilag.java @@ -8,16 +8,16 @@ import lombok.ToString; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Leverandor.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Leverandor.java index 32a3c1f4..e27edaf8 100644 --- a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Leverandor.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Leverandor.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,9 +33,9 @@ public class Leverandor implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - PERSON("person", "no.fint.model.felles.Person", NONE_TO_ONE), - LEVERANDORGRUPPE("leverandorgruppe", "no.fint.model.okonomi.regnskap.Leverandorgruppe", NONE_TO_ONE), - VIRKSOMHET("virksomhet", "no.fint.model.felles.Virksomhet", NONE_TO_ONE); + PERSON("person", "no.novari.fint.model.felles.Person", NONE_TO_ONE), + LEVERANDORGRUPPE("leverandorgruppe", "no.novari.fint.model.okonomi.regnskap.Leverandorgruppe", NONE_TO_ONE), + VIRKSOMHET("virksomhet", "no.novari.fint.model.felles.Virksomhet", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Leverandorgruppe.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Leverandorgruppe.java index 52e4db17..9174f646 100644 --- a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Leverandorgruppe.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Leverandorgruppe.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,7 +33,7 @@ public class Leverandorgruppe implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - LEVERANDOR("leverandor", "no.fint.model.okonomi.regnskap.Leverandor", NONE_TO_MANY); + LEVERANDOR("leverandor", "no.novari.fint.model.okonomi.regnskap.Leverandor", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Postering.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Postering.java index d8e74a4e..2b99d16b 100644 --- a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Postering.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Postering.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.administrasjon.kompleksedatatyper.Kontostreng; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,7 +34,7 @@ public class Postering implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - TRANSAKSJON("transaksjon", "no.fint.model.okonomi.regnskap.Transaksjon", NONE_TO_ONE); + TRANSAKSJON("transaksjon", "no.novari.fint.model.okonomi.regnskap.Transaksjon", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Transaksjon.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Transaksjon.java index 7639f23d..d9b01ac8 100644 --- a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Transaksjon.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/Transaksjon.java @@ -15,18 +15,18 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -35,10 +35,10 @@ public class Transaksjon implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - LEVERANDOR("leverandor", "no.fint.model.okonomi.regnskap.Leverandor", NONE_TO_ONE), - ANSVARLIG("ansvarlig", "no.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), - VALUTA("valuta", "no.fint.model.felles.kodeverk.Valuta", ONE_TO_ONE), - POSTERING("postering", "no.fint.model.okonomi.regnskap.Postering", ONE_TO_MANY); + LEVERANDOR("leverandor", "no.novari.fint.model.okonomi.regnskap.Leverandor", NONE_TO_ONE), + ANSVARLIG("ansvarlig", "no.novari.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), + VALUTA("valuta", "no.novari.fint.model.felles.kodeverk.Valuta", ONE_TO_ONE), + POSTERING("postering", "no.novari.fint.model.okonomi.regnskap.Postering", ONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturaResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturaResource.java index dfe6fd45..f6563b1c 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturaResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturaResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource; import java.util.Date; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturaResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturaResources.java index 8e46c9d8..629f4699 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturaResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturaResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FakturaResources extends AbstractCollectionResources { diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturagrunnlagResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturagrunnlagResource.java index 3f996c7d..26b5f3dc 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturagrunnlagResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturagrunnlagResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import java.util.Date; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturagrunnlagResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturagrunnlagResources.java index 45deeb89..4a42f573 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturagrunnlagResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturagrunnlagResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FakturagrunnlagResources extends AbstractCollectionResources { diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturalinjeResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturalinjeResource.java index f3ed5aec..18e42a1e 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturalinjeResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturalinjeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import javax.validation.constraints.*; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturalinjeResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturalinjeResources.java index d2ea18b5..813ebf9d 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturalinjeResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturalinjeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FakturalinjeResources extends AbstractCollectionResources { diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturamottakerResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturamottakerResource.java index fb2b8c9d..51fd8544 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturamottakerResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturamottakerResource.java @@ -12,10 +12,10 @@ import java.util.List; import java.util.Map; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturamottakerResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturamottakerResources.java index bacbd7ce..f0adba51 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturamottakerResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturamottakerResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FakturamottakerResources extends AbstractCollectionResources { diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturautstederResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturautstederResource.java index 4bbe7526..394aac5c 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturautstederResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturautstederResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturautstederResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturautstederResources.java index d7395c0c..f7b07132 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturautstederResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/faktura/FakturautstederResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FakturautstederResources extends AbstractCollectionResources { diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResource.java index 90dd7cd9..ba3293a5 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResource.java @@ -14,10 +14,10 @@ import java.util.HashMap; import javax.validation.constraints.*; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResources.java index b764e2e8..ec1bc9fb 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/MerverdiavgiftResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class MerverdiavgiftResources extends AbstractCollectionResources { diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/VareResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/VareResource.java index 1ffe1858..bfd4f289 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/VareResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/VareResource.java @@ -15,10 +15,10 @@ import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.administrasjon.kompleksedatatyper.KontostrengResource; import no.novari.fint.model.felles.basisklasser.Begrep; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/VareResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/VareResources.java index df26a124..49bad5cf 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/VareResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/kodeverk/VareResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class VareResources extends AbstractCollectionResources { diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorResource.java index 6be64f1a..a5e62786 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorResources.java index b36efcd9..5387ee12 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class LeverandorResources extends AbstractCollectionResources { diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorgruppeResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorgruppeResource.java index 5341eaa8..cfb61247 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorgruppeResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorgruppeResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorgruppeResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorgruppeResources.java index 8a3ae0c9..7a3449db 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorgruppeResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/LeverandorgruppeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class LeverandorgruppeResources extends AbstractCollectionResources { diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/PosteringResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/PosteringResource.java index 3a75fa2c..932ae23b 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/PosteringResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/PosteringResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.administrasjon.kompleksedatatyper.KontostrengResource; @Data diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/PosteringResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/PosteringResources.java index e8e705ba..68488e75 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/PosteringResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/PosteringResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PosteringResources extends AbstractCollectionResources { diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/TransaksjonResource.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/TransaksjonResource.java index e057abfa..e3ef6e03 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/TransaksjonResource.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/TransaksjonResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.okonomi.regnskap.Bilag; import java.util.Date; diff --git a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/TransaksjonResources.java b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/TransaksjonResources.java index 12ddcf1f..b69c7007 100644 --- a/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/TransaksjonResources.java +++ b/fint-okonomi-resource-model-java/src/main/java/no/novari/fint/model/resource/okonomi/regnskap/TransaksjonResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TransaksjonResources extends AbstractCollectionResources { diff --git a/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/Behandlingsgrunnlag.java b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/Behandlingsgrunnlag.java index c638f364..d98832fc 100644 --- a/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/Behandlingsgrunnlag.java +++ b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/Behandlingsgrunnlag.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/Personopplysning.java b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/Personopplysning.java index 0211966c..54847d88 100644 --- a/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/Personopplysning.java +++ b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/Personopplysning.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Behandling.java b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Behandling.java index bbed2eb7..e1a8689a 100644 --- a/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Behandling.java +++ b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Behandling.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,10 +34,10 @@ public class Behandling implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - BEHANDLINGSGRUNNLAG("behandlingsgrunnlag", "no.fint.model.personvern.kodeverk.Behandlingsgrunnlag", ONE_TO_ONE), - PERSONOPPLYSNING("personopplysning", "no.fint.model.personvern.kodeverk.Personopplysning", ONE_TO_ONE), - SAMTYKKE("samtykke", "no.fint.model.personvern.samtykke.Samtykke", NONE_TO_MANY), - TJENESTE("tjeneste", "no.fint.model.personvern.samtykke.Tjeneste", ONE_TO_ONE); + BEHANDLINGSGRUNNLAG("behandlingsgrunnlag", "no.novari.fint.model.personvern.kodeverk.Behandlingsgrunnlag", ONE_TO_ONE), + PERSONOPPLYSNING("personopplysning", "no.novari.fint.model.personvern.kodeverk.Personopplysning", ONE_TO_ONE), + SAMTYKKE("samtykke", "no.novari.fint.model.personvern.samtykke.Samtykke", NONE_TO_MANY), + TJENESTE("tjeneste", "no.novari.fint.model.personvern.samtykke.Tjeneste", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Samtykke.java b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Samtykke.java index 20b5d31d..a9436a28 100644 --- a/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Samtykke.java +++ b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Samtykke.java @@ -15,18 +15,18 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Periode; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -35,9 +35,9 @@ public class Samtykke implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - BEHANDLING("behandling", "no.fint.model.personvern.samtykke.Behandling", ONE_TO_ONE), - PERSON("person", "no.fint.model.felles.Person", ONE_TO_ONE), - ORGANISASJONSELEMENT("organisasjonselement", "no.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_ONE); + BEHANDLING("behandling", "no.novari.fint.model.personvern.samtykke.Behandling", ONE_TO_ONE), + PERSON("person", "no.novari.fint.model.felles.Person", ONE_TO_ONE), + ORGANISASJONSELEMENT("organisasjonselement", "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Tjeneste.java b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Tjeneste.java index d54ec594..4bc7ac52 100644 --- a/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Tjeneste.java +++ b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/Tjeneste.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,7 +34,7 @@ public class Tjeneste implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - BEHANDLING("behandling", "no.fint.model.personvern.samtykke.Behandling", NONE_TO_MANY); + BEHANDLING("behandling", "no.novari.fint.model.personvern.samtykke.Behandling", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResource.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResource.java index ed19f39e..6fee547f 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResource.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResources.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResources.java index 53070264..05e07ab8 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResources.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/BehandlingsgrunnlagResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class BehandlingsgrunnlagResources extends AbstractCollectionResources { diff --git a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/PersonopplysningResource.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/PersonopplysningResource.java index a7d0bd30..7322db30 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/PersonopplysningResource.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/PersonopplysningResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/PersonopplysningResources.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/PersonopplysningResources.java index 08a3e634..d8f8889f 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/PersonopplysningResources.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/kodeverk/PersonopplysningResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PersonopplysningResources extends AbstractCollectionResources { diff --git a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/BehandlingResource.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/BehandlingResource.java index 2fbd739e..d6f8eb94 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/BehandlingResource.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/BehandlingResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import java.util.Date; @Data diff --git a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/BehandlingResources.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/BehandlingResources.java index 55a4cc3b..8ba1cdd9 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/BehandlingResources.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/BehandlingResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class BehandlingResources extends AbstractCollectionResources { diff --git a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/SamtykkeResource.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/SamtykkeResource.java index c59302ce..dfd1c6ed 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/SamtykkeResource.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/SamtykkeResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; import java.util.Date; diff --git a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/SamtykkeResources.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/SamtykkeResources.java index 9bf8b74f..b7f8b3f0 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/SamtykkeResources.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/SamtykkeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SamtykkeResources extends AbstractCollectionResources { diff --git a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/TjenesteResource.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/TjenesteResource.java index ae7b05df..33ef2a81 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/TjenesteResource.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/TjenesteResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import java.util.Date; @Data diff --git a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/TjenesteResources.java b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/TjenesteResources.java index 532364c6..c75c11ed 100644 --- a/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/TjenesteResources.java +++ b/fint-personvern-resource-model-java/src/main/java/no/novari/fint/model/resource/personvern/samtykke/TjenesteResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TjenesteResources extends AbstractCollectionResources { diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjon.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjon.java index 44a5b456..5dba6389 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjon.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjon.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,9 +34,9 @@ public class Applikasjon implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - PLATTFORM("plattform", "no.fint.model.ressurs.kodeverk.Plattform", NONE_TO_MANY), - RESSURS("ressurs", "no.fint.model.ressurs.eiendel.Applikasjonsressurs", NONE_TO_MANY), - APPLIKASJONSKATEGORI("applikasjonskategori", "no.fint.model.ressurs.kodeverk.Applikasjonskategori", NONE_TO_MANY); + PLATTFORM("plattform", "no.novari.fint.model.ressurs.kodeverk.Plattform", NONE_TO_MANY), + RESSURS("ressurs", "no.novari.fint.model.ressurs.eiendel.Applikasjonsressurs", NONE_TO_MANY), + APPLIKASJONSKATEGORI("applikasjonskategori", "no.novari.fint.model.ressurs.kodeverk.Applikasjonskategori", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjonsressurs.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjonsressurs.java index 1d6a3902..c394255a 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjonsressurs.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjonsressurs.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,12 +34,12 @@ public class Applikasjonsressurs implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - BRUKERTYPE("brukertype", "no.fint.model.ressurs.kodeverk.Brukertype", ONE_TO_MANY), - HANDHEVINGSTYPE("handhevingstype", "no.fint.model.ressurs.kodeverk.Handhevingstype", NONE_TO_ONE), - LISENSMODELL("lisensmodell", "no.fint.model.ressurs.kodeverk.Lisensmodell", NONE_TO_ONE), - RESSURSTILGJENGELIGHET("ressurstilgjengelighet", "no.fint.model.ressurs.eiendel.Applikasjonsressurstilgjengelighet", NONE_TO_MANY), - EIER("eier", "no.fint.model.administrasjon.organisasjon.Organisasjonselement", ONE_TO_ONE), - APPLIKASJON("applikasjon", "no.fint.model.ressurs.eiendel.Applikasjon", ONE_TO_ONE); + BRUKERTYPE("brukertype", "no.novari.fint.model.ressurs.kodeverk.Brukertype", ONE_TO_MANY), + HANDHEVINGSTYPE("handhevingstype", "no.novari.fint.model.ressurs.kodeverk.Handhevingstype", NONE_TO_ONE), + LISENSMODELL("lisensmodell", "no.novari.fint.model.ressurs.kodeverk.Lisensmodell", NONE_TO_ONE), + RESSURSTILGJENGELIGHET("ressurstilgjengelighet", "no.novari.fint.model.ressurs.eiendel.Applikasjonsressurstilgjengelighet", NONE_TO_MANY), + EIER("eier", "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", ONE_TO_ONE), + APPLIKASJON("applikasjon", "no.novari.fint.model.ressurs.eiendel.Applikasjon", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjonsressurstilgjengelighet.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjonsressurstilgjengelighet.java index 3fe0726f..bc4db968 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjonsressurstilgjengelighet.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/Applikasjonsressurstilgjengelighet.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,8 +34,8 @@ public class Applikasjonsressurstilgjengelighet implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - KONSUMENT("konsument", "no.fint.model.administrasjon.organisasjon.Organisasjonselement", ONE_TO_ONE), - RESSURS("ressurs", "no.fint.model.ressurs.eiendel.Applikasjonsressurs", ONE_TO_ONE); + KONSUMENT("konsument", "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", ONE_TO_ONE), + RESSURS("ressurs", "no.novari.fint.model.ressurs.eiendel.Applikasjonsressurs", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Applikasjonskategori.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Applikasjonskategori.java index ef8718bf..579f7c32 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Applikasjonskategori.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Applikasjonskategori.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Brukertype.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Brukertype.java index 09dbdbd8..1061210b 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Brukertype.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Brukertype.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Handhevingstype.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Handhevingstype.java index 85b22f92..958f3e30 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Handhevingstype.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Handhevingstype.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Lisensmodell.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Lisensmodell.java index c00c9b18..9ed15f50 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Lisensmodell.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Lisensmodell.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Plattform.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Plattform.java index 534a8bc2..746798b7 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Plattform.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Plattform.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/Identitet.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/Identitet.java index dde91302..fb5728c3 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/Identitet.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/Identitet.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,8 +33,8 @@ public class Identitet implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - PERSONALRESSURS("personalressurs", "no.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), - RETTIGHET("rettighet", "no.fint.model.ressurs.tilgang.Rettighet", NONE_TO_MANY); + PERSONALRESSURS("personalressurs", "no.novari.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), + RETTIGHET("rettighet", "no.novari.fint.model.ressurs.tilgang.Rettighet", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/Rettighet.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/Rettighet.java index 9bd60d61..92cf9c15 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/Rettighet.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/Rettighet.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,7 +32,7 @@ public class Rettighet extends Begrep implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - IDENTITET("identitet", "no.fint.model.ressurs.tilgang.Identitet", NONE_TO_MANY); + IDENTITET("identitet", "no.novari.fint.model.ressurs.tilgang.Identitet", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-ressurs-resource-model-java/build.gradle b/fint-ressurs-resource-model-java/build.gradle index 18c86bfd..5847b2c9 100644 --- a/fint-ressurs-resource-model-java/build.gradle +++ b/fint-ressurs-resource-model-java/build.gradle @@ -7,5 +7,5 @@ dependencies { testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") testImplementation('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') - testImplementation('org.springframework.hateoas:spring-hateoas:0.25.1.RELEASE') + testImplementation("org.springframework.hateoas:spring-hateoas:${springHateoasVersion}") } diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonResource.java index 9d4053a7..5ee87cef 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonResources.java index 9cd8d247..ad064837 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ApplikasjonResources extends AbstractCollectionResources { diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResource.java index 125ce6fb..6746a91f 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResources.java index dcdf32ae..68c56c1a 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressursResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ApplikasjonsressursResources extends AbstractCollectionResources { diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResource.java index 142e1648..b441bc63 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResources.java index b53a6cfb..06225475 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/eiendel/ApplikasjonsressurstilgjengelighetResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ApplikasjonsressurstilgjengelighetResources extends AbstractCollectionResources { diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResource.java index 5a433266..64a67426 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResources.java index 501153d1..c8cc901a 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ApplikasjonskategoriResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ApplikasjonskategoriResources extends AbstractCollectionResources { diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/BrukertypeResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/BrukertypeResource.java index 3fe39a7c..2264ec10 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/BrukertypeResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/BrukertypeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/BrukertypeResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/BrukertypeResources.java index c604b648..9c4cb82c 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/BrukertypeResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/BrukertypeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class BrukertypeResources extends AbstractCollectionResources { diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/HandhevingstypeResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/HandhevingstypeResource.java index 7112bc80..c41f00a1 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/HandhevingstypeResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/HandhevingstypeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/HandhevingstypeResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/HandhevingstypeResources.java index 812fc194..65415399 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/HandhevingstypeResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/HandhevingstypeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class HandhevingstypeResources extends AbstractCollectionResources { diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/LisensmodellResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/LisensmodellResource.java index 83deb370..f5e89d80 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/LisensmodellResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/LisensmodellResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/LisensmodellResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/LisensmodellResources.java index 24bb740d..c595c403 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/LisensmodellResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/LisensmodellResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class LisensmodellResources extends AbstractCollectionResources { diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/PlattformResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/PlattformResource.java index 78ce740e..b13a80aa 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/PlattformResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/PlattformResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/PlattformResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/PlattformResources.java index 4fd5ea57..e09dcdff 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/PlattformResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/PlattformResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PlattformResources extends AbstractCollectionResources { diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/IdentitetResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/IdentitetResource.java index e02b66fb..ca32bb6d 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/IdentitetResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/IdentitetResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/IdentitetResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/IdentitetResources.java index cd637e65..6998c742 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/IdentitetResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/IdentitetResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class IdentitetResources extends AbstractCollectionResources { diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/RettighetResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/RettighetResource.java index 9e9f9ff6..05e3f6f1 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/RettighetResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/RettighetResource.java @@ -14,10 +14,10 @@ import java.util.HashMap; import javax.validation.constraints.*; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/RettighetResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/RettighetResources.java index f7928bf4..796bf2fd 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/RettighetResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/tilgang/RettighetResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class RettighetResources extends AbstractCollectionResources { diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Gruppe.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Gruppe.java index dab42395..283216d8 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Gruppe.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Gruppe.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintAbstractObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,9 +34,9 @@ public abstract class Gruppe implements FintAbstractObject { @Getter public enum Relasjonsnavn implements FintRelation { - GREPREFERANSE("grepreferanse", "no.fint.model.utdanning.kodeverk.Grepreferanse", NONE_TO_ONE), - VIGOREFERANSE("vigoreferanse", "no.fint.model.utdanning.kodeverk.Vigoreferanse", NONE_TO_ONE), - MEDLEMSKAP("medlemskap", "no.fint.model.utdanning.elev.Medlemskap", NONE_TO_MANY); + GREPREFERANSE("grepreferanse", "no.novari.fint.model.utdanning.kodeverk.Grepreferanse", NONE_TO_ONE), + VIGOREFERANSE("vigoreferanse", "no.novari.fint.model.utdanning.kodeverk.Vigoreferanse", NONE_TO_ONE), + MEDLEMSKAP("medlemskap", "no.novari.fint.model.utdanning.elev.Medlemskap", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Gruppemedlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Gruppemedlemskap.java index af01e64a..084d9fed 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Gruppemedlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Gruppemedlemskap.java @@ -12,17 +12,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintAbstractObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Utdanningsforhold.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Utdanningsforhold.java index eb9cdee9..af80eb2f 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Utdanningsforhold.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/Utdanningsforhold.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintAbstractObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,7 +33,7 @@ public abstract class Utdanningsforhold implements FintAbstractObject { @Getter public enum Relasjonsnavn implements FintRelation { - MEDLEMSKAP("medlemskap", "no.fint.model.utdanning.elev.Medlemskap", NONE_TO_MANY); + MEDLEMSKAP("medlemskap", "no.novari.fint.model.utdanning.elev.Medlemskap", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Basisgruppe.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Basisgruppe.java index 1fee63b9..405b62c2 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Basisgruppe.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Basisgruppe.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,14 +32,14 @@ public class Basisgruppe extends Gruppe implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - SKOLEAR("skolear", "no.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE), - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", NONE_TO_MANY), - TERMIN("termin", "no.fint.model.utdanning.kodeverk.Termin", NONE_TO_MANY), - TRINN("trinn", "no.fint.model.utdanning.utdanningsprogram.Arstrinn", ONE_TO_ONE), - SKOLE("skole", "no.fint.model.utdanning.utdanningsprogram.Skole", ONE_TO_ONE), - UNDERVISNINGSFORHOLD("undervisningsforhold", "no.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_MANY), - GRUPPEMEDLEMSKAP("gruppemedlemskap", "no.fint.model.utdanning.elev.Basisgruppemedlemskap", NONE_TO_MANY), - KONTAKTLARERGRUPPE("kontaktlarergruppe", "no.fint.model.utdanning.elev.Kontaktlarergruppe", NONE_TO_MANY); + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE), + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", NONE_TO_MANY), + TERMIN("termin", "no.novari.fint.model.utdanning.kodeverk.Termin", NONE_TO_MANY), + TRINN("trinn", "no.novari.fint.model.utdanning.utdanningsprogram.Arstrinn", ONE_TO_ONE), + SKOLE("skole", "no.novari.fint.model.utdanning.utdanningsprogram.Skole", ONE_TO_ONE), + UNDERVISNINGSFORHOLD("undervisningsforhold", "no.novari.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_MANY), + GRUPPEMEDLEMSKAP("gruppemedlemskap", "no.novari.fint.model.utdanning.elev.Basisgruppemedlemskap", NONE_TO_MANY), + KONTAKTLARERGRUPPE("kontaktlarergruppe", "no.novari.fint.model.utdanning.elev.Kontaktlarergruppe", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Basisgruppemedlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Basisgruppemedlemskap.java index 4d1b881e..443ac3b0 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Basisgruppemedlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Basisgruppemedlemskap.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,8 +32,8 @@ public class Basisgruppemedlemskap extends Gruppemedlemskap implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - BASISGRUPPE("basisgruppe", "no.fint.model.utdanning.elev.Basisgruppe", ONE_TO_ONE), - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE); + BASISGRUPPE("basisgruppe", "no.novari.fint.model.utdanning.elev.Basisgruppe", ONE_TO_ONE), + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elev.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elev.java index d9bca174..a8cd20dc 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elev.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elev.java @@ -15,18 +15,18 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Adresse; import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -35,8 +35,8 @@ public class Elev implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - PERSON("person", "no.fint.model.felles.Person", ONE_TO_ONE), - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", NONE_TO_MANY); + PERSON("person", "no.novari.fint.model.felles.Person", ONE_TO_ONE), + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elevforhold.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elevforhold.java index 55fe15ef..3e9c22ff 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elevforhold.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elevforhold.java @@ -15,19 +15,19 @@ import java.util.HashMap; import javax.validation.Valid; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.vurdering.Anmerkninger; import java.util.Date; import no.novari.fint.model.felles.kompleksedatatyper.Periode; import no.novari.fint.model.utdanning.basisklasser.Utdanningsforhold; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -36,37 +36,37 @@ public class Elevforhold extends Utdanningsforhold implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEV("elev", "no.fint.model.utdanning.elev.Elev", ONE_TO_ONE), - SIDEMAL("sidemal", "no.fint.model.utdanning.kodeverk.Fagmerknad", NONE_TO_MANY), - KATEGORI("kategori", "no.fint.model.utdanning.kodeverk.Elevkategori", NONE_TO_ONE), - KROPPSOVING("kroppsoving", "no.fint.model.utdanning.kodeverk.Fagmerknad", NONE_TO_ONE), - SKOLE("skole", "no.fint.model.utdanning.utdanningsprogram.Skole", ONE_TO_ONE), - AVBRUDDSARSAK("avbruddsarsak", "no.fint.model.utdanning.kodeverk.Avbruddsarsak", NONE_TO_MANY), - FRAVARSREGISTRERINGER("fravarsregistreringer", "no.fint.model.utdanning.vurdering.Elevfravar", NONE_TO_ONE), - FAGGRUPPEMEDLEMSKAP("faggruppemedlemskap", "no.fint.model.utdanning.timeplan.Faggruppemedlemskap", NONE_TO_MANY), - SKOLEAR("skolear", "no.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE), - BASISGRUPPE("basisgruppe", "no.fint.model.utdanning.elev.Basisgruppe", NONE_TO_MANY), - BASISGRUPPEMEDLEMSKAP("basisgruppemedlemskap", "no.fint.model.utdanning.elev.Basisgruppemedlemskap", NONE_TO_MANY), - UNDERVISNINGSGRUPPEMEDLEMSKAP("undervisningsgruppemedlemskap", "no.fint.model.utdanning.timeplan.Undervisningsgruppemedlemskap", NONE_TO_MANY), - VURDERING("vurdering", "no.fint.model.utdanning.vurdering.Vurdering", NONE_TO_MANY), - SLUTTORDENSVURDERING("sluttordensvurdering", "no.fint.model.utdanning.vurdering.Sluttordensvurdering", NONE_TO_MANY), - KONTAKTLARERGRUPPE("kontaktlarergruppe", "no.fint.model.utdanning.elev.Kontaktlarergruppe", NONE_TO_MANY), - UNDERVEISFAGVURDERING("underveisfagvurdering", "no.fint.model.utdanning.vurdering.Underveisfagvurdering", NONE_TO_MANY), - HALVARSFAGVURDERING("halvarsfagvurdering", "no.fint.model.utdanning.vurdering.Halvarsfagvurdering", NONE_TO_MANY), - SLUTTFAGVURDERING("sluttfagvurdering", "no.fint.model.utdanning.vurdering.Sluttfagvurdering", NONE_TO_MANY), - PERSONGRUPPEMEDLEMSKAP("persongruppemedlemskap", "no.fint.model.utdanning.elev.Persongruppemedlemskap", NONE_TO_MANY), - EKSAMENSGRUPPEMEDLEMSKAP("eksamensgruppemedlemskap", "no.fint.model.utdanning.vurdering.Eksamensgruppemedlemskap", NONE_TO_MANY), - KONTAKTLARERGRUPPEMEDLEMSKAP("kontaktlarergruppemedlemskap", "no.fint.model.utdanning.elev.Kontaktlarergruppemedlemskap", NONE_TO_MANY), - ELEVFRAVAR("elevfravar", "no.fint.model.utdanning.vurdering.Fravarsoversikt", NONE_TO_MANY), - TILRETTELEGGING("tilrettelegging", "no.fint.model.utdanning.elev.Elevtilrettelegging", NONE_TO_MANY), - HALVARSORDENSVURDERING("halvarsordensvurdering", "no.fint.model.utdanning.vurdering.Halvarsordensvurdering", NONE_TO_MANY), - PROGRAMOMRADE("programomrade", "no.fint.model.utdanning.utdanningsprogram.Programomrade", NONE_TO_ONE), - ELEVVURDERING("elevvurdering", "no.fint.model.utdanning.vurdering.Elevvurdering", NONE_TO_ONE), - FRAVAR("fravar", "no.fint.model.utdanning.vurdering.Fravar", NONE_TO_MANY), - PROGRAMOMRADEMEDLEMSKAP("programomrademedlemskap", "no.fint.model.utdanning.utdanningsprogram.Programomrademedlemskap", NONE_TO_MANY), - UNDERVEISORDENSVURDERING("underveisordensvurdering", "no.fint.model.utdanning.vurdering.Underveisordensvurdering", NONE_TO_MANY), - EKSAMENSGRUPPE("eksamensgruppe", "no.fint.model.utdanning.vurdering.Eksamensgruppe", NONE_TO_MANY), - UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.fint.model.utdanning.timeplan.Undervisningsgruppe", NONE_TO_MANY); + ELEV("elev", "no.novari.fint.model.utdanning.elev.Elev", ONE_TO_ONE), + SIDEMAL("sidemal", "no.novari.fint.model.utdanning.kodeverk.Fagmerknad", NONE_TO_MANY), + KATEGORI("kategori", "no.novari.fint.model.utdanning.kodeverk.Elevkategori", NONE_TO_ONE), + KROPPSOVING("kroppsoving", "no.novari.fint.model.utdanning.kodeverk.Fagmerknad", NONE_TO_ONE), + SKOLE("skole", "no.novari.fint.model.utdanning.utdanningsprogram.Skole", ONE_TO_ONE), + AVBRUDDSARSAK("avbruddsarsak", "no.novari.fint.model.utdanning.kodeverk.Avbruddsarsak", NONE_TO_MANY), + FRAVARSREGISTRERINGER("fravarsregistreringer", "no.novari.fint.model.utdanning.vurdering.Elevfravar", NONE_TO_ONE), + FAGGRUPPEMEDLEMSKAP("faggruppemedlemskap", "no.novari.fint.model.utdanning.timeplan.Faggruppemedlemskap", NONE_TO_MANY), + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE), + BASISGRUPPE("basisgruppe", "no.novari.fint.model.utdanning.elev.Basisgruppe", NONE_TO_MANY), + BASISGRUPPEMEDLEMSKAP("basisgruppemedlemskap", "no.novari.fint.model.utdanning.elev.Basisgruppemedlemskap", NONE_TO_MANY), + UNDERVISNINGSGRUPPEMEDLEMSKAP("undervisningsgruppemedlemskap", "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppemedlemskap", NONE_TO_MANY), + VURDERING("vurdering", "no.novari.fint.model.utdanning.vurdering.Vurdering", NONE_TO_MANY), + SLUTTORDENSVURDERING("sluttordensvurdering", "no.novari.fint.model.utdanning.vurdering.Sluttordensvurdering", NONE_TO_MANY), + KONTAKTLARERGRUPPE("kontaktlarergruppe", "no.novari.fint.model.utdanning.elev.Kontaktlarergruppe", NONE_TO_MANY), + UNDERVEISFAGVURDERING("underveisfagvurdering", "no.novari.fint.model.utdanning.vurdering.Underveisfagvurdering", NONE_TO_MANY), + HALVARSFAGVURDERING("halvarsfagvurdering", "no.novari.fint.model.utdanning.vurdering.Halvarsfagvurdering", NONE_TO_MANY), + SLUTTFAGVURDERING("sluttfagvurdering", "no.novari.fint.model.utdanning.vurdering.Sluttfagvurdering", NONE_TO_MANY), + PERSONGRUPPEMEDLEMSKAP("persongruppemedlemskap", "no.novari.fint.model.utdanning.elev.Persongruppemedlemskap", NONE_TO_MANY), + EKSAMENSGRUPPEMEDLEMSKAP("eksamensgruppemedlemskap", "no.novari.fint.model.utdanning.vurdering.Eksamensgruppemedlemskap", NONE_TO_MANY), + KONTAKTLARERGRUPPEMEDLEMSKAP("kontaktlarergruppemedlemskap", "no.novari.fint.model.utdanning.elev.Kontaktlarergruppemedlemskap", NONE_TO_MANY), + ELEVFRAVAR("elevfravar", "no.novari.fint.model.utdanning.vurdering.Fravarsoversikt", NONE_TO_MANY), + TILRETTELEGGING("tilrettelegging", "no.novari.fint.model.utdanning.elev.Elevtilrettelegging", NONE_TO_MANY), + HALVARSORDENSVURDERING("halvarsordensvurdering", "no.novari.fint.model.utdanning.vurdering.Halvarsordensvurdering", NONE_TO_MANY), + PROGRAMOMRADE("programomrade", "no.novari.fint.model.utdanning.utdanningsprogram.Programomrade", NONE_TO_ONE), + ELEVVURDERING("elevvurdering", "no.novari.fint.model.utdanning.vurdering.Elevvurdering", NONE_TO_ONE), + FRAVAR("fravar", "no.novari.fint.model.utdanning.vurdering.Fravar", NONE_TO_MANY), + PROGRAMOMRADEMEDLEMSKAP("programomrademedlemskap", "no.novari.fint.model.utdanning.utdanningsprogram.Programomrademedlemskap", NONE_TO_MANY), + UNDERVEISORDENSVURDERING("underveisordensvurdering", "no.novari.fint.model.utdanning.vurdering.Underveisordensvurdering", NONE_TO_MANY), + EKSAMENSGRUPPE("eksamensgruppe", "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", NONE_TO_MANY), + UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppe", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elevtilrettelegging.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elevtilrettelegging.java index a5f65de6..d8d363ed 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elevtilrettelegging.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Elevtilrettelegging.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,10 +33,10 @@ public class Elevtilrettelegging implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEV("elev", "no.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), - FAG("fag", "no.fint.model.utdanning.timeplan.Fag", NONE_TO_ONE), - TILRETTELEGGING("tilrettelegging", "no.fint.model.utdanning.kodeverk.Tilrettelegging", ONE_TO_ONE), - EKSAMENSFORM("eksamensform", "no.fint.model.utdanning.kodeverk.Eksamensform", NONE_TO_ONE); + ELEV("elev", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), + FAG("fag", "no.novari.fint.model.utdanning.timeplan.Fag", NONE_TO_ONE), + TILRETTELEGGING("tilrettelegging", "no.novari.fint.model.utdanning.kodeverk.Tilrettelegging", ONE_TO_ONE), + EKSAMENSFORM("eksamensform", "no.novari.fint.model.utdanning.kodeverk.Eksamensform", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Kontaktlarergruppe.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Kontaktlarergruppe.java index 9f952511..c3e3fcbe 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Kontaktlarergruppe.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Kontaktlarergruppe.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,13 +32,13 @@ public class Kontaktlarergruppe extends Gruppe implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - BASISGRUPPE("basisgruppe", "no.fint.model.utdanning.elev.Basisgruppe", ONE_TO_MANY), - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", NONE_TO_MANY), - TERMIN("termin", "no.fint.model.utdanning.kodeverk.Termin", NONE_TO_MANY), - SKOLE("skole", "no.fint.model.utdanning.utdanningsprogram.Skole", ONE_TO_ONE), - SKOLEAR("skolear", "no.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE), - UNDERVISNINGSFORHOLD("undervisningsforhold", "no.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_MANY), - GRUPPEMEDLEMSKAP("gruppemedlemskap", "no.fint.model.utdanning.elev.Kontaktlarergruppemedlemskap", NONE_TO_MANY); + BASISGRUPPE("basisgruppe", "no.novari.fint.model.utdanning.elev.Basisgruppe", ONE_TO_MANY), + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", NONE_TO_MANY), + TERMIN("termin", "no.novari.fint.model.utdanning.kodeverk.Termin", NONE_TO_MANY), + SKOLE("skole", "no.novari.fint.model.utdanning.utdanningsprogram.Skole", ONE_TO_ONE), + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE), + UNDERVISNINGSFORHOLD("undervisningsforhold", "no.novari.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_MANY), + GRUPPEMEDLEMSKAP("gruppemedlemskap", "no.novari.fint.model.utdanning.elev.Kontaktlarergruppemedlemskap", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Kontaktlarergruppemedlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Kontaktlarergruppemedlemskap.java index e176c05c..69adc097 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Kontaktlarergruppemedlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Kontaktlarergruppemedlemskap.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,8 +32,8 @@ public class Kontaktlarergruppemedlemskap extends Gruppemedlemskap implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), - KONTAKTLARERGRUPPE("kontaktlarergruppe", "no.fint.model.utdanning.elev.Kontaktlarergruppe", ONE_TO_ONE); + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), + KONTAKTLARERGRUPPE("kontaktlarergruppe", "no.novari.fint.model.utdanning.elev.Kontaktlarergruppe", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Medlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Medlemskap.java index dda2f7f7..64d7cad2 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Medlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Medlemskap.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,11 +34,11 @@ public class Medlemskap implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - MEDLEM("medlem", "no.fint.model.utdanning.basisklasser.Utdanningsforhold", ONE_TO_ONE), - FORTLOPENDEVURDERING("fortlopendeVurdering", "no.fint.model.utdanning.vurdering.Vurdering", NONE_TO_MANY), - GRUPPE("gruppe", "no.fint.model.utdanning.basisklasser.Gruppe", ONE_TO_ONE), - ENDELIGVURDERING("endeligVurdering", "no.fint.model.utdanning.vurdering.Vurdering", NONE_TO_ONE), - FRAVAR("fravar", "no.fint.model.utdanning.vurdering.Fravar", NONE_TO_MANY); + MEDLEM("medlem", "no.novari.fint.model.utdanning.basisklasser.Utdanningsforhold", ONE_TO_ONE), + FORTLOPENDEVURDERING("fortlopendeVurdering", "no.novari.fint.model.utdanning.vurdering.Vurdering", NONE_TO_MANY), + GRUPPE("gruppe", "no.novari.fint.model.utdanning.basisklasser.Gruppe", ONE_TO_ONE), + ENDELIGVURDERING("endeligVurdering", "no.novari.fint.model.utdanning.vurdering.Vurdering", NONE_TO_ONE), + FRAVAR("fravar", "no.novari.fint.model.utdanning.vurdering.Fravar", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Persongruppe.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Persongruppe.java index de55291a..d643e27f 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Persongruppe.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Persongruppe.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,13 +32,13 @@ public class Persongruppe extends Gruppe implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEV("elev", "no.fint.model.utdanning.elev.Elev", NONE_TO_MANY), - PERSONGRUPPEMEDLEMSKAP("persongruppemedlemskap", "no.fint.model.utdanning.elev.Persongruppemedlemskap", NONE_TO_MANY), - TERMIN("termin", "no.fint.model.utdanning.kodeverk.Termin", NONE_TO_MANY), - UNDERVISNINGSFORHOLD("undervisningsforhold", "no.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_MANY), - SKOLE("skole", "no.fint.model.utdanning.utdanningsprogram.Skole", NONE_TO_MANY), - SKOLERESSURS("skoleressurs", "no.fint.model.utdanning.elev.Skoleressurs", NONE_TO_MANY), - SKOLEAR("skolear", "no.fint.model.utdanning.kodeverk.Skolear", NONE_TO_MANY); + ELEV("elev", "no.novari.fint.model.utdanning.elev.Elev", NONE_TO_MANY), + PERSONGRUPPEMEDLEMSKAP("persongruppemedlemskap", "no.novari.fint.model.utdanning.elev.Persongruppemedlemskap", NONE_TO_MANY), + TERMIN("termin", "no.novari.fint.model.utdanning.kodeverk.Termin", NONE_TO_MANY), + UNDERVISNINGSFORHOLD("undervisningsforhold", "no.novari.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_MANY), + SKOLE("skole", "no.novari.fint.model.utdanning.utdanningsprogram.Skole", NONE_TO_MANY), + SKOLERESSURS("skoleressurs", "no.novari.fint.model.utdanning.elev.Skoleressurs", NONE_TO_MANY), + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Persongruppemedlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Persongruppemedlemskap.java index 492b3df8..271b7669 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Persongruppemedlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Persongruppemedlemskap.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,8 +32,8 @@ public class Persongruppemedlemskap extends Gruppemedlemskap implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", NONE_TO_ONE), - PERSONGRUPPE("persongruppe", "no.fint.model.utdanning.elev.Persongruppe", ONE_TO_ONE); + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", NONE_TO_ONE), + PERSONGRUPPE("persongruppe", "no.novari.fint.model.utdanning.elev.Persongruppe", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Skoleressurs.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Skoleressurs.java index 33f83529..aace5f22 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Skoleressurs.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Skoleressurs.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,11 +33,11 @@ public class Skoleressurs implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - PERSON("person", "no.fint.model.felles.Person", NONE_TO_ONE), - PERSONALRESSURS("personalressurs", "no.fint.model.administrasjon.personal.Personalressurs", ONE_TO_ONE), - UNDERVISNINGSFORHOLD("undervisningsforhold", "no.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_MANY), - SKOLE("skole", "no.fint.model.utdanning.utdanningsprogram.Skole", NONE_TO_MANY), - SENSOR("sensor", "no.fint.model.utdanning.vurdering.Sensor", NONE_TO_MANY); + PERSON("person", "no.novari.fint.model.felles.Person", NONE_TO_ONE), + PERSONALRESSURS("personalressurs", "no.novari.fint.model.administrasjon.personal.Personalressurs", ONE_TO_ONE), + UNDERVISNINGSFORHOLD("undervisningsforhold", "no.novari.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_MANY), + SKOLE("skole", "no.novari.fint.model.utdanning.utdanningsprogram.Skole", NONE_TO_MANY), + SENSOR("sensor", "no.novari.fint.model.utdanning.vurdering.Sensor", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Undervisningsforhold.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Undervisningsforhold.java index 932a35c9..4ad91438 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Undervisningsforhold.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Undervisningsforhold.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Utdanningsforhold; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,14 +32,14 @@ public class Undervisningsforhold extends Utdanningsforhold implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ARBEIDSFORHOLD("arbeidsforhold", "no.fint.model.administrasjon.personal.Arbeidsforhold", ONE_TO_ONE), - BASISGRUPPE("basisgruppe", "no.fint.model.utdanning.elev.Basisgruppe", NONE_TO_MANY), - KONTAKTLARERGRUPPE("kontaktlarergruppe", "no.fint.model.utdanning.elev.Kontaktlarergruppe", NONE_TO_MANY), - UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.fint.model.utdanning.timeplan.Undervisningsgruppe", NONE_TO_MANY), - EKSAMENSGRUPPE("eksamensgruppe", "no.fint.model.utdanning.vurdering.Eksamensgruppe", NONE_TO_MANY), - TIME("time", "no.fint.model.utdanning.timeplan.Time", NONE_TO_MANY), - SKOLE("skole", "no.fint.model.utdanning.utdanningsprogram.Skole", ONE_TO_ONE), - SKOLERESSURS("skoleressurs", "no.fint.model.utdanning.elev.Skoleressurs", ONE_TO_ONE); + ARBEIDSFORHOLD("arbeidsforhold", "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", ONE_TO_ONE), + BASISGRUPPE("basisgruppe", "no.novari.fint.model.utdanning.elev.Basisgruppe", NONE_TO_MANY), + KONTAKTLARERGRUPPE("kontaktlarergruppe", "no.novari.fint.model.utdanning.elev.Kontaktlarergruppe", NONE_TO_MANY), + UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppe", NONE_TO_MANY), + EKSAMENSGRUPPE("eksamensgruppe", "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", NONE_TO_MANY), + TIME("time", "no.novari.fint.model.utdanning.timeplan.Time", NONE_TO_MANY), + SKOLE("skole", "no.novari.fint.model.utdanning.utdanningsprogram.Skole", ONE_TO_ONE), + SKOLERESSURS("skoleressurs", "no.novari.fint.model.utdanning.elev.Skoleressurs", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Varsel.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Varsel.java index 2b634d2f..7b348463 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Varsel.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Varsel.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,10 +34,10 @@ public class Varsel implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - UTSTEDER("utsteder", "no.fint.model.utdanning.elev.Skoleressurs", NONE_TO_ONE), - KARAKTERANSVARLIG("karakteransvarlig", "no.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_ONE), - TYPE("type", "no.fint.model.utdanning.kodeverk.Varseltype", NONE_TO_ONE), - FAGGRUPPEMEDLEMSKAP("faggruppemedlemskap", "no.fint.model.utdanning.timeplan.Faggruppemedlemskap", ONE_TO_ONE); + UTSTEDER("utsteder", "no.novari.fint.model.utdanning.elev.Skoleressurs", NONE_TO_ONE), + KARAKTERANSVARLIG("karakteransvarlig", "no.novari.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_ONE), + TYPE("type", "no.novari.fint.model.utdanning.kodeverk.Varseltype", NONE_TO_ONE), + FAGGRUPPEMEDLEMSKAP("faggruppemedlemskap", "no.novari.fint.model.utdanning.timeplan.Faggruppemedlemskap", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Avbruddsarsak.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Avbruddsarsak.java index b575e80c..e579d76f 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Avbruddsarsak.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Avbruddsarsak.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Betalingsstatus.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Betalingsstatus.java index 97b7f86f..bcef263f 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Betalingsstatus.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Betalingsstatus.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Bevistype.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Bevistype.java index 1b641588..84f9b934 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Bevistype.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Bevistype.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Brevtype.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Brevtype.java index 181cde99..1a1c1d6f 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Brevtype.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Brevtype.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Eksamensform.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Eksamensform.java index 41a009b4..51081055 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Eksamensform.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Eksamensform.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Elevkategori.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Elevkategori.java index 98fa1702..565e83e2 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Elevkategori.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Elevkategori.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fagmerknad.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fagmerknad.java index e0354b64..15d797ed 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fagmerknad.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fagmerknad.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fagstatus.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fagstatus.java index 19834ed1..f5214353 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fagstatus.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fagstatus.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fravarstype.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fravarstype.java index fc1d9141..3da97092 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fravarstype.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fravarstype.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fullfortkode.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fullfortkode.java index 578306a4..321ba60c 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fullfortkode.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Fullfortkode.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Grepreferanse.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Grepreferanse.java index a675e215..74df9000 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Grepreferanse.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Grepreferanse.java @@ -6,15 +6,15 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintReference; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintReference; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Karakterskala.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Karakterskala.java index a0640915..d05cd053 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Karakterskala.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Karakterskala.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,8 +32,8 @@ public class Karakterskala extends Begrep implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - VIGOREFERANSE("vigoreferanse", "no.fint.model.utdanning.kodeverk.Vigoreferanse", NONE_TO_ONE), - VERDI("verdi", "no.fint.model.utdanning.vurdering.Karakterverdi", NONE_TO_MANY); + VIGOREFERANSE("vigoreferanse", "no.novari.fint.model.utdanning.kodeverk.Vigoreferanse", NONE_TO_ONE), + VERDI("verdi", "no.novari.fint.model.utdanning.vurdering.Karakterverdi", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Karakterstatus.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Karakterstatus.java index b5782846..afd532ac 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Karakterstatus.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Karakterstatus.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/OtEnhet.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/OtEnhet.java index 91c7973d..88be8663 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/OtEnhet.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/OtEnhet.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,7 +32,7 @@ public class OtEnhet extends Begrep implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - KOMMUNE("kommune", "no.fint.model.felles.kodeverk.Kommune", ONE_TO_ONE); + KOMMUNE("kommune", "no.novari.fint.model.felles.kodeverk.Kommune", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/OtStatus.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/OtStatus.java index 0daa36ce..2bb97b55 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/OtStatus.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/OtStatus.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Provestatus.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Provestatus.java index d5dc5aeb..7fb55bc9 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Provestatus.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Provestatus.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Skolear.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Skolear.java index 9de6f838..5cee2921 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Skolear.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Skolear.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Skoleeiertype.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Skoleeiertype.java index 0fa24f3b..65df904e 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Skoleeiertype.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Skoleeiertype.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Termin.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Termin.java index 959b3b60..b7ded9c8 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Termin.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Termin.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Tilrettelegging.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Tilrettelegging.java index 7763547e..4e3462d3 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Tilrettelegging.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Tilrettelegging.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Varseltype.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Varseltype.java index 97c64c83..c8d2c879 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Varseltype.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Varseltype.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Vigoreferanse.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Vigoreferanse.java index b48946e0..ce897f47 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Vigoreferanse.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Vigoreferanse.java @@ -6,15 +6,15 @@ import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintReference; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintReference; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Vitnemalsmerknad.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Vitnemalsmerknad.java index 5f288ad3..1eb6c10d 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Vitnemalsmerknad.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/Vitnemalsmerknad.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/AvlagtProve.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/AvlagtProve.java index 630ed410..2476dd07 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/AvlagtProve.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/AvlagtProve.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,11 +34,11 @@ public class AvlagtProve implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - PROVESTATUS("provestatus", "no.fint.model.utdanning.kodeverk.Provestatus", NONE_TO_ONE), - LARLING("larling", "no.fint.model.utdanning.larling.Larling", ONE_TO_ONE), - FULLFORTKODE("fullfortkode", "no.fint.model.utdanning.kodeverk.Fullfortkode", NONE_TO_ONE), - BREVTYPE("brevtype", "no.fint.model.utdanning.kodeverk.Brevtype", NONE_TO_ONE), - BEVISTYPE("bevistype", "no.fint.model.utdanning.kodeverk.Bevistype", NONE_TO_ONE); + PROVESTATUS("provestatus", "no.novari.fint.model.utdanning.kodeverk.Provestatus", NONE_TO_ONE), + LARLING("larling", "no.novari.fint.model.utdanning.larling.Larling", ONE_TO_ONE), + FULLFORTKODE("fullfortkode", "no.novari.fint.model.utdanning.kodeverk.Fullfortkode", NONE_TO_ONE), + BREVTYPE("brevtype", "no.novari.fint.model.utdanning.kodeverk.Brevtype", NONE_TO_ONE), + BEVISTYPE("bevistype", "no.novari.fint.model.utdanning.kodeverk.Bevistype", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/Larling.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/Larling.java index 049d5adb..8c48046e 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/Larling.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/Larling.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,10 +34,10 @@ public class Larling implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - PERSON("person", "no.fint.model.felles.Person", ONE_TO_ONE), - BEDRIFT("bedrift", "no.fint.model.felles.Virksomhet", NONE_TO_ONE), - PROGRAMOMRADE("programomrade", "no.fint.model.utdanning.utdanningsprogram.Programomrade", NONE_TO_ONE), - AVLAGTPROVE("avlagtprove", "no.fint.model.utdanning.larling.AvlagtProve", NONE_TO_MANY); + PERSON("person", "no.novari.fint.model.felles.Person", ONE_TO_ONE), + BEDRIFT("bedrift", "no.novari.fint.model.felles.Virksomhet", NONE_TO_ONE), + PROGRAMOMRADE("programomrade", "no.novari.fint.model.utdanning.utdanningsprogram.Programomrade", NONE_TO_ONE), + AVLAGTPROVE("avlagtprove", "no.novari.fint.model.utdanning.larling.AvlagtProve", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/ot/OtUngdom.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/ot/OtUngdom.java index 12da3f1c..44084967 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/ot/OtUngdom.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/ot/OtUngdom.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,10 +33,10 @@ public class OtUngdom implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - PERSON("person", "no.fint.model.felles.Person", ONE_TO_ONE), - STATUS("status", "no.fint.model.utdanning.kodeverk.OtStatus", NONE_TO_ONE), - ENHET("enhet", "no.fint.model.utdanning.kodeverk.OtEnhet", NONE_TO_ONE), - PROGRAMOMRADE("programomrade", "no.fint.model.utdanning.utdanningsprogram.Programomrade", NONE_TO_ONE); + PERSON("person", "no.novari.fint.model.felles.Person", ONE_TO_ONE), + STATUS("status", "no.novari.fint.model.utdanning.kodeverk.OtStatus", NONE_TO_ONE), + ENHET("enhet", "no.novari.fint.model.utdanning.kodeverk.OtEnhet", NONE_TO_ONE), + PROGRAMOMRADE("programomrade", "no.novari.fint.model.utdanning.utdanningsprogram.Programomrade", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Eksamen.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Eksamen.java index 8b53c48b..8bb6ae73 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Eksamen.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Eksamen.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,8 +34,8 @@ public class Eksamen implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ROM("rom", "no.fint.model.utdanning.timeplan.Rom", NONE_TO_MANY), - EKSAMENSGRUPPE("eksamensgruppe", "no.fint.model.utdanning.vurdering.Eksamensgruppe", NONE_TO_MANY); + ROM("rom", "no.novari.fint.model.utdanning.timeplan.Rom", NONE_TO_MANY), + EKSAMENSGRUPPE("eksamensgruppe", "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Fag.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Fag.java index 009e71b3..f922f683 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Fag.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Fag.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,12 +32,12 @@ public class Fag extends Gruppe implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - PROGRAMOMRADE("programomrade", "no.fint.model.utdanning.utdanningsprogram.Programomrade", NONE_TO_MANY), - TILRETTELEGGING("tilrettelegging", "no.fint.model.utdanning.elev.Elevtilrettelegging", NONE_TO_MANY), - FAGGRUPPE("faggruppe", "no.fint.model.utdanning.timeplan.Faggruppe", NONE_TO_MANY), - SKOLE("skole", "no.fint.model.utdanning.utdanningsprogram.Skole", NONE_TO_MANY), - UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.fint.model.utdanning.timeplan.Undervisningsgruppe", NONE_TO_MANY), - EKSAMENSGRUPPE("eksamensgruppe", "no.fint.model.utdanning.vurdering.Eksamensgruppe", NONE_TO_MANY); + PROGRAMOMRADE("programomrade", "no.novari.fint.model.utdanning.utdanningsprogram.Programomrade", NONE_TO_MANY), + TILRETTELEGGING("tilrettelegging", "no.novari.fint.model.utdanning.elev.Elevtilrettelegging", NONE_TO_MANY), + FAGGRUPPE("faggruppe", "no.novari.fint.model.utdanning.timeplan.Faggruppe", NONE_TO_MANY), + SKOLE("skole", "no.novari.fint.model.utdanning.utdanningsprogram.Skole", NONE_TO_MANY), + UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppe", NONE_TO_MANY), + EKSAMENSGRUPPE("eksamensgruppe", "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Faggruppe.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Faggruppe.java index d86eabee..1697f304 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Faggruppe.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Faggruppe.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,10 +32,10 @@ public class Faggruppe extends Gruppe implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - FAG("fag", "no.fint.model.utdanning.timeplan.Fag", ONE_TO_ONE), - SKOLE("skole", "no.fint.model.utdanning.utdanningsprogram.Skole", NONE_TO_ONE), - SKOLEAR("skolear", "no.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE), - FAGGRUPPEMEDLEMSKAP("faggruppemedlemskap", "no.fint.model.utdanning.timeplan.Faggruppemedlemskap", NONE_TO_MANY); + FAG("fag", "no.novari.fint.model.utdanning.timeplan.Fag", ONE_TO_ONE), + SKOLE("skole", "no.novari.fint.model.utdanning.utdanningsprogram.Skole", NONE_TO_ONE), + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE), + FAGGRUPPEMEDLEMSKAP("faggruppemedlemskap", "no.novari.fint.model.utdanning.timeplan.Faggruppemedlemskap", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Faggruppemedlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Faggruppemedlemskap.java index 546f20b1..b9dd5452 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Faggruppemedlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Faggruppemedlemskap.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,11 +32,11 @@ public class Faggruppemedlemskap extends Gruppemedlemskap implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - FAGMERKNAD("fagmerknad", "no.fint.model.utdanning.kodeverk.Fagmerknad", NONE_TO_ONE), - FAGSTATUS("fagstatus", "no.fint.model.utdanning.kodeverk.Fagstatus", NONE_TO_ONE), - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), - VARSEL("varsel", "no.fint.model.utdanning.elev.Varsel", NONE_TO_MANY), - FAGGRUPPE("faggruppe", "no.fint.model.utdanning.timeplan.Faggruppe", ONE_TO_ONE); + FAGMERKNAD("fagmerknad", "no.novari.fint.model.utdanning.kodeverk.Fagmerknad", NONE_TO_ONE), + FAGSTATUS("fagstatus", "no.novari.fint.model.utdanning.kodeverk.Fagstatus", NONE_TO_ONE), + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), + VARSEL("varsel", "no.novari.fint.model.utdanning.elev.Varsel", NONE_TO_MANY), + FAGGRUPPE("faggruppe", "no.novari.fint.model.utdanning.timeplan.Faggruppe", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Rom.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Rom.java index ddeba5f4..0e3cddf2 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Rom.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Rom.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,8 +33,8 @@ public class Rom implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - TIME("time", "no.fint.model.utdanning.timeplan.Time", NONE_TO_MANY), - EKSAMEN("eksamen", "no.fint.model.utdanning.timeplan.Eksamen", NONE_TO_MANY); + TIME("time", "no.novari.fint.model.utdanning.timeplan.Time", NONE_TO_MANY), + EKSAMEN("eksamen", "no.novari.fint.model.utdanning.timeplan.Eksamen", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Time.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Time.java index 20363222..bc62556d 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Time.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Time.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,9 +34,9 @@ public class Time implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.fint.model.utdanning.timeplan.Undervisningsgruppe", ONE_TO_MANY), - UNDERVISNINGSFORHOLD("undervisningsforhold", "no.fint.model.utdanning.elev.Undervisningsforhold", ONE_TO_MANY), - ROM("rom", "no.fint.model.utdanning.timeplan.Rom", NONE_TO_MANY); + UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppe", ONE_TO_MANY), + UNDERVISNINGSFORHOLD("undervisningsforhold", "no.novari.fint.model.utdanning.elev.Undervisningsforhold", ONE_TO_MANY), + ROM("rom", "no.novari.fint.model.utdanning.timeplan.Rom", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Undervisningsgruppe.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Undervisningsgruppe.java index 04774c79..4ee777cc 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Undervisningsgruppe.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Undervisningsgruppe.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,14 +32,14 @@ public class Undervisningsgruppe extends Gruppe implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", NONE_TO_MANY), - FAG("fag", "no.fint.model.utdanning.timeplan.Fag", ONE_TO_MANY), - TERMIN("termin", "no.fint.model.utdanning.kodeverk.Termin", NONE_TO_MANY), - SKOLE("skole", "no.fint.model.utdanning.utdanningsprogram.Skole", ONE_TO_ONE), - SKOLEAR("skolear", "no.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE), - UNDERVISNINGSFORHOLD("undervisningsforhold", "no.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_MANY), - TIME("time", "no.fint.model.utdanning.timeplan.Time", NONE_TO_MANY), - GRUPPEMEDLEMSKAP("gruppemedlemskap", "no.fint.model.utdanning.timeplan.Undervisningsgruppemedlemskap", NONE_TO_MANY); + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", NONE_TO_MANY), + FAG("fag", "no.novari.fint.model.utdanning.timeplan.Fag", ONE_TO_MANY), + TERMIN("termin", "no.novari.fint.model.utdanning.kodeverk.Termin", NONE_TO_MANY), + SKOLE("skole", "no.novari.fint.model.utdanning.utdanningsprogram.Skole", ONE_TO_ONE), + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE), + UNDERVISNINGSFORHOLD("undervisningsforhold", "no.novari.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_MANY), + TIME("time", "no.novari.fint.model.utdanning.timeplan.Time", NONE_TO_MANY), + GRUPPEMEDLEMSKAP("gruppemedlemskap", "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppemedlemskap", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Undervisningsgruppemedlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Undervisningsgruppemedlemskap.java index d9719bf1..23d344da 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Undervisningsgruppemedlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/Undervisningsgruppemedlemskap.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,8 +32,8 @@ public class Undervisningsgruppemedlemskap extends Gruppemedlemskap implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), - UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.fint.model.utdanning.timeplan.Undervisningsgruppe", ONE_TO_ONE); + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), + UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppe", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Arstrinn.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Arstrinn.java index 31fac4ab..e7dbc768 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Arstrinn.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Arstrinn.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,8 +32,8 @@ public class Arstrinn extends Gruppe implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - PROGRAMOMRADE("programomrade", "no.fint.model.utdanning.utdanningsprogram.Programomrade", NONE_TO_MANY), - BASISGRUPPE("basisgruppe", "no.fint.model.utdanning.elev.Basisgruppe", NONE_TO_MANY); + PROGRAMOMRADE("programomrade", "no.novari.fint.model.utdanning.utdanningsprogram.Programomrade", NONE_TO_MANY), + BASISGRUPPE("basisgruppe", "no.novari.fint.model.utdanning.elev.Basisgruppe", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Programomrade.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Programomrade.java index 8774676f..0210cc51 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Programomrade.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Programomrade.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,11 +32,11 @@ public class Programomrade extends Gruppe implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", NONE_TO_MANY), - UTDANNINGSPROGRAM("utdanningsprogram", "no.fint.model.utdanning.utdanningsprogram.Utdanningsprogram", ONE_TO_MANY), - FAG("fag", "no.fint.model.utdanning.timeplan.Fag", NONE_TO_MANY), - TRINN("trinn", "no.fint.model.utdanning.utdanningsprogram.Arstrinn", NONE_TO_MANY), - GRUPPEMEDLEMSKAP("gruppemedlemskap", "no.fint.model.utdanning.utdanningsprogram.Programomrademedlemskap", NONE_TO_MANY); + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", NONE_TO_MANY), + UTDANNINGSPROGRAM("utdanningsprogram", "no.novari.fint.model.utdanning.utdanningsprogram.Utdanningsprogram", ONE_TO_MANY), + FAG("fag", "no.novari.fint.model.utdanning.timeplan.Fag", NONE_TO_MANY), + TRINN("trinn", "no.novari.fint.model.utdanning.utdanningsprogram.Arstrinn", NONE_TO_MANY), + GRUPPEMEDLEMSKAP("gruppemedlemskap", "no.novari.fint.model.utdanning.utdanningsprogram.Programomrademedlemskap", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Programomrademedlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Programomrademedlemskap.java index 73b6afdb..5e87faae 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Programomrademedlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Programomrademedlemskap.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,8 +32,8 @@ public class Programomrademedlemskap extends Gruppemedlemskap implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), - PROGRAMOMRADE("programomrade", "no.fint.model.utdanning.utdanningsprogram.Programomrade", ONE_TO_ONE); + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), + PROGRAMOMRADE("programomrade", "no.novari.fint.model.utdanning.utdanningsprogram.Programomrade", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Skole.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Skole.java index 6fa6feb2..df4f67bf 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Skole.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Skole.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Enhet; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,19 +34,19 @@ public class Skole extends Enhet implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ORGANISASJON("organisasjon", "no.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_ONE), - FAG("fag", "no.fint.model.utdanning.timeplan.Fag", NONE_TO_MANY), - SKOLEEIERTYPE("skoleeierType", "no.fint.model.utdanning.kodeverk.Skoleeiertype", NONE_TO_ONE), - VIGOREFERANSE("vigoreferanse", "no.fint.model.utdanning.kodeverk.Vigoreferanse", NONE_TO_ONE), - BASISGRUPPE("basisgruppe", "no.fint.model.utdanning.elev.Basisgruppe", NONE_TO_MANY), - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", NONE_TO_MANY), - KONTAKTLARERGRUPPE("kontaktlarergruppe", "no.fint.model.utdanning.elev.Kontaktlarergruppe", NONE_TO_MANY), - SKOLERESSURS("skoleressurs", "no.fint.model.utdanning.elev.Skoleressurs", NONE_TO_MANY), - UNDERVISNINGSFORHOLD("undervisningsforhold", "no.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_MANY), - FAGGRUPPE("faggruppe", "no.fint.model.utdanning.timeplan.Faggruppe", NONE_TO_MANY), - UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.fint.model.utdanning.timeplan.Undervisningsgruppe", NONE_TO_MANY), - EKSAMENSGRUPPE("eksamensgruppe", "no.fint.model.utdanning.vurdering.Eksamensgruppe", NONE_TO_MANY), - UTDANNINGSPROGRAM("utdanningsprogram", "no.fint.model.utdanning.utdanningsprogram.Utdanningsprogram", NONE_TO_MANY); + ORGANISASJON("organisasjon", "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_ONE), + FAG("fag", "no.novari.fint.model.utdanning.timeplan.Fag", NONE_TO_MANY), + SKOLEEIERTYPE("skoleeierType", "no.novari.fint.model.utdanning.kodeverk.Skoleeiertype", NONE_TO_ONE), + VIGOREFERANSE("vigoreferanse", "no.novari.fint.model.utdanning.kodeverk.Vigoreferanse", NONE_TO_ONE), + BASISGRUPPE("basisgruppe", "no.novari.fint.model.utdanning.elev.Basisgruppe", NONE_TO_MANY), + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", NONE_TO_MANY), + KONTAKTLARERGRUPPE("kontaktlarergruppe", "no.novari.fint.model.utdanning.elev.Kontaktlarergruppe", NONE_TO_MANY), + SKOLERESSURS("skoleressurs", "no.novari.fint.model.utdanning.elev.Skoleressurs", NONE_TO_MANY), + UNDERVISNINGSFORHOLD("undervisningsforhold", "no.novari.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_MANY), + FAGGRUPPE("faggruppe", "no.novari.fint.model.utdanning.timeplan.Faggruppe", NONE_TO_MANY), + UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppe", NONE_TO_MANY), + EKSAMENSGRUPPE("eksamensgruppe", "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", NONE_TO_MANY), + UTDANNINGSPROGRAM("utdanningsprogram", "no.novari.fint.model.utdanning.utdanningsprogram.Utdanningsprogram", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Utdanningsprogram.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Utdanningsprogram.java index 7f4662a7..a05c6386 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Utdanningsprogram.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/Utdanningsprogram.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,8 +32,8 @@ public class Utdanningsprogram extends Gruppe implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - SKOLE("skole", "no.fint.model.utdanning.utdanningsprogram.Skole", NONE_TO_MANY), - PROGRAMOMRADE("programomrade", "no.fint.model.utdanning.utdanningsprogram.Programomrade", NONE_TO_MANY); + SKOLE("skole", "no.novari.fint.model.utdanning.utdanningsprogram.Skole", NONE_TO_MANY), + PROGRAMOMRADE("programomrade", "no.novari.fint.model.utdanning.utdanningsprogram.Programomrade", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Anmerkninger.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Anmerkninger.java index 6d788f06..017eacd3 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Anmerkninger.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Anmerkninger.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,7 +33,7 @@ public class Anmerkninger implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - SKOLEAR("skolear", "no.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE); + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensgruppe.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensgruppe.java index 7b488900..473ec1aa 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensgruppe.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensgruppe.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,16 +34,16 @@ public class Eksamensgruppe extends Gruppe implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", NONE_TO_MANY), - EKSAMEN("eksamen", "no.fint.model.utdanning.timeplan.Eksamen", NONE_TO_ONE), - FAG("fag", "no.fint.model.utdanning.timeplan.Fag", ONE_TO_ONE), - SKOLE("skole", "no.fint.model.utdanning.utdanningsprogram.Skole", ONE_TO_ONE), - TERMIN("termin", "no.fint.model.utdanning.kodeverk.Termin", ONE_TO_ONE), - EKSAMENSFORM("eksamensform", "no.fint.model.utdanning.kodeverk.Eksamensform", NONE_TO_ONE), - SKOLEAR("skolear", "no.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE), - UNDERVISNINGSFORHOLD("undervisningsforhold", "no.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_MANY), - GRUPPEMEDLEMSKAP("gruppemedlemskap", "no.fint.model.utdanning.vurdering.Eksamensgruppemedlemskap", NONE_TO_MANY), - SENSOR("sensor", "no.fint.model.utdanning.vurdering.Sensor", NONE_TO_MANY); + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", NONE_TO_MANY), + EKSAMEN("eksamen", "no.novari.fint.model.utdanning.timeplan.Eksamen", NONE_TO_ONE), + FAG("fag", "no.novari.fint.model.utdanning.timeplan.Fag", ONE_TO_ONE), + SKOLE("skole", "no.novari.fint.model.utdanning.utdanningsprogram.Skole", ONE_TO_ONE), + TERMIN("termin", "no.novari.fint.model.utdanning.kodeverk.Termin", ONE_TO_ONE), + EKSAMENSFORM("eksamensform", "no.novari.fint.model.utdanning.kodeverk.Eksamensform", NONE_TO_ONE), + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE), + UNDERVISNINGSFORHOLD("undervisningsforhold", "no.novari.fint.model.utdanning.elev.Undervisningsforhold", NONE_TO_MANY), + GRUPPEMEDLEMSKAP("gruppemedlemskap", "no.novari.fint.model.utdanning.vurdering.Eksamensgruppemedlemskap", NONE_TO_MANY), + SENSOR("sensor", "no.novari.fint.model.utdanning.vurdering.Sensor", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensgruppemedlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensgruppemedlemskap.java index 0ff9ed84..cb61dff9 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensgruppemedlemskap.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensgruppemedlemskap.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,13 +32,13 @@ public class Eksamensgruppemedlemskap extends Gruppemedlemskap implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - DELEGERTTIL("delegertTil", "no.fint.model.felles.kodeverk.Fylke", NONE_TO_ONE), - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), - FORETRUKKETSKOLE("foretrukketSkole", "no.fint.model.utdanning.utdanningsprogram.Skole", NONE_TO_ONE), - EKSAMENSGRUPPE("eksamensgruppe", "no.fint.model.utdanning.vurdering.Eksamensgruppe", ONE_TO_ONE), - NUS("nus", "no.fint.model.utdanning.kodeverk.Karakterstatus", NONE_TO_ONE), - BETALINGSSTATUS("betalingsstatus", "no.fint.model.utdanning.kodeverk.Betalingsstatus", NONE_TO_ONE), - FORETRUKKETSENSOR("foretrukketSensor", "no.fint.model.utdanning.vurdering.Sensor", NONE_TO_ONE); + DELEGERTTIL("delegertTil", "no.novari.fint.model.felles.kodeverk.Fylke", NONE_TO_ONE), + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), + FORETRUKKETSKOLE("foretrukketSkole", "no.novari.fint.model.utdanning.utdanningsprogram.Skole", NONE_TO_ONE), + EKSAMENSGRUPPE("eksamensgruppe", "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", ONE_TO_ONE), + NUS("nus", "no.novari.fint.model.utdanning.kodeverk.Karakterstatus", NONE_TO_ONE), + BETALINGSSTATUS("betalingsstatus", "no.novari.fint.model.utdanning.kodeverk.Betalingsstatus", NONE_TO_ONE), + FORETRUKKETSENSOR("foretrukketSensor", "no.novari.fint.model.utdanning.vurdering.Sensor", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensvurdering.java index ef3e06b6..54590fd1 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Eksamensvurdering.java @@ -14,15 +14,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -31,9 +31,9 @@ public class Eksamensvurdering extends Fagvurdering implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - EKSAMENSGRUPPE("eksamensgruppe", "no.fint.model.utdanning.vurdering.Eksamensgruppe", ONE_TO_ONE), - KARAKTERHISTORIE("karakterhistorie", "no.fint.model.utdanning.vurdering.Karakterhistorie", NONE_TO_ONE), - ELEVVURDERING("elevvurdering", "no.fint.model.utdanning.vurdering.Elevvurdering", ONE_TO_ONE); + EKSAMENSGRUPPE("eksamensgruppe", "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", ONE_TO_ONE), + KARAKTERHISTORIE("karakterhistorie", "no.novari.fint.model.utdanning.vurdering.Karakterhistorie", NONE_TO_ONE), + ELEVVURDERING("elevvurdering", "no.novari.fint.model.utdanning.vurdering.Elevvurdering", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Elevfravar.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Elevfravar.java index 41377917..0039ff9f 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Elevfravar.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Elevfravar.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,8 +33,8 @@ public class Elevfravar implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - FRAVARSREGISTRERING("fravarsregistrering", "no.fint.model.utdanning.vurdering.Fravarsregistrering", NONE_TO_MANY), - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE); + FRAVARSREGISTRERING("fravarsregistrering", "no.novari.fint.model.utdanning.vurdering.Fravarsregistrering", NONE_TO_MANY), + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Elevvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Elevvurdering.java index 308c7d5c..c7747c03 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Elevvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Elevvurdering.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,15 +33,15 @@ public class Elevvurdering implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), - SLUTTFAGVURDERING("sluttfagvurdering", "no.fint.model.utdanning.vurdering.Sluttfagvurdering", NONE_TO_MANY), - UNDERVEISORDENSVURDERING("underveisordensvurdering", "no.fint.model.utdanning.vurdering.Underveisordensvurdering", NONE_TO_MANY), - VITNEMALSMERKNAD("vitnemalsmerknad", "no.fint.model.utdanning.kodeverk.Vitnemalsmerknad", NONE_TO_MANY), - UNDERVEISFAGVURDERING("underveisfagvurdering", "no.fint.model.utdanning.vurdering.Underveisfagvurdering", NONE_TO_MANY), - HALVARSORDENSVURDERING("halvarsordensvurdering", "no.fint.model.utdanning.vurdering.Halvarsordensvurdering", NONE_TO_MANY), - HALVARSFAGVURDERING("halvarsfagvurdering", "no.fint.model.utdanning.vurdering.Halvarsfagvurdering", NONE_TO_MANY), - SLUTTORDENSVURDERING("sluttordensvurdering", "no.fint.model.utdanning.vurdering.Sluttordensvurdering", NONE_TO_MANY), - EKSAMENSVURDERING("eksamensvurdering", "no.fint.model.utdanning.vurdering.Eksamensvurdering", NONE_TO_MANY); + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), + SLUTTFAGVURDERING("sluttfagvurdering", "no.novari.fint.model.utdanning.vurdering.Sluttfagvurdering", NONE_TO_MANY), + UNDERVEISORDENSVURDERING("underveisordensvurdering", "no.novari.fint.model.utdanning.vurdering.Underveisordensvurdering", NONE_TO_MANY), + VITNEMALSMERKNAD("vitnemalsmerknad", "no.novari.fint.model.utdanning.kodeverk.Vitnemalsmerknad", NONE_TO_MANY), + UNDERVEISFAGVURDERING("underveisfagvurdering", "no.novari.fint.model.utdanning.vurdering.Underveisfagvurdering", NONE_TO_MANY), + HALVARSORDENSVURDERING("halvarsordensvurdering", "no.novari.fint.model.utdanning.vurdering.Halvarsordensvurdering", NONE_TO_MANY), + HALVARSFAGVURDERING("halvarsfagvurdering", "no.novari.fint.model.utdanning.vurdering.Halvarsfagvurdering", NONE_TO_MANY), + SLUTTORDENSVURDERING("sluttordensvurdering", "no.novari.fint.model.utdanning.vurdering.Sluttordensvurdering", NONE_TO_MANY), + EKSAMENSVURDERING("eksamensvurdering", "no.novari.fint.model.utdanning.vurdering.Eksamensvurdering", NONE_TO_MANY); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fagvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fagvurdering.java index 1d5cdb95..c07025fd 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fagvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fagvurdering.java @@ -15,18 +15,18 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintAbstractObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -35,10 +35,10 @@ public abstract class Fagvurdering implements FintAbstractObject { @Getter public enum Relasjonsnavn implements FintRelation { - FAG("fag", "no.fint.model.utdanning.timeplan.Fag", ONE_TO_ONE), - UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.fint.model.utdanning.timeplan.Undervisningsgruppe", NONE_TO_ONE), - SKOLEAR("skolear", "no.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE), - KARAKTER("karakter", "no.fint.model.utdanning.vurdering.Karakterverdi", NONE_TO_ONE); + FAG("fag", "no.novari.fint.model.utdanning.timeplan.Fag", ONE_TO_ONE), + UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppe", NONE_TO_ONE), + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE), + KARAKTER("karakter", "no.novari.fint.model.utdanning.vurdering.Karakterverdi", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravar.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravar.java index 3bf94fac..e217b701 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravar.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravar.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -35,11 +35,11 @@ public class Fravar implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), - REGISTRERTAV("registrertav", "no.fint.model.utdanning.elev.Skoleressurs", NONE_TO_ONE), - UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.fint.model.utdanning.timeplan.Undervisningsgruppe", NONE_TO_ONE), - EKSAMENSGRUPPE("eksamensgruppe", "no.fint.model.utdanning.vurdering.Eksamensgruppe", NONE_TO_ONE), - FRAVARSTYPE("fravarstype", "no.fint.model.utdanning.kodeverk.Fravarstype", ONE_TO_ONE); + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), + REGISTRERTAV("registrertav", "no.novari.fint.model.utdanning.elev.Skoleressurs", NONE_TO_ONE), + UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppe", NONE_TO_ONE), + EKSAMENSGRUPPE("eksamensgruppe", "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", NONE_TO_ONE), + FRAVARSTYPE("fravarstype", "no.novari.fint.model.utdanning.kodeverk.Fravarstype", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsoversikt.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsoversikt.java index adf65450..ad1fc11a 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsoversikt.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsoversikt.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,8 +33,8 @@ public class Fravarsoversikt implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), - FAG("fag", "no.fint.model.utdanning.timeplan.Fag", ONE_TO_ONE); + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), + FAG("fag", "no.novari.fint.model.utdanning.timeplan.Fag", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsprosent.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsprosent.java index 8a08adee..dd34da97 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsprosent.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsprosent.java @@ -8,15 +8,15 @@ import lombok.ToString; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintComplexDatatypeObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsregistrering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsregistrering.java index ba60f9ba..989c6150 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsregistrering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravarsregistrering.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,11 +34,11 @@ public class Fravarsregistrering implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - REGISTRERTAV("registrertAv", "no.fint.model.utdanning.elev.Skoleressurs", NONE_TO_ONE), - FAGGRUPPE("faggruppe", "no.fint.model.utdanning.timeplan.Faggruppe", NONE_TO_ONE), - UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.fint.model.utdanning.timeplan.Undervisningsgruppe", ONE_TO_ONE), - FRAVARSTYPE("fravarstype", "no.fint.model.utdanning.kodeverk.Fravarstype", ONE_TO_ONE), - ELEVFRAVAR("elevfravar", "no.fint.model.utdanning.vurdering.Elevfravar", ONE_TO_ONE); + REGISTRERTAV("registrertAv", "no.novari.fint.model.utdanning.elev.Skoleressurs", NONE_TO_ONE), + FAGGRUPPE("faggruppe", "no.novari.fint.model.utdanning.timeplan.Faggruppe", NONE_TO_ONE), + UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppe", ONE_TO_ONE), + FRAVARSTYPE("fravarstype", "no.novari.fint.model.utdanning.kodeverk.Fravarstype", ONE_TO_ONE), + ELEVFRAVAR("elevfravar", "no.novari.fint.model.utdanning.vurdering.Elevfravar", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Halvarsfagvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Halvarsfagvurdering.java index 139c627c..06ad071d 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Halvarsfagvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Halvarsfagvurdering.java @@ -14,15 +14,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -31,8 +31,8 @@ public class Halvarsfagvurdering extends Fagvurdering implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), - ELEVVURDERING("elevvurdering", "no.fint.model.utdanning.vurdering.Elevvurdering", ONE_TO_ONE); + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), + ELEVVURDERING("elevvurdering", "no.novari.fint.model.utdanning.vurdering.Elevvurdering", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Halvarsordensvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Halvarsordensvurdering.java index 7da213a6..f48b4262 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Halvarsordensvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Halvarsordensvurdering.java @@ -14,15 +14,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -31,8 +31,8 @@ public class Halvarsordensvurdering extends Ordensvurdering implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), - ELEVVURDERING("elevvurdering", "no.fint.model.utdanning.vurdering.Elevvurdering", ONE_TO_ONE); + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), + ELEVVURDERING("elevvurdering", "no.novari.fint.model.utdanning.vurdering.Elevvurdering", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Karakterhistorie.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Karakterhistorie.java index a7cb64e3..f488f362 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Karakterhistorie.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Karakterhistorie.java @@ -15,17 +15,17 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,11 +34,11 @@ public class Karakterhistorie implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - OPPDATERTAV("oppdatertAv", "no.fint.model.utdanning.elev.Skoleressurs", NONE_TO_ONE), - OPPRINNELIGKARAKTERVERDI("opprinneligKarakterverdi", "no.fint.model.utdanning.vurdering.Karakterverdi", NONE_TO_ONE), - OPPRINNELIGKARAKTERSTATUS("opprinneligKarakterstatus", "no.fint.model.utdanning.kodeverk.Karakterstatus", NONE_TO_ONE), - KARAKTERVERDI("karakterverdi", "no.fint.model.utdanning.vurdering.Karakterverdi", NONE_TO_ONE), - KARAKTERSTATUS("karakterstatus", "no.fint.model.utdanning.kodeverk.Karakterstatus", NONE_TO_ONE); + OPPDATERTAV("oppdatertAv", "no.novari.fint.model.utdanning.elev.Skoleressurs", NONE_TO_ONE), + OPPRINNELIGKARAKTERVERDI("opprinneligKarakterverdi", "no.novari.fint.model.utdanning.vurdering.Karakterverdi", NONE_TO_ONE), + OPPRINNELIGKARAKTERSTATUS("opprinneligKarakterstatus", "no.novari.fint.model.utdanning.kodeverk.Karakterstatus", NONE_TO_ONE), + KARAKTERVERDI("karakterverdi", "no.novari.fint.model.utdanning.vurdering.Karakterverdi", NONE_TO_ONE), + KARAKTERSTATUS("karakterstatus", "no.novari.fint.model.utdanning.kodeverk.Karakterstatus", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Karakterverdi.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Karakterverdi.java index 2fdff008..f7c50044 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Karakterverdi.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Karakterverdi.java @@ -14,16 +14,16 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -32,7 +32,7 @@ public class Karakterverdi extends Begrep implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - SKALA("skala", "no.fint.model.utdanning.kodeverk.Karakterskala", ONE_TO_ONE); + SKALA("skala", "no.novari.fint.model.utdanning.kodeverk.Karakterskala", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Ordensvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Ordensvurdering.java index 9b8af094..1609ecba 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Ordensvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Ordensvurdering.java @@ -15,18 +15,18 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintAbstractObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; import java.util.Date; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -35,9 +35,9 @@ public abstract class Ordensvurdering implements FintAbstractObject { @Getter public enum Relasjonsnavn implements FintRelation { - ATFERD("atferd", "no.fint.model.utdanning.vurdering.Karakterverdi", ONE_TO_ONE), - ORDEN("orden", "no.fint.model.utdanning.vurdering.Karakterverdi", ONE_TO_ONE), - SKOLEAR("skolear", "no.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE); + ATFERD("atferd", "no.novari.fint.model.utdanning.vurdering.Karakterverdi", ONE_TO_ONE), + ORDEN("orden", "no.novari.fint.model.utdanning.vurdering.Karakterverdi", ONE_TO_ONE), + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sensor.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sensor.java index 20ee3d21..a13428c0 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sensor.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sensor.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -33,8 +33,8 @@ public class Sensor implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - SKOLERESSURS("skoleressurs", "no.fint.model.utdanning.elev.Skoleressurs", ONE_TO_ONE), - EKSAMENSGRUPPE("eksamensgruppe", "no.fint.model.utdanning.vurdering.Eksamensgruppe", ONE_TO_ONE); + SKOLERESSURS("skoleressurs", "no.novari.fint.model.utdanning.elev.Skoleressurs", ONE_TO_ONE), + EKSAMENSGRUPPE("eksamensgruppe", "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sluttfagvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sluttfagvurdering.java index 9b77ffe7..539d8b9c 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sluttfagvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sluttfagvurdering.java @@ -14,15 +14,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -31,10 +31,10 @@ public class Sluttfagvurdering extends Fagvurdering implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), - EKSAMENSGRUPPE("eksamensgruppe", "no.fint.model.utdanning.vurdering.Eksamensgruppe", NONE_TO_ONE), - KARAKTERHISTORIE("karakterhistorie", "no.fint.model.utdanning.vurdering.Karakterhistorie", NONE_TO_MANY), - ELEVVURDERING("elevvurdering", "no.fint.model.utdanning.vurdering.Elevvurdering", ONE_TO_ONE); + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), + EKSAMENSGRUPPE("eksamensgruppe", "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", NONE_TO_ONE), + KARAKTERHISTORIE("karakterhistorie", "no.novari.fint.model.utdanning.vurdering.Karakterhistorie", NONE_TO_MANY), + ELEVVURDERING("elevvurdering", "no.novari.fint.model.utdanning.vurdering.Elevvurdering", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sluttordensvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sluttordensvurdering.java index 8a9d1cc2..c8ab7312 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sluttordensvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Sluttordensvurdering.java @@ -14,15 +14,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -31,8 +31,8 @@ public class Sluttordensvurdering extends Ordensvurdering implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), - ELEVVURDERING("elevvurdering", "no.fint.model.utdanning.vurdering.Elevvurdering", ONE_TO_ONE); + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), + ELEVVURDERING("elevvurdering", "no.novari.fint.model.utdanning.vurdering.Elevvurdering", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Underveisfagvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Underveisfagvurdering.java index 4fb5e692..d8ec393a 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Underveisfagvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Underveisfagvurdering.java @@ -14,15 +14,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -31,8 +31,8 @@ public class Underveisfagvurdering extends Fagvurdering implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), - ELEVVURDERING("elevvurdering", "no.fint.model.utdanning.vurdering.Elevvurdering", ONE_TO_ONE); + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), + ELEVVURDERING("elevvurdering", "no.novari.fint.model.utdanning.vurdering.Elevvurdering", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Underveisordensvurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Underveisordensvurdering.java index 1ec2a10c..ecaa83c5 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Underveisordensvurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Underveisordensvurdering.java @@ -14,15 +14,15 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.FintMultiplicity; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -31,8 +31,8 @@ public class Underveisordensvurdering extends Ordensvurdering implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), - ELEVVURDERING("elevvurdering", "no.fint.model.utdanning.vurdering.Elevvurdering", ONE_TO_ONE); + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE), + ELEVVURDERING("elevvurdering", "no.novari.fint.model.utdanning.vurdering.Elevvurdering", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Vurdering.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Vurdering.java index 5b8e976f..f8697962 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Vurdering.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Vurdering.java @@ -15,16 +15,16 @@ import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.fint.model.FintMultiplicity; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.FintModelObject; -import no.fint.model.FintIdentifikator; -import no.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintRelation; -import static no.fint.model.FintMultiplicity.ONE_TO_ONE; -import static no.fint.model.FintMultiplicity.ONE_TO_MANY; -import static no.fint.model.FintMultiplicity.NONE_TO_ONE; -import static no.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; @Data @NoArgsConstructor @@ -34,11 +34,11 @@ public class Vurdering implements FintModelObject { @Getter public enum Relasjonsnavn implements FintRelation { - ELEVFORHOLD("elevforhold", "no.fint.model.utdanning.elev.Elevforhold", NONE_TO_ONE), - FAG("fag", "no.fint.model.utdanning.timeplan.Fag", NONE_TO_ONE), - UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.fint.model.utdanning.timeplan.Undervisningsgruppe", NONE_TO_ONE), - EKSAMENSGRUPPE("eksamensgruppe", "no.fint.model.utdanning.vurdering.Eksamensgruppe", NONE_TO_ONE), - KARAKTER("karakter", "no.fint.model.utdanning.vurdering.Karakterverdi", ONE_TO_ONE); + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", NONE_TO_ONE), + FAG("fag", "no.novari.fint.model.utdanning.timeplan.Fag", NONE_TO_ONE), + UNDERVISNINGSGRUPPE("undervisningsgruppe", "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppe", NONE_TO_ONE), + EKSAMENSGRUPPE("eksamensgruppe", "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", NONE_TO_ONE), + KARAKTER("karakter", "no.novari.fint.model.utdanning.vurdering.Karakterverdi", ONE_TO_ONE); private final String name; private final String packageName; diff --git a/fint-utdanning-resource-model-java/build.gradle b/fint-utdanning-resource-model-java/build.gradle index d01faa0a..7a2f54b7 100644 --- a/fint-utdanning-resource-model-java/build.gradle +++ b/fint-utdanning-resource-model-java/build.gradle @@ -7,6 +7,6 @@ dependencies { testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") testImplementation('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') - testImplementation('org.springframework.hateoas:spring-hateoas:0.25.1.RELEASE') + testImplementation("org.springframework.hateoas:spring-hateoas:${springHateoasVersion}") testImplementation("org.apache.groovy:groovy-json:4.0.26") } diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppeResource.java index 558fadab..df0b0aca 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppeResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintAbstractObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppeResources.java index 7bb748c0..89d3cc73 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class GruppeResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResource.java index 00c130fc..cae6366e 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintAbstractObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResources.java index 0c4f3fa4..6f305c01 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/GruppemedlemskapResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class GruppemedlemskapResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResource.java index 28aa9a85..2f0f9c19 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintAbstractObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResources.java index da396889..91eeaf89 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/basisklasser/UtdanningsforholdResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class UtdanningsforholdResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppeResource.java index 8939ea99..df3d95a2 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppeResources.java index be575e3e..50a5bdb6 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class BasisgruppeResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResource.java index 62dd9408..8c8cd8bc 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResources.java index 097a9c66..8345fc04 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class BasisgruppemedlemskapResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevResource.java index 1c724963..77ff49b4 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource; import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevResources.java index 66e75626..ef5e6c9d 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ElevResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevforholdResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevforholdResource.java index 93df5e72..d8c72913 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevforholdResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevforholdResource.java @@ -14,10 +14,10 @@ import java.util.HashMap; import javax.validation.Valid; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.utdanning.vurdering.AnmerkningerResource; import java.util.Date; import no.novari.fint.model.felles.kompleksedatatyper.Periode; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevforholdResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevforholdResources.java index 89c4801a..4662b594 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevforholdResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevforholdResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ElevforholdResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevtilretteleggingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevtilretteleggingResource.java index 6a20092f..6d13235d 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevtilretteleggingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevtilretteleggingResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevtilretteleggingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevtilretteleggingResources.java index e9954b87..f0d11e03 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevtilretteleggingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/ElevtilretteleggingResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ElevtilretteleggingResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppeResource.java index baf2390e..6eda2369 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppeResources.java index b98008c0..6373bc9b 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KontaktlarergruppeResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResource.java index a0a484c1..e8be27e4 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResources.java index 4a300da8..496f8011 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KontaktlarergruppemedlemskapResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KontaktlarergruppemedlemskapResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/MedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/MedlemskapResource.java index 4bede302..2ae8d1a5 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/MedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/MedlemskapResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/MedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/MedlemskapResources.java index d648e6f8..7e158ba0 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/MedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/MedlemskapResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor @Deprecated diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppeResource.java index 20a4d273..fb5f2e20 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppeResources.java index 6320cc66..bc56bcc7 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PersongruppeResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppemedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppemedlemskapResource.java index 96a582c8..4b26f729 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppemedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppemedlemskapResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppemedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppemedlemskapResources.java index 6a6fd5f5..3c5a45fa 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppemedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/PersongruppemedlemskapResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PersongruppemedlemskapResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/SkoleressursResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/SkoleressursResource.java index 44f7b55e..e5561313 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/SkoleressursResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/SkoleressursResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/SkoleressursResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/SkoleressursResources.java index 7098e892..e8acb6a8 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/SkoleressursResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/SkoleressursResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SkoleressursResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/UndervisningsforholdResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/UndervisningsforholdResource.java index 35cd1bd3..c400d71e 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/UndervisningsforholdResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/UndervisningsforholdResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.utdanning.basisklasser.UtdanningsforholdResource; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/UndervisningsforholdResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/UndervisningsforholdResources.java index ba6e2149..86b2cb03 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/UndervisningsforholdResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/UndervisningsforholdResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class UndervisningsforholdResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/VarselResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/VarselResource.java index c03b471c..94c7cfa2 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/VarselResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/VarselResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import java.util.Date; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/VarselResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/VarselResources.java index 3656fa3f..e53c3388 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/VarselResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/VarselResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class VarselResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResource.java index 24a20017..4e3a71c8 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResources.java index a580513e..08d85e1e 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/AvbruddsarsakResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AvbruddsarsakResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BetalingsstatusResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BetalingsstatusResource.java index 8552026e..05f195ea 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BetalingsstatusResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BetalingsstatusResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BetalingsstatusResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BetalingsstatusResources.java index 3834bfd2..25e59abb 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BetalingsstatusResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BetalingsstatusResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class BetalingsstatusResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BevistypeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BevistypeResource.java index f97e04b4..58869666 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BevistypeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BevistypeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BevistypeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BevistypeResources.java index 839d6dfb..db1f9aab 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BevistypeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BevistypeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class BevistypeResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BrevtypeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BrevtypeResource.java index 1969a930..9b9dbe8e 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BrevtypeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BrevtypeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BrevtypeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BrevtypeResources.java index be5c8bb5..069d98c7 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BrevtypeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/BrevtypeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class BrevtypeResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/EksamensformResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/EksamensformResource.java index 3b96c15a..4f66e246 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/EksamensformResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/EksamensformResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/EksamensformResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/EksamensformResources.java index f66529ce..e95c9256 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/EksamensformResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/EksamensformResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class EksamensformResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ElevkategoriResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ElevkategoriResource.java index 8f548563..75fcf0e0 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ElevkategoriResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ElevkategoriResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ElevkategoriResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ElevkategoriResources.java index 8b68b657..dcf1de45 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ElevkategoriResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ElevkategoriResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ElevkategoriResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagmerknadResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagmerknadResource.java index 01d32f5a..4d47c832 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagmerknadResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagmerknadResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagmerknadResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagmerknadResources.java index aca29165..dbf4fc88 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagmerknadResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagmerknadResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FagmerknadResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagstatusResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagstatusResource.java index 2c526e25..4fb5af9f 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagstatusResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagstatusResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagstatusResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagstatusResources.java index 82a84d5c..500211b9 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagstatusResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FagstatusResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FagstatusResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FravarstypeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FravarstypeResource.java index 5122bb1d..e89d7a69 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FravarstypeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FravarstypeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FravarstypeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FravarstypeResources.java index cbe05af0..99648545 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FravarstypeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FravarstypeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FravarstypeResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FullfortkodeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FullfortkodeResource.java index e0b5f54c..66dc4783 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FullfortkodeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FullfortkodeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FullfortkodeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FullfortkodeResources.java index a84fd76f..c1509e2a 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FullfortkodeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/FullfortkodeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FullfortkodeResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterskalaResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterskalaResource.java index d5123f52..2e47f242 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterskalaResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterskalaResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterskalaResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterskalaResources.java index 7c19670b..52aae2dd 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterskalaResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterskalaResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KarakterskalaResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterstatusResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterstatusResource.java index ab8142d7..907faefb 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterstatusResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterstatusResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterstatusResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterstatusResources.java index adc0aa14..d3754017 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterstatusResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/KarakterstatusResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KarakterstatusResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtEnhetResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtEnhetResource.java index a08849b1..81834954 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtEnhetResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtEnhetResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtEnhetResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtEnhetResources.java index f01b8667..7e8d8a4d 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtEnhetResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtEnhetResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class OtEnhetResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtStatusResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtStatusResource.java index 61018d67..cecc17cc 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtStatusResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtStatusResource.java @@ -14,10 +14,10 @@ import java.util.HashMap; import javax.validation.constraints.*; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtStatusResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtStatusResources.java index 4b0d9441..c7615dcd 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtStatusResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/OtStatusResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class OtStatusResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ProvestatusResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ProvestatusResource.java index 146c04b2..3a47bded 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ProvestatusResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ProvestatusResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ProvestatusResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ProvestatusResources.java index 2c4a513e..a67efc97 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ProvestatusResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/ProvestatusResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ProvestatusResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkolearResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkolearResource.java index 2dc32dfa..9267f35d 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkolearResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkolearResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkolearResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkolearResources.java index 5d136f06..c2e0abd3 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkolearResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkolearResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SkolearResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResource.java index 73d283f2..066d4286 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResources.java index 26a43886..e00f54ab 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/SkoleeiertypeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SkoleeiertypeResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TerminResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TerminResource.java index 36591162..4492d0bf 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TerminResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TerminResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TerminResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TerminResources.java index 0763b409..ea5ba917 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TerminResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TerminResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TerminResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TilretteleggingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TilretteleggingResource.java index c5ea4f3b..1afe5228 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TilretteleggingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TilretteleggingResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TilretteleggingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TilretteleggingResources.java index efeb52fd..df56cb87 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TilretteleggingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/TilretteleggingResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TilretteleggingResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VarseltypeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VarseltypeResource.java index ffd1de6b..b11d8cea 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VarseltypeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VarseltypeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VarseltypeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VarseltypeResources.java index 725aad01..ca572c81 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VarseltypeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VarseltypeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class VarseltypeResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResource.java index 50234357..baf838e9 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResources.java index 7ddcd7e1..44cde6b4 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/kodeverk/VitnemalsmerknadResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class VitnemalsmerknadResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/AvlagtProveResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/AvlagtProveResource.java index eff05468..ed418df0 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/AvlagtProveResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/AvlagtProveResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import java.util.Date; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/AvlagtProveResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/AvlagtProveResources.java index 335d3df5..c6e03ca9 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/AvlagtProveResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/AvlagtProveResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AvlagtProveResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/LarlingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/LarlingResource.java index 2913bf74..919b172b 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/LarlingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/LarlingResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/LarlingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/LarlingResources.java index 5a9785c1..d021f7b4 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/LarlingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/larling/LarlingResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class LarlingResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/ot/OtUngdomResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/ot/OtUngdomResource.java index 980cf4e9..ab444058 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/ot/OtUngdomResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/ot/OtUngdomResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/ot/OtUngdomResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/ot/OtUngdomResources.java index e02469d4..bca69f15 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/ot/OtUngdomResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/ot/OtUngdomResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class OtUngdomResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/EksamenResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/EksamenResource.java index 332c5481..1fa584d6 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/EksamenResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/EksamenResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/EksamenResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/EksamenResources.java index af6f0529..5d82aa10 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/EksamenResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/EksamenResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class EksamenResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FagResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FagResource.java index ec23e34b..f2932a5a 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FagResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FagResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FagResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FagResources.java index 7298847b..ca9fb969 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FagResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FagResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FagResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppeResource.java index d0b5a5aa..8373f94d 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppeResources.java index 0fd59a2c..fd746291 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FaggruppeResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResource.java index 8072d91f..ed9cea93 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResources.java index 3eaf99c7..1f14cde7 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/FaggruppemedlemskapResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FaggruppemedlemskapResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/RomResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/RomResource.java index e823a879..61836864 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/RomResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/RomResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/RomResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/RomResources.java index 97968f3b..41bfbb5b 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/RomResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/RomResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class RomResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/TimeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/TimeResource.java index ad0256a6..e3ed00bd 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/TimeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/TimeResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/TimeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/TimeResources.java index 943c0d6a..d710459a 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/TimeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/TimeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TimeResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResource.java index b8425d50..d986d671 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResources.java index 202f17b0..0ea2083a 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class UndervisningsgruppeResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResource.java index 1ba52014..6cdbb74c 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResources.java index 0f26aa4f..555bd00d 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/timeplan/UndervisningsgruppemedlemskapResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class UndervisningsgruppemedlemskapResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResource.java index d9bc22c3..68cfea27 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResources.java index 38cf25c7..abe1d702 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ArstrinnResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ArstrinnResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResource.java index aa3b9497..1dcf6960 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResources.java index 7818d664..ce0735c8 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomradeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ProgramomradeResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResource.java index e4acf268..6e1b7ed3 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResources.java index cf77845a..de42d232 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/ProgramomrademedlemskapResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ProgramomrademedlemskapResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/SkoleResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/SkoleResource.java index 5cae00f6..420e9493 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/SkoleResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/SkoleResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.felles.basisklasser.EnhetResource; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/SkoleResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/SkoleResources.java index 148658f8..81b1e869 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/SkoleResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/SkoleResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SkoleResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResource.java index 50aba2ee..5ec517d1 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResources.java index 1d1fef7b..0cf13584 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/utdanningsprogram/UtdanningsprogramResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class UtdanningsprogramResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/AnmerkningerResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/AnmerkningerResource.java index 7e2a715f..0cf9e6a3 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/AnmerkningerResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/AnmerkningerResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/AnmerkningerResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/AnmerkningerResources.java index 876a54ef..de8ce3b6 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/AnmerkningerResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/AnmerkningerResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AnmerkningerResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppeResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppeResource.java index 656fe0ac..7b358868 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppeResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppeResource.java @@ -14,10 +14,10 @@ import java.util.HashMap; import javax.validation.Valid; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import java.util.Date; import no.novari.fint.model.resource.utdanning.basisklasser.GruppeResource; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppeResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppeResources.java index 61fbc80b..1fc37604 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppeResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppeResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class EksamensgruppeResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResource.java index 6b4e4ad4..7f7a23ea 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResources.java index 8d6cbe4a..a52aec71 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensgruppemedlemskapResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class EksamensgruppemedlemskapResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensvurderingResource.java index 6ce9c2f6..0233863c 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensvurderingResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensvurderingResources.java index 510bd448..bd682778 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/EksamensvurderingResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class EksamensvurderingResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevfravarResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevfravarResource.java index 04b506a8..8288d06e 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevfravarResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevfravarResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevfravarResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevfravarResources.java index 07b5228f..5d523fd4 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevfravarResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevfravarResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ElevfravarResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevvurderingResource.java index e51912d7..19d24898 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevvurderingResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevvurderingResources.java index 63d318e6..9e152697 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/ElevvurderingResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ElevvurderingResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FagvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FagvurderingResource.java index 958e0dbb..5414ab5d 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FagvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FagvurderingResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintAbstractObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import java.util.Date; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FagvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FagvurderingResources.java index 9f0c461a..3ba8b894 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FagvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FagvurderingResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FagvurderingResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarResource.java index 95f62ce3..6186cd05 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarResources.java index 8e5b1574..457acd29 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor @Deprecated diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsoversiktResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsoversiktResource.java index 51aa1f52..c6b3e198 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsoversiktResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsoversiktResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.utdanning.vurdering.Fravarsprosent; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsoversiktResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsoversiktResources.java index d40bab6d..aed95958 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsoversiktResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsoversiktResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FravarsoversiktResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsregistreringResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsregistreringResource.java index deb211c2..5f4ed8a2 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsregistreringResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsregistreringResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsregistreringResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsregistreringResources.java index 067b98fb..19a75399 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsregistreringResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarsregistreringResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FravarsregistreringResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResource.java index 68575416..d1a79c00 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResources.java index adedeb73..1de230ee 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsfagvurderingResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class HalvarsfagvurderingResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResource.java index 16e2d40b..8064ea00 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResources.java index 401c600b..044f6309 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/HalvarsordensvurderingResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class HalvarsordensvurderingResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterhistorieResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterhistorieResource.java index 69cb341b..918cf4fd 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterhistorieResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterhistorieResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import java.util.Date; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterhistorieResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterhistorieResources.java index 0995e4ac..290b36f5 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterhistorieResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterhistorieResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KarakterhistorieResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterverdiResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterverdiResource.java index c973baf1..5f8d49f0 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterverdiResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterverdiResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.basisklasser.Begrep; @Data diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterverdiResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterverdiResources.java index f18e2dd7..a60496ab 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterverdiResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/KarakterverdiResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KarakterverdiResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/OrdensvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/OrdensvurderingResource.java index 80e0131c..7d4184bf 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/OrdensvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/OrdensvurderingResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.FintAbstractObject; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; import java.util.Date; diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/OrdensvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/OrdensvurderingResources.java index 23059c47..0444ef0f 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/OrdensvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/OrdensvurderingResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class OrdensvurderingResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SensorResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SensorResource.java index 400cbc49..0fb1cb4e 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SensorResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SensorResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SensorResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SensorResources.java index b9d42456..6d26b95d 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SensorResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SensorResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SensorResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttfagvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttfagvurderingResource.java index ec9440d1..8b472d32 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttfagvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttfagvurderingResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttfagvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttfagvurderingResources.java index a2ae42b0..61db5cd6 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttfagvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttfagvurderingResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SluttfagvurderingResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttordensvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttordensvurderingResource.java index 6f504f36..54db4a8f 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttordensvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttordensvurderingResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttordensvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttordensvurderingResources.java index c6e77f63..19cba38a 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttordensvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/SluttordensvurderingResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SluttordensvurderingResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResource.java index ec46cbde..7e5d3497 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResources.java index 89d42779..bd8f0163 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisfagvurderingResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class UnderveisfagvurderingResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResource.java index 28a8b747..30044266 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResource.java @@ -13,10 +13,10 @@ import java.util.Map; import java.util.HashMap; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResources.java index 0149f973..f9799725 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/UnderveisordensvurderingResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class UnderveisordensvurderingResources extends AbstractCollectionResources { diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/VurderingResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/VurderingResource.java index fcb713d6..1cef2aa8 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/VurderingResource.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/VurderingResource.java @@ -16,10 +16,10 @@ import javax.validation.constraints.*; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.fint.model.resource.FintLinks; -import no.fint.model.resource.FintResource; -import no.fint.model.resource.Link; -import no.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/VurderingResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/VurderingResources.java index 6fff4972..6db7245d 100644 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/VurderingResources.java +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/VurderingResources.java @@ -7,7 +7,7 @@ import java.util.List; import lombok.NoArgsConstructor; -import no.fint.model.resource.AbstractCollectionResources; +import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor @Deprecated diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy index bae427f2..f4501e00 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy +++ b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.databind.util.ISO8601DateFormat import groovy.json.JsonSlurper import no.novari.fint.model.felles.kompleksedatatyper.Identifikator -import no.fint.model.resource.Link +import no.novari.fint.model.resource.Link import no.novari.fint.model.resource.utdanning.elev.BasisgruppeResource import no.novari.fint.model.utdanning.elev.Basisgruppe import no.novari.fint.model.utdanning.elev.Basisgruppemedlemskap diff --git a/gradle.properties b/gradle.properties index c4215046..ec16e956 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,7 @@ version=3.19.0 -springBootVersion=2.7.12 -lombokVersion=1.18.38 +springBootVersion=2.7.18 +lombokVersion=1.18.40 spockSpringVersion=2.4-M6-groovy-4.0 -fintModelResourceVersion=0.5.0 -fintModelCoreVersion=0.5.0 \ No newline at end of file +fintModelResourceVersion=1.0.0-rc-3 +fintModelCoreVersion=1.0.0-rc-2 +springHateoasVersion=0.25.1.RELEASE \ No newline at end of file From a687c847fc7516c129d70ffd0c17f9fdeff6a978 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 17 Sep 2025 13:07:30 +0200 Subject: [PATCH 12/24] Updated test: Basisgruppe -> Klasse --- .../fint/test/model/ModelDeserializationSpec.groovy | 4 ++-- .../fint/test/model/ModelSerializationSpec.groovy | 10 +++++----- .../test/model/SpringModelDeserializationSpec.groovy | 4 ++-- .../src/test/resources/klasse.json | 2 +- .../src/test/resources/klasseresource.json | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy index d247cfde..f17d151a 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy +++ b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy @@ -4,8 +4,8 @@ import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException import no.novari.fint.model.resource.felles.PersonResource -import no.novari.fint.model.resource.utdanning.elev.BasisgruppeResource -import no.novari.fint.model.utdanning.elev.Basisgruppe +import no.novari.fint.model.resource.utdanning.elev.KlasseResource +import no.novari.fint.model.utdanning.elev.Klasse import spock.lang.Specification class ModelDeserializationSpec extends Specification { diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy index f4501e00..077c9888 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy +++ b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy @@ -6,9 +6,9 @@ import com.fasterxml.jackson.databind.util.ISO8601DateFormat import groovy.json.JsonSlurper import no.novari.fint.model.felles.kompleksedatatyper.Identifikator import no.novari.fint.model.resource.Link -import no.novari.fint.model.resource.utdanning.elev.BasisgruppeResource -import no.novari.fint.model.utdanning.elev.Basisgruppe -import no.novari.fint.model.utdanning.elev.Basisgruppemedlemskap +import no.novari.fint.model.resource.utdanning.elev.KlasseResource +import no.novari.fint.model.utdanning.elev.Klasse +import no.novari.fint.model.utdanning.elev.Klassemedlemskap import spock.lang.Specification class ModelSerializationSpec extends Specification { @@ -24,7 +24,7 @@ class ModelSerializationSpec extends Specification { def "Serialize Klasse without Links"() { given: - def klasse = new Basisgruppe( + def klasse = new Klasse( systemId: new Identifikator(identifikatorverdi: "ABC123"), beskrivelse: "Klasse 123", navn: "ABC123" @@ -42,7 +42,7 @@ class ModelSerializationSpec extends Specification { def "Serialize KlasseResource with links"() { given: - def klasse = new BasisgruppeResource( + def klasse = new KlasseResource( systemId: new Identifikator(identifikatorverdi: "ABC123"), beskrivelse: "Klasse 123", navn: "ABC123" diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy index e8c1922e..feb54f0d 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy +++ b/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy @@ -2,7 +2,7 @@ package no.novari.fint.test.model import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.ObjectMapper -import no.novari.fint.model.utdanning.elev.Basisgruppe +import no.novari.fint.model.utdanning.elev.Klasse import no.novari.fint.test.model.utils.TestApplication import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest @@ -20,7 +20,7 @@ class SpringModelDeserializationSpec extends Specification { def input = getClass().getClassLoader().getResourceAsStream("klasseresource.json") when: - def result = objectMapper.readValue(input, new TypeReference>() {}) + def result = objectMapper.readValue(input, new TypeReference>() {}) then: result diff --git a/fint-utdanning-resource-model-java/src/test/resources/klasse.json b/fint-utdanning-resource-model-java/src/test/resources/klasse.json index 826a5877..8879649e 100644 --- a/fint-utdanning-resource-model-java/src/test/resources/klasse.json +++ b/fint-utdanning-resource-model-java/src/test/resources/klasse.json @@ -1,5 +1,5 @@ { - "beskrivelse": "Basisgruppe 123", + "beskrivelse": "Klasse 123", "navn": "ABC123", "systemId": { "identifikatorverdi": "ABC123" diff --git a/fint-utdanning-resource-model-java/src/test/resources/klasseresource.json b/fint-utdanning-resource-model-java/src/test/resources/klasseresource.json index c9f54354..a8b9d40a 100644 --- a/fint-utdanning-resource-model-java/src/test/resources/klasseresource.json +++ b/fint-utdanning-resource-model-java/src/test/resources/klasseresource.json @@ -1,5 +1,5 @@ { - "beskrivelse": "Basisgruppe 123", + "beskrivelse": "Klasse 123", "navn": "ABC123", "systemId": { "identifikatorverdi": "ABC123" From 7c108d200afd5e5b64b0832d8a68daf8a8e479cc Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Thu, 18 Sep 2025 08:52:20 +0200 Subject: [PATCH 13/24] Move tests to dedicated subprojects and upgraded dependencies --- build.gradle | 36 +++++++++++-------- .../build.gradle | 23 ++++++++++++ .../SpringModelDeserializationSpec.groovy | 4 +-- .../test/model/utils/TestApplication.java | 0 .../test/model/utils/TestConfiguration.java | 2 +- .../src/test/resources/fastlonn.json | 0 .../src/test/resources/fastlonnresource.json | 0 .../test/resources/fastlonnresourcelinks.json | 0 .../resources/fastlonnresourceslinks.json | 0 .../build.gradle | 10 ------ .../build.gradle | 21 +++++++++++ .../fint/model/arkiv/test/ModelSpec.groovy | 0 .../src/test/resources/tilskuddfartoy.json | 0 fint-arkiv-resource-model-java/build.gradle | 6 ---- .../build.gradle | 21 +++++++++++ .../model/ModelDeserializationSpec.groovy | 0 .../test/model/ModelSerializationSpec.groovy | 0 .../SpringModelDeserializationSpec.groovy | 8 ++--- .../test/model/utils/TestApplication.java | 0 .../test/model/utils/TestConfiguration.java | 2 +- .../test/resources/kontaktpersonresource.json | 0 .../src/test/resources/person.json | 0 .../src/test/resources/personresource.json | 0 .../test/resources/personresourcelinks.json | 0 .../test/resources/personresourceslinks.json | 0 fint-felles-resource-model-java/build.gradle | 7 ---- fint-ressurs-resource-model-java/build.gradle | 7 ---- .../build.gradle | 22 ++++++++++++ .../SpringModelDeserializationSpec.groovy | 4 +-- .../test/model/utils/TestApplication.java | 0 .../test/model/utils/TestConfiguration.java | 2 +- .../src/test/resources/klasse.json | 0 .../src/test/resources/klasseresource.json | 0 .../src/test/resources/person.json | 0 .../build.gradle | 8 ----- gradle.properties | 3 +- settings.gradle | 5 +++ 37 files changed, 126 insertions(+), 65 deletions(-) create mode 100644 fint-administrasjon-resource-model-java-tests/build.gradle rename {fint-administrasjon-resource-model-java => fint-administrasjon-resource-model-java-tests}/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy (95%) rename {fint-administrasjon-resource-model-java => fint-administrasjon-resource-model-java-tests}/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java (100%) rename {fint-administrasjon-resource-model-java => fint-administrasjon-resource-model-java-tests}/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java (89%) rename {fint-administrasjon-resource-model-java => fint-administrasjon-resource-model-java-tests}/src/test/resources/fastlonn.json (100%) rename {fint-administrasjon-resource-model-java => fint-administrasjon-resource-model-java-tests}/src/test/resources/fastlonnresource.json (100%) rename {fint-administrasjon-resource-model-java => fint-administrasjon-resource-model-java-tests}/src/test/resources/fastlonnresourcelinks.json (100%) rename {fint-administrasjon-resource-model-java => fint-administrasjon-resource-model-java-tests}/src/test/resources/fastlonnresourceslinks.json (100%) create mode 100644 fint-arkiv-resource-model-java-tests/build.gradle rename {fint-arkiv-resource-model-java => fint-arkiv-resource-model-java-tests}/src/test/groovy/no/novari/fint/model/arkiv/test/ModelSpec.groovy (100%) rename {fint-arkiv-resource-model-java => fint-arkiv-resource-model-java-tests}/src/test/resources/tilskuddfartoy.json (100%) create mode 100644 fint-felles-resource-model-java-tests/build.gradle rename {fint-felles-resource-model-java => fint-felles-resource-model-java-tests}/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy (100%) rename {fint-felles-resource-model-java => fint-felles-resource-model-java-tests}/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy (100%) rename {fint-felles-resource-model-java => fint-felles-resource-model-java-tests}/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy (90%) rename {fint-felles-resource-model-java => fint-felles-resource-model-java-tests}/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java (100%) rename {fint-utdanning-resource-model-java => fint-felles-resource-model-java-tests}/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java (89%) rename {fint-felles-resource-model-java => fint-felles-resource-model-java-tests}/src/test/resources/kontaktpersonresource.json (100%) rename {fint-felles-resource-model-java => fint-felles-resource-model-java-tests}/src/test/resources/person.json (100%) rename {fint-felles-resource-model-java => fint-felles-resource-model-java-tests}/src/test/resources/personresource.json (100%) rename {fint-felles-resource-model-java => fint-felles-resource-model-java-tests}/src/test/resources/personresourcelinks.json (100%) rename {fint-felles-resource-model-java => fint-felles-resource-model-java-tests}/src/test/resources/personresourceslinks.json (100%) create mode 100644 fint-utdanning-resource-model-java-tests/build.gradle rename {fint-utdanning-resource-model-java => fint-utdanning-resource-model-java-tests}/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy (92%) rename {fint-utdanning-resource-model-java => fint-utdanning-resource-model-java-tests}/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java (100%) rename {fint-felles-resource-model-java => fint-utdanning-resource-model-java-tests}/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java (89%) rename {fint-utdanning-resource-model-java => fint-utdanning-resource-model-java-tests}/src/test/resources/klasse.json (100%) rename {fint-utdanning-resource-model-java => fint-utdanning-resource-model-java-tests}/src/test/resources/klasseresource.json (100%) rename {fint-utdanning-resource-model-java => fint-utdanning-resource-model-java-tests}/src/test/resources/person.json (100%) diff --git a/build.gradle b/build.gradle index 6210553a..a94a082d 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,6 @@ allprojects { subprojects { apply plugin: 'java-library' apply plugin: 'groovy' - apply plugin: 'maven-publish' configurations { annotationProcessor @@ -42,6 +41,9 @@ subprojects { implementation("com.fasterxml.jackson.core:jackson-annotations:2.20") implementation("com.fasterxml.jackson.core:jackson-core:2.20.0") implementation("javax.validation:validation-api:2.0.1.Final") + + testImplementation(platform("org.junit:junit-bom:5.10.2")) + testRuntimeOnly("org.junit.platform:junit-platform-launcher") } test { @@ -50,22 +52,26 @@ subprojects { } } - publishing { - repositories { - maven { - url = "https://repo.fintlabs.no/releases" - credentials { - username = System.getenv("REPOSILITE_USERNAME") - password = System.getenv("REPOSILITE_PASSWORD") - } - authentication { - basic(BasicAuthentication) + if (!project.name.endsWith('-tests')) { + apply plugin: 'maven-publish' + + publishing { + repositories { + maven { + url = "https://repo.fintlabs.no/releases" + credentials { + username = System.getenv("REPOSILITE_USERNAME") + password = System.getenv("REPOSILITE_PASSWORD") + } + authentication { + basic(BasicAuthentication) + } } } - } - publications { - maven(MavenPublication) { - from(components.java) + publications { + maven(MavenPublication) { + from(components.java) + } } } } diff --git a/fint-administrasjon-resource-model-java-tests/build.gradle b/fint-administrasjon-resource-model-java-tests/build.gradle new file mode 100644 index 00000000..3f8363a5 --- /dev/null +++ b/fint-administrasjon-resource-model-java-tests/build.gradle @@ -0,0 +1,23 @@ +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +dependencies { + api project(":fint-administrasjon-resource-model-java") + api project(":fint-administrasjon-model-java") + api project(":fint-felles-resource-model-java") + + testImplementation("org.spockframework:spock-core:${spockSpringVersion}") + testImplementation("org.spockframework:spock-spring:${spockSpringVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") + testImplementation("org.springframework.hateoas:spring-hateoas:${springHateoasVersion}") + testImplementation("org.apache.groovy:groovy:${groovyVersion}") + testImplementation("org.apache.groovy:groovy-json:${groovyVersion}") +} + +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy b/fint-administrasjon-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy similarity index 95% rename from fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy rename to fint-administrasjon-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy index 2e325eac..86ac9949 100644 --- a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy +++ b/fint-administrasjon-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy @@ -6,7 +6,7 @@ import no.novari.fint.model.administrasjon.personal.Fastlonn import no.novari.fint.test.model.utils.TestApplication import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest -import org.springframework.hateoas.Resource +import org.springframework.hateoas.EntityModel import spock.lang.Specification @SpringBootTest(classes = TestApplication) @@ -20,7 +20,7 @@ class SpringModelDeserializationSpec extends Specification { def input = getClass().getClassLoader().getResourceAsStream("fastlonnresourcelinks.json") when: - def result = objectMapper.readValue(input, new TypeReference>() {}) + def result = objectMapper.readValue(input, new TypeReference>() {}) println(result) then: diff --git a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java b/fint-administrasjon-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java similarity index 100% rename from fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java rename to fint-administrasjon-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java diff --git a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java b/fint-administrasjon-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java similarity index 89% rename from fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java rename to fint-administrasjon-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java index 30f67c1c..f318f21b 100644 --- a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java +++ b/fint-administrasjon-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java @@ -4,7 +4,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; -import org.springframework.hateoas.hal.Jackson2HalModule; +import org.springframework.hateoas.mediatype.hal.Jackson2HalModule; import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; @Configuration diff --git a/fint-administrasjon-resource-model-java/src/test/resources/fastlonn.json b/fint-administrasjon-resource-model-java-tests/src/test/resources/fastlonn.json similarity index 100% rename from fint-administrasjon-resource-model-java/src/test/resources/fastlonn.json rename to fint-administrasjon-resource-model-java-tests/src/test/resources/fastlonn.json diff --git a/fint-administrasjon-resource-model-java/src/test/resources/fastlonnresource.json b/fint-administrasjon-resource-model-java-tests/src/test/resources/fastlonnresource.json similarity index 100% rename from fint-administrasjon-resource-model-java/src/test/resources/fastlonnresource.json rename to fint-administrasjon-resource-model-java-tests/src/test/resources/fastlonnresource.json diff --git a/fint-administrasjon-resource-model-java/src/test/resources/fastlonnresourcelinks.json b/fint-administrasjon-resource-model-java-tests/src/test/resources/fastlonnresourcelinks.json similarity index 100% rename from fint-administrasjon-resource-model-java/src/test/resources/fastlonnresourcelinks.json rename to fint-administrasjon-resource-model-java-tests/src/test/resources/fastlonnresourcelinks.json diff --git a/fint-administrasjon-resource-model-java/src/test/resources/fastlonnresourceslinks.json b/fint-administrasjon-resource-model-java-tests/src/test/resources/fastlonnresourceslinks.json similarity index 100% rename from fint-administrasjon-resource-model-java/src/test/resources/fastlonnresourceslinks.json rename to fint-administrasjon-resource-model-java-tests/src/test/resources/fastlonnresourceslinks.json diff --git a/fint-administrasjon-resource-model-java/build.gradle b/fint-administrasjon-resource-model-java/build.gradle index c33bd292..82019679 100644 --- a/fint-administrasjon-resource-model-java/build.gradle +++ b/fint-administrasjon-resource-model-java/build.gradle @@ -1,14 +1,4 @@ dependencies { api project(":fint-administrasjon-model-java") api project(":fint-felles-resource-model-java") - - testImplementation("org.spockframework:spock-core:${spockSpringVersion}") - testImplementation("org.spockframework:spock-spring:${spockSpringVersion}") - testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") - testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") - testImplementation("org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE") - testImplementation("org.springframework.hateoas:spring-hateoas:${springHateoasVersion}") - testImplementation("org.apache.groovy:groovy:4.0.26") - testImplementation("org.apache.groovy:groovy-json:4.0.26") - } diff --git a/fint-arkiv-resource-model-java-tests/build.gradle b/fint-arkiv-resource-model-java-tests/build.gradle new file mode 100644 index 00000000..0c0a3e46 --- /dev/null +++ b/fint-arkiv-resource-model-java-tests/build.gradle @@ -0,0 +1,21 @@ +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +dependencies { + api project(":fint-arkiv-resource-model-java") + api project(":fint-arkiv-model-java") + api project(":fint-felles-resource-model-java") + + testImplementation("org.spockframework:spock-core:${spockSpringVersion}") + testImplementation("org.spockframework:spock-spring:${spockSpringVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") +} + + +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/fint-arkiv-resource-model-java/src/test/groovy/no/novari/fint/model/arkiv/test/ModelSpec.groovy b/fint-arkiv-resource-model-java-tests/src/test/groovy/no/novari/fint/model/arkiv/test/ModelSpec.groovy similarity index 100% rename from fint-arkiv-resource-model-java/src/test/groovy/no/novari/fint/model/arkiv/test/ModelSpec.groovy rename to fint-arkiv-resource-model-java-tests/src/test/groovy/no/novari/fint/model/arkiv/test/ModelSpec.groovy diff --git a/fint-arkiv-resource-model-java/src/test/resources/tilskuddfartoy.json b/fint-arkiv-resource-model-java-tests/src/test/resources/tilskuddfartoy.json similarity index 100% rename from fint-arkiv-resource-model-java/src/test/resources/tilskuddfartoy.json rename to fint-arkiv-resource-model-java-tests/src/test/resources/tilskuddfartoy.json diff --git a/fint-arkiv-resource-model-java/build.gradle b/fint-arkiv-resource-model-java/build.gradle index dbd53b40..73140d98 100644 --- a/fint-arkiv-resource-model-java/build.gradle +++ b/fint-arkiv-resource-model-java/build.gradle @@ -1,10 +1,4 @@ dependencies { api project(":fint-arkiv-model-java") api project(":fint-felles-resource-model-java") - - testImplementation("org.spockframework:spock-core:${spockSpringVersion}") - testImplementation("org.spockframework:spock-spring:${spockSpringVersion}") - testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") - testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") - testImplementation('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') } diff --git a/fint-felles-resource-model-java-tests/build.gradle b/fint-felles-resource-model-java-tests/build.gradle new file mode 100644 index 00000000..c76e4603 --- /dev/null +++ b/fint-felles-resource-model-java-tests/build.gradle @@ -0,0 +1,21 @@ +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +dependencies { + api project(":fint-felles-resource-model-java") + api project(":fint-felles-model-java") + api("no.novari:fint-model-resource:${fintModelResourceVersion}") + + testImplementation("org.spockframework:spock-spring:${spockSpringVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") + testImplementation("org.springframework.hateoas:spring-hateoas:${springHateoasVersion}") + testImplementation("org.apache.groovy:groovy-json:${groovyVersion}") +} + +test { + useJUnitPlatform() +} diff --git a/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy b/fint-felles-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy similarity index 100% rename from fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy rename to fint-felles-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy diff --git a/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy b/fint-felles-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy similarity index 100% rename from fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy rename to fint-felles-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy diff --git a/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy b/fint-felles-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy similarity index 90% rename from fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy rename to fint-felles-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy index e1e49c11..52b136ae 100644 --- a/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy +++ b/fint-felles-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy @@ -6,8 +6,8 @@ import no.novari.fint.model.felles.Person import no.novari.fint.test.model.utils.TestApplication import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest -import org.springframework.hateoas.Resource -import org.springframework.hateoas.Resources +import org.springframework.hateoas.CollectionModel +import org.springframework.hateoas.EntityModel import spock.lang.Specification @SpringBootTest(classes = TestApplication) @@ -20,7 +20,7 @@ class SpringModelDeserializationSpec extends Specification { def input = getClass().getClassLoader().getResourceAsStream("personresourcelinks.json") when: - def result = objectMapper.readValue(input, new TypeReference>() {}) + def result = objectMapper.readValue(input, new TypeReference>() {}) then: result @@ -35,7 +35,7 @@ class SpringModelDeserializationSpec extends Specification { def input = getClass().getClassLoader().getResourceAsStream("personresourceslinks.json") when: - def result = objectMapper.readValue(input, new TypeReference>() {}) + def result = objectMapper.readValue(input, new TypeReference>() {}) then: result diff --git a/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java b/fint-felles-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java similarity index 100% rename from fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java rename to fint-felles-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java b/fint-felles-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java similarity index 89% rename from fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java rename to fint-felles-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java index 30f67c1c..f318f21b 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java +++ b/fint-felles-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java @@ -4,7 +4,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; -import org.springframework.hateoas.hal.Jackson2HalModule; +import org.springframework.hateoas.mediatype.hal.Jackson2HalModule; import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; @Configuration diff --git a/fint-felles-resource-model-java/src/test/resources/kontaktpersonresource.json b/fint-felles-resource-model-java-tests/src/test/resources/kontaktpersonresource.json similarity index 100% rename from fint-felles-resource-model-java/src/test/resources/kontaktpersonresource.json rename to fint-felles-resource-model-java-tests/src/test/resources/kontaktpersonresource.json diff --git a/fint-felles-resource-model-java/src/test/resources/person.json b/fint-felles-resource-model-java-tests/src/test/resources/person.json similarity index 100% rename from fint-felles-resource-model-java/src/test/resources/person.json rename to fint-felles-resource-model-java-tests/src/test/resources/person.json diff --git a/fint-felles-resource-model-java/src/test/resources/personresource.json b/fint-felles-resource-model-java-tests/src/test/resources/personresource.json similarity index 100% rename from fint-felles-resource-model-java/src/test/resources/personresource.json rename to fint-felles-resource-model-java-tests/src/test/resources/personresource.json diff --git a/fint-felles-resource-model-java/src/test/resources/personresourcelinks.json b/fint-felles-resource-model-java-tests/src/test/resources/personresourcelinks.json similarity index 100% rename from fint-felles-resource-model-java/src/test/resources/personresourcelinks.json rename to fint-felles-resource-model-java-tests/src/test/resources/personresourcelinks.json diff --git a/fint-felles-resource-model-java/src/test/resources/personresourceslinks.json b/fint-felles-resource-model-java-tests/src/test/resources/personresourceslinks.json similarity index 100% rename from fint-felles-resource-model-java/src/test/resources/personresourceslinks.json rename to fint-felles-resource-model-java-tests/src/test/resources/personresourceslinks.json diff --git a/fint-felles-resource-model-java/build.gradle b/fint-felles-resource-model-java/build.gradle index dd90a6b1..961016ce 100644 --- a/fint-felles-resource-model-java/build.gradle +++ b/fint-felles-resource-model-java/build.gradle @@ -1,11 +1,4 @@ dependencies { api project(":fint-felles-model-java") api("no.novari:fint-model-resource:${fintModelResourceVersion}") - - testImplementation("org.spockframework:spock-spring:${spockSpringVersion}") - testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") - testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") - testImplementation('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') - testImplementation("org.springframework.hateoas:spring-hateoas:${springHateoasVersion}") - testImplementation("org.apache.groovy:groovy-json:4.0.26") } diff --git a/fint-ressurs-resource-model-java/build.gradle b/fint-ressurs-resource-model-java/build.gradle index 5847b2c9..9facdcaf 100644 --- a/fint-ressurs-resource-model-java/build.gradle +++ b/fint-ressurs-resource-model-java/build.gradle @@ -1,11 +1,4 @@ dependencies { api project(":fint-ressurs-model-java") api project(":fint-felles-resource-model-java") - - testImplementation("org.spockframework:spock-core:${spockSpringVersion}") - testImplementation("org.spockframework:spock-spring:${spockSpringVersion}") - testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") - testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") - testImplementation('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') - testImplementation("org.springframework.hateoas:spring-hateoas:${springHateoasVersion}") } diff --git a/fint-utdanning-resource-model-java-tests/build.gradle b/fint-utdanning-resource-model-java-tests/build.gradle new file mode 100644 index 00000000..6e1871d3 --- /dev/null +++ b/fint-utdanning-resource-model-java-tests/build.gradle @@ -0,0 +1,22 @@ +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +dependencies { + api project(":fint-utdanning-resource-model-java") + api project(":fint-utdanning-model-java") + api project(":fint-felles-resource-model-java") + + testImplementation("org.spockframework:spock-core:${spockSpringVersion}") + testImplementation("org.spockframework:spock-spring:${spockSpringVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") + testImplementation("org.springframework.hateoas:spring-hateoas:${springHateoasVersion}") + testImplementation("org.apache.groovy:groovy-json:${groovyVersion}") +} + +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy b/fint-utdanning-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy similarity index 92% rename from fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy rename to fint-utdanning-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy index feb54f0d..a5203880 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy +++ b/fint-utdanning-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/SpringModelDeserializationSpec.groovy @@ -6,7 +6,7 @@ import no.novari.fint.model.utdanning.elev.Klasse import no.novari.fint.test.model.utils.TestApplication import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest -import org.springframework.hateoas.Resource +import org.springframework.hateoas.EntityModel import spock.lang.Specification @SpringBootTest(classes = TestApplication) @@ -20,7 +20,7 @@ class SpringModelDeserializationSpec extends Specification { def input = getClass().getClassLoader().getResourceAsStream("klasseresource.json") when: - def result = objectMapper.readValue(input, new TypeReference>() {}) + def result = objectMapper.readValue(input, new TypeReference>() {}) then: result diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java b/fint-utdanning-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java similarity index 100% rename from fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java rename to fint-utdanning-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/utils/TestApplication.java diff --git a/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java b/fint-utdanning-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java similarity index 89% rename from fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java rename to fint-utdanning-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java index 30f67c1c..f318f21b 100644 --- a/fint-felles-resource-model-java/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java +++ b/fint-utdanning-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/utils/TestConfiguration.java @@ -4,7 +4,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; -import org.springframework.hateoas.hal.Jackson2HalModule; +import org.springframework.hateoas.mediatype.hal.Jackson2HalModule; import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; @Configuration diff --git a/fint-utdanning-resource-model-java/src/test/resources/klasse.json b/fint-utdanning-resource-model-java-tests/src/test/resources/klasse.json similarity index 100% rename from fint-utdanning-resource-model-java/src/test/resources/klasse.json rename to fint-utdanning-resource-model-java-tests/src/test/resources/klasse.json diff --git a/fint-utdanning-resource-model-java/src/test/resources/klasseresource.json b/fint-utdanning-resource-model-java-tests/src/test/resources/klasseresource.json similarity index 100% rename from fint-utdanning-resource-model-java/src/test/resources/klasseresource.json rename to fint-utdanning-resource-model-java-tests/src/test/resources/klasseresource.json diff --git a/fint-utdanning-resource-model-java/src/test/resources/person.json b/fint-utdanning-resource-model-java-tests/src/test/resources/person.json similarity index 100% rename from fint-utdanning-resource-model-java/src/test/resources/person.json rename to fint-utdanning-resource-model-java-tests/src/test/resources/person.json diff --git a/fint-utdanning-resource-model-java/build.gradle b/fint-utdanning-resource-model-java/build.gradle index 7a2f54b7..d7fcb47e 100644 --- a/fint-utdanning-resource-model-java/build.gradle +++ b/fint-utdanning-resource-model-java/build.gradle @@ -1,12 +1,4 @@ dependencies { api project(":fint-utdanning-model-java") api project(":fint-felles-resource-model-java") - - testImplementation("org.spockframework:spock-core:${spockSpringVersion}") - testImplementation("org.spockframework:spock-spring:${spockSpringVersion}") - testImplementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") - testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") - testImplementation('org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE') - testImplementation("org.springframework.hateoas:spring-hateoas:${springHateoasVersion}") - testImplementation("org.apache.groovy:groovy-json:4.0.26") } diff --git a/gradle.properties b/gradle.properties index ec16e956..e65d7606 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,5 @@ lombokVersion=1.18.40 spockSpringVersion=2.4-M6-groovy-4.0 fintModelResourceVersion=1.0.0-rc-3 fintModelCoreVersion=1.0.0-rc-2 -springHateoasVersion=0.25.1.RELEASE \ No newline at end of file +springHateoasVersion=1.5.6 +groovyVersion=4.0.26 \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index c619f22b..4ca9ed34 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,8 @@ rootProject.name = 'fint-information-model-java' include 'fint-administrasjon-model-java', 'fint-administrasjon-resource-model-java', 'fint-felles-model-java', 'fint-felles-resource-model-java', 'fint-utdanning-model-java', 'fint-utdanning-resource-model-java', 'fint-arkiv-model-java', 'fint-arkiv-resource-model-java', 'fint-okonomi-model-java', 'fint-okonomi-resource-model-java', 'fint-personvern-model-java', 'fint-personvern-resource-model-java', 'fint-ressurs-model-java', 'fint-ressurs-resource-model-java' + +include 'fint-administrasjon-resource-model-java-tests' +include 'fint-felles-resource-model-java-tests' +include 'fint-arkiv-resource-model-java-tests' +include 'fint-utdanning-resource-model-java-tests' \ No newline at end of file From 5adff19315a209f7b9ecb731fc2a170182778be2 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Thu, 18 Sep 2025 09:27:49 +0200 Subject: [PATCH 14/24] Lets try with Java 21 --- .github/workflows/build.yaml | 4 ++-- .github/workflows/release.yaml | 4 ++-- build.gradle | 2 +- .../no/novari/fint/test/model/ModelDeserializationSpec.groovy | 4 ++-- .../no/novari/fint/test/model/ModelSerializationSpec.groovy | 2 +- .../no/novari/fint/test/model/ModelDeserializationSpec.groovy | 2 +- .../no/novari/fint/test/model/ModelSerializationSpec.groovy | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) rename {fint-administrasjon-resource-model-java => fint-administrasjon-resource-model-java-tests}/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy (99%) rename {fint-administrasjon-resource-model-java => fint-administrasjon-resource-model-java-tests}/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy (98%) rename {fint-utdanning-resource-model-java => fint-utdanning-resource-model-java-tests}/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy (98%) rename {fint-utdanning-resource-model-java => fint-utdanning-resource-model-java-tests}/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy (96%) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 373a6f5a..be03c49e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -9,11 +9,11 @@ jobs: steps: - uses: actions/checkout@v5 - - name: Setup Java 11 + - name: Setup Java 21 uses: actions/setup-java@v5 with: distribution: adopt - java-version: 11 + java-version: 21 - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4772edff..8b9ed7ba 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -17,11 +17,11 @@ jobs: env: TAG_NAME: ${{github.event.release.tag_name}} - - name: Setup Java 11 + - name: Setup Java 21 uses: actions/setup-java@v5 with: distribution: adopt - java-version: 11 + java-version: 21 - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 diff --git a/build.gradle b/build.gradle index a94a082d..37ee6db4 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ apply plugin: 'maven-publish' allprojects { java { toolchain { - languageVersion = JavaLanguageVersion.of(11) + languageVersion = JavaLanguageVersion.of(21) } sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy b/fint-administrasjon-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy similarity index 99% rename from fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy rename to fint-administrasjon-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy index fb0d6e2d..051395d7 100644 --- a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy +++ b/fint-administrasjon-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy @@ -68,7 +68,7 @@ class ModelDeserializationSpec extends Specification { def "Read Fastlonn from fastlonnresource.json with ObjectMapper config"() { given: def input = getClass().getResourceAsStream("/fastlonnresource.json") - objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) when: def result = objectMapper.readValue(input, Fastlonn.class) @@ -120,7 +120,7 @@ class ModelDeserializationSpec extends Specification { def "Read Fastlonn from fastlonnresourcelinks.json with ObjectMapper config"() { given: def input = getClass().getResourceAsStream("/fastlonnresourcelinks.json") - objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) when: def result = objectMapper.readValue(input, Fastlonn.class) diff --git a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy b/fint-administrasjon-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy similarity index 98% rename from fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy rename to fint-administrasjon-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy index c95c3e49..3c24b141 100644 --- a/fint-administrasjon-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy +++ b/fint-administrasjon-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy @@ -20,7 +20,7 @@ class ModelSerializationSpec extends Specification { void setup() { objectMapper = new ObjectMapper() objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false) - objectMapper.setDateFormat(new ISO8601DateFormat()); + objectMapper.setDateFormat(new ISO8601DateFormat()) jsonSlurper = new JsonSlurper() } diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy b/fint-utdanning-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy similarity index 98% rename from fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy rename to fint-utdanning-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy index f17d151a..dac6093b 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy +++ b/fint-utdanning-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/ModelDeserializationSpec.groovy @@ -56,7 +56,7 @@ class ModelDeserializationSpec extends Specification { def "Read Klasse from klasseresource.json with ObjectMapper config"() { given: def input = getClass().getResourceAsStream("/klasseresource.json") - objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) when: def result = objectMapper.readValue(input, Klasse.class) diff --git a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy b/fint-utdanning-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy similarity index 96% rename from fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy rename to fint-utdanning-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy index 077c9888..fd9e87e6 100644 --- a/fint-utdanning-resource-model-java/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy +++ b/fint-utdanning-resource-model-java-tests/src/test/groovy/no/novari/fint/test/model/ModelSerializationSpec.groovy @@ -18,7 +18,7 @@ class ModelSerializationSpec extends Specification { void setup() { objectMapper = new ObjectMapper() objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false) - objectMapper.setDateFormat(new ISO8601DateFormat()); + objectMapper.setDateFormat(new ISO8601DateFormat()) jsonSlurper = new JsonSlurper() } From feedeb897e4f2c1c0710540be3ab7d6f0fcab44c Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Thu, 18 Sep 2025 09:38:30 +0200 Subject: [PATCH 15/24] Upgraded Gradle --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3994438e..3ae1e2f1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 1dd96b85da002ff3eaf9bcd4e066746a1b11ff88 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Thu, 18 Sep 2025 10:26:52 +0200 Subject: [PATCH 16/24] Upgrade Spring Boot --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e65d7606..e07e64c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ version=3.19.0 -springBootVersion=2.7.18 +springBootVersion=3.5.5 lombokVersion=1.18.40 spockSpringVersion=2.4-M6-groovy-4.0 fintModelResourceVersion=1.0.0-rc-3 From d28001d1de23f31c3b430cabff7eeed4a8060462 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 10 Dec 2025 15:52:31 +0100 Subject: [PATCH 17/24] Not necessary when using option.release --- build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index 37ee6db4..ee231407 100644 --- a/build.gradle +++ b/build.gradle @@ -10,8 +10,6 @@ allprojects { toolchain { languageVersion = JavaLanguageVersion.of(21) } - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 } tasks.withType(JavaCompile).configureEach { From dde3f653810274ea5e9611b632637cf0db95c13f Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 10 Dec 2025 15:57:00 +0100 Subject: [PATCH 18/24] Upgraded some dependencies --- build.gradle | 3 ++- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index ee231407..a6b7ded9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.github.ben-manes.versions' version '0.27.0' + id 'com.github.ben-manes.versions' version '0.51.0' } apply plugin: 'java-library' @@ -14,6 +14,7 @@ allprojects { tasks.withType(JavaCompile).configureEach { options.release = 8 + options.compilerArgs += ['-Xlint:-options'] } project.group = 'no.novari' diff --git a/gradle.properties b/gradle.properties index e07e64c7..52798176 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ version=3.19.0 -springBootVersion=3.5.5 +springBootVersion=3.5.7 lombokVersion=1.18.40 spockSpringVersion=2.4-M6-groovy-4.0 fintModelResourceVersion=1.0.0-rc-3 From 422e1d4c49a641a2997c9bc07ee761d8581ea073 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 10 Dec 2025 15:57:47 +0100 Subject: [PATCH 19/24] Adjustment on maven publish --- build.gradle | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index a6b7ded9..ac779a6d 100644 --- a/build.gradle +++ b/build.gradle @@ -57,19 +57,16 @@ subprojects { publishing { repositories { maven { - url = "https://repo.fintlabs.no/releases" + url "https://repo.fintlabs.no/releases" credentials { - username = System.getenv("REPOSILITE_USERNAME") - password = System.getenv("REPOSILITE_PASSWORD") - } - authentication { - basic(BasicAuthentication) + username System.getenv("REPOSILITE_USERNAME") + password System.getenv("REPOSILITE_PASSWORD") } } } publications { - maven(MavenPublication) { - from(components.java) + create('maven', MavenPublication) { + from components.java } } } From 6b7233d1fe0299cfc255efe776164bc4c9d6e3f2 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Fri, 9 Jan 2026 12:34:22 +0100 Subject: [PATCH 20/24] Upgrade to gradle 9 --- build.gradle | 7 +- gradle/wrapper/gradle-wrapper.jar | Bin 56177 -> 45633 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 302 ++++++++++++++--------- gradlew.bat | 79 +++--- 5 files changed, 240 insertions(+), 152 deletions(-) diff --git a/build.gradle b/build.gradle index ac779a6d..8edd5e7e 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,7 @@ allprojects { toolchain { languageVersion = JavaLanguageVersion.of(21) } + withSourcesJar() } tasks.withType(JavaCompile).configureEach { @@ -57,10 +58,10 @@ subprojects { publishing { repositories { maven { - url "https://repo.fintlabs.no/releases" + url = "https://repo.fintlabs.no/releases" credentials { - username System.getenv("REPOSILITE_USERNAME") - password System.getenv("REPOSILITE_PASSWORD") + username = System.getenv("REPOSILITE_USERNAME") + password = System.getenv("REPOSILITE_PASSWORD") } } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 94336fcae912db8a11d55634156fa011f4686124..f8e1ee3125fe0768e9a76ee977ac089eb657005e 100644 GIT binary patch literal 45633 zcma&NV|1n6wyqu9PQ|uu+csuwn-$x(T~Woh?Nr6KUD3(A)@l1Yd+oj6Z_U=8`RAE` z#vE6_`?!1WLs1443=Ieh3JM4ai0JG2|2{}S&_HrxszP*9^5P7#QX*pVDq?D?;6T8C z{bWO1$9at%!*8ax*TT&F99vwf1Ls+3lklsb|bC`H`~Q z_w}*E9P=Wq;PYlGYhZ^lt#N97bt5aZ#mQcOr~h^B;R>f-b0gf{y(;VA{noAt`RZzU z7vQWD{%|q!urW2j0Z&%ChtL(^9m` zgaU%|B;V#N_?%iPvu0PVkX=1m9=*SEGt-Lp#&Jh%rz6EJXlV^O5B5YfM5j{PCeElx z8sipzw8d=wVhFK+@mgrWyA)Sv3BJq=+q+cL@=wuH$2;LjY z^{&+X4*HFA0{QvlM_V4PTQjIdd;d|2YuN;s|bi!@<)r-G%TuOCHz$O(_-K z)5in&6uNN<0UfwY=K>d;cL{{WK2FR|NihJMN0Q4X+(1lE)$kY?T$7UWleIU`i zQG#X-&&m-8x^(;n@o}$@vPMYRoq~|FqC~CU3MnoiifD{(CwAGd%X#kFHq#4~%_a!{ zeX{XXDT#(DvX7NtAs7S}2ZuiZ>gtd;tCR7E)3{J^`~#Vd**9qz%~JRFAiZf{zt|Dr zvQw!)n7fNUn_gH`o9?8W8t_%x6~=y*`r46bjj(t{YU*qfqd}J}*mkgUfsXTI>Uxl6 z)Fj>#RMy{`wINIR;{_-!xGLgVaTfNJ2-)%YUfO&X5z&3^E#4?k-_|Yv$`fpgYkvnA%E{CiV zP|-zAf8+1@R`sT{rSE#)-nuU7Pwr-z>0_+CLQT|3vc-R22ExKT4ym@Gj77j$aTVns zp4Kri#Ml?t7*n(;>nkxKdhOU9Qbwz%*#i9_%K<`m4T{3aPbQ?J(Mo`6E5cDdbAk%X z+4bN%E#a(&ZXe{G#V!2Nt+^L$msKVHP z|APpBhq7knz(O2yY)$$VyI_Xg4UIC*$!i7qQG~KEZnO@Q1i89@4ZKW*3^Wh?o?zSkfPxdhnTxlO!3tAqe_ zuEqHVcAk3uQIFTpP~C{d$?>7yt3G3Fo>syXTus>o0tJdFpQWC27hDiwC%O09i|xCq z@H6l|+maB;%CYQIChyhu;PVYz9e&5a@EEQs3$DS6dLIS+;N@I0)V}%B`jdYv;JDck zd|xxp(I?aedivE7*19hesoa-@Xm$^EHbbVmh$2^W-&aTejsyc$i+}A#n2W*&0Qt`5 zJS!2A|LVV;L!(*x2N)GjJC;b1RB_f(#D&g_-};a*|BTRvfdIX}Gau<;uCylMNC;UG zzL((>6KQBQ01wr%7u9qI2HLEDY!>XisIKb#6=F?pAz)!_JX}w|>1V>X^QkMdFi@Jr z`1N*V4xUl{qvECHoF?#lXuO#Dg2#gh|AU$Wc=nuIbmVPBEGd(R#&Z`TP9*o%?%#ob zWN%ByU+55yBNfjMjkJnBjT!cVDi}+PR3N&H(f8$d^Pu;A_WV*{)c2Q{IiE7&LPsd4 z!rvkUf{sco_WNSIdW+btM#O+4n`JiceH6%`7pDV zRqJ@lj=Dt(e-Gkz$b!c2>b)H$lf(fuAPdIsLSe(dZ4E~9+Ge!{3j~>nS%r)eQZ;Iq ztWGpp=2Ptc!LK_TQ8cgJXUlU5mRu|7F2{eu*;a>_5S<;bus=t*IXcfzJRPv4xIs;s zt2<&}OM>KxkTxa=dFMfNr42=DL~I}6+_{`HT_YJBiWkpVZND1Diad~Yr*Fuq{zljr z*_+jXk=qVBdwlQkYuIrB4GG*#voba$?h*u0uRNL+87-?AjzG2X_R9mzQ7BJEawutObr|ey~%in>6k%A`K*`pb-|DF5m})!`b=~osoiW2)IFh?_y9y<3Cix_ znvC=bjBX1J820!%%9FaB@v?hAsd05e@w$^ZAvtUp*=Bi+Owkl?rLa6F#yl{s+?563 zmn2 zV95%gySAJ$L!Vvk4kx!n@mo`3Mfi`2lXUkBmd%)u)7C?Pa;oK~zUQ#p0u{a|&0;zNO#9a4`v^3df90X#~l_k$q7n&L5 z?TszF842~g+}tgUP}UG?ObLCE1(Js_$e>XS7m%o7j@@VdxePtg)w{i5an+xK95r?s zDeEhgMO-2$H?@0{p-!4NJ)}zP+3LzZB?FVap)ObHV6wp}Lrxvz$cjBND1T6ln$EfJ zZRPeR2lP}K0p8x`ahxB??Ud;i7$Y5X!5}qBFS+Zp=P^#)08nQi_HuJcN$0=x;2s53 zwoH}He9BlKT4GdWfWt)@o@$4zN$B@5gVIN~aHtwIhh{O$uHiMgYl=&Vd$w#B2 zRv+xK3>4E{!)+LXA2#*K6H~HpovXAQeXV(^Pd%G_>ro0(4_@`{2Ag(+8{9pqJ>Co$ zRRV(oX;nD+Jel_2^BlNO=cQP8q*G#~R3PTERUxvug_C4T3qwb9MQE|^{5(H*nt`fn z^%*p-RwkAhT6(r>E@5w8FaB)Q<{#`H9fTdc6QBuSr9D-x!Tb9f?wI=M{^$cB5@1;0 z+yLHh?3^c-Qte@JI<SW`$bs5Vv9!yWjJD%oY z8Cdc$a(LLy@tB2)+rUCt&0$&+;&?f~W6+3Xk3g zy9L�|d9Zj^A1Dgv5yzCONAB>8LM`TRL&7v_NKg(bEl#y&Z$py}mu<4DrT@8HHjE zqD@4|aM>vt!Yvc2;9Y#V;KJ8M>vPjiS2ycq52qkxInUK*QqA3$&OJ`jZBo zpzw&PT%w0$D94KD%}VN9c)eCueh1^)utGt2OQ+DP(BXszodfc1kFPWl~BQ5Psy*d`UIf zc}zQ8TVw35jdCSc78)MljC-g3$GX2$<0<3MEQXS&i<(ZFClz9WlL}}?%u>S2hhEk_ zyzfm&@Q%YVB-vw3KH|lU#c_)0aeG^;aDG&!bwfOz_9)6gLe;et;h(?*0d-RV0V)1l zzliq#`b9Y*c`0!*6;*mU@&EFSbW>9>L5xUX+unp%@tCW#kLfz)%3vwN{1<-R*g+B_C^W8)>?n%G z<#+`!wU$L&dn)Pz(9DGGI%RlmM2RpeDy9)31OZV$c2T>-Jl&4$6nul&e7){1u-{nP zE$uZs%gyanu+yBcAb+jTYGy(^<;&EzeLeqveN12Lvv)FQFn0o&*qAaH+gLJ)*xT9y z>`Y`W?M#K7%w26w?Oen>j7=R}EbZ;+jcowV&i}P|IfW^C5GJHt5D;Q~)|=gW3iQ;N zQGl4SQFtz=&~BGon6hO@mRnjpmM79ye^LY_L2no{f_M?j80pr`o3BrI7ice#8#Zt4 zO45G97Hpef+AUEU%jN-dLmPYHY(|t#D)9|IeB^i1X|eEq+ymld_Uj$l^zVAPRilx- z^II$sL4G~{^7?sik2BK7;ZV-VIVhrKjUxBIsf^N&K`)5;PjVg-DTm1Xtw4-tGtElU zJgVTCk4^N4#-kPuX=7p~GMf5Jj5A#>)GX)FIcOqY4lf}Vv2gjrOTuFusB@ERW-&fb zTp=E0E?gXkwzn)AMMY*QCftp%MOL-cbsG{02$0~b?-JD{-nwj58 zBHO1YL~yn~RpnZ6*;XA|MSJeBfX-D?afH*E!2uGjT%k!jtx~OG_jJ`Ln}lMQb7W41 zmTIRd%o$pu;%2}}@2J$x%fg{DZEa-Wxdu6mRP~Ea0zD2+g;Dl*to|%sO-5mUrZ`~C zjJ zUe^**YRgBvlxl<(r0LjxjSQKiTx+E<7$@9VO=RYgL9ldTyKzfqR;Y&gu^ub!fVX7u z3H@;8j#tVgga~EMuXv_#Q8<*uK@R{mGzn92eDYkF1sbxh5!P|M-D)T~Ae*SO`@u$Q z7=5s)HM)w~s2j5{I67cqSn6BLLhCMcn0=OTVE?T7bAmY!T+xZ_N3op~wZ3Oxlm6(a5qB({6KghlvBd9HJ#V6YY_zxbj-zI`%FN|C*Q`DiV z#>?Kk7VbuoE*I9tJaa+}=i7tJnMRn`P+(08 za*0VeuAz!eI7giYTsd26P|d^E2p1f#oF*t{#klPhgaShQ1*J7?#CTD@iDRQIV+Z$@ z>qE^3tR3~MVu=%U%*W(1(waaFG_1i5WE}mvAax;iwZKv^g1g}qXY7lAd;!QQa#5e= z1_8KLHje1@?^|6Wb(A{HQ_krJJP1GgE*|?H0Q$5yPBQJlGi;&Lt<3Qc+W4c}Ih~@* zj8lYvme}hwf@Js%Oj=4BxXm15E}7zS0(dW`7X0|$damJ|gJ6~&qKL>gB_eC7%1&Uh zLtOkf7N0b;B`Qj^9)Bfh-( z0or96!;EwEMnxwp!CphwxxJ+DDdP4y3F0i`zZp-sQ5wxGIHIsZCCQz5>QRetx8gq{ zA33BxQ}8Lpe!_o?^u2s3b!a-$DF$OoL=|9aNa7La{$zI#JTu_tYG{m2ly$k?>Yc); zTA9ckzd+ibu>SE6Rc=Yd&?GA9S5oaQgT~ER-|EwANJIAY74|6 z($#j^GP}EJqi%)^jURCj&i;Zl^-M9{=WE69<*p-cmBIz-400wEewWVEd^21}_@A#^ z2DQMldk_N)6bhFZeo8dDTWD@-IVunEY*nYRON_FYII-1Q@@hzzFe(lTvqm}InfjQ2 zN>>_rUG0Lhaz`s;GRPklV?0 z;~t4S8M)ZBW-ED?#UNbCrsWb=??P># zVc}MW_f80ygG_o~SW+Q6oeIUdFqV2Fzys*7+vxr^ZDeXcZZc;{kqK;(kR-DKL zByDdPnUQgnX^>x?1Tz~^wZ%Flu}ma$Xmgtc7pSmBIH%&H*Tnm=L-{GzCv^UBIrTH5 zaoPO|&G@SB{-N8Xq<+RVaM_{lHo@X-q}`zjeayVZ9)5&u*Y>1!$(wh9Qoe>yWbPgw zt#=gnjCaT_+$}w^*=pgiHD8N$hzqEuY5iVL_!Diw#>NP7mEd?1I@Io+?=$?7cU=yK zdDKk_(h_dB9A?NX+&=%k8g+?-f&`vhAR}&#zP+iG%;s}kq1~c{ac1@tfK4jP65Z&O zXj8Ew>l7c|PMp!cT|&;o+(3+)-|SK&0EVU-0-c&guW?6F$S`=hcKi zpx{Z)UJcyihmN;^E?*;fxjE3kLN4|&X?H&$md+Ege&9en#nUe=m>ep3VW#C?0V=aS zLhL6v)|%$G5AO4x?Jxy8e+?*)YR~<|-qrKO7k7`jlxpl6l5H&!C4sePiVjAT#)b#h zEwhfkpFN9eY%EAqg-h&%N>E0#%`InXY?sHyptcct{roG42Mli5l)sWt66D_nG2ed@ z#4>jF?sor7ME^`pDlPyQ(|?KL9Q88;+$C&3h*UV*B+*g$L<{yT9NG>;C^ZmPbVe(a z09K^qVO2agL`Hy{ISUJ{khPKh@5-)UG|S8Sg%xbJMF)wawbgll3bxk#^WRqmdY7qv zr_bqa3{`}CCbREypKd!>oIh^IUj4yl1I55=^}2mZAAW6z}Kpt3_o1b4__sQ;b zv)1=xHO?gE-1FL}Y$0YdD-N!US;VSH>UXnyKoAS??;T%tya@-u zfFo)@YA&Q#Q^?Mtam19`(PS*DL{PHjEZa(~LV7DNt5yoo1(;KT)?C7%^Mg;F!C)q= z6$>`--hQX4r?!aPEXn;L*bykF1r8JVDZ)x4aykACQy(5~POL;InZPU&s5aZm-w1L< z`crCS5=x>k_88n(*?zn=^w*;0+8>ui2i>t*Kr!4?aA1`yj*GXi#>$h8@#P{S)%8+N zCBeL6%!Ob1YJs5+a*yh{vZ8jH>5qpZhz_>(ph}ozKy9d#>gba1x3}`-s_zi+SqIeR z0NCd7B_Z|Fl+(r$W~l@xbeAPl5{uJ{`chq}Q;y8oUN0sUr4g@1XLZQ31z9h(fE_y( z_iQ(KB39LWd;qwPIzkvNNkL(P(6{Iu{)!#HvBlsbm`g2qy&cTsOsAbwMYOEw8!+75D!>V{9SZ?IP@pR9sFG{T#R*6ez2&BmP8*m^6+H2_ z>%9pg(+R^)*(S21iHjLmdt$fmq6y!B9L!%+;wL5WHc^MZRNjpL9EqbBMaMns2F(@h zN0BEqZ3EWGLjvY&I!8@-WV-o@>biD;nx;D}8DPapQF5ivpHVim8$G%3JrHtvN~U&) zb1;=o*lGfPq#=9Moe$H_UhQPBjzHuYw;&e!iD^U2veY8)!QX_E(X@3hAlPBIc}HoD z*NH1vvCi5xy@NS41F1Q3=Jkfu&G{Syin^RWwWX|JqUIX_`}l;_UIsj&(AFQ)ST*5$ z{G&KmdZcO;jGIoI^+9dsg{#=v5eRuPO41<*Ym!>=zHAXH#=LdeROU-nzj_@T4xr4M zJI+d{Pp_{r=IPWj&?%wfdyo`DG1~|=ef?>=DR@|vTuc)w{LHqNKVz9`Dc{iCOH;@H5T{ zc<$O&s%k_AhP^gCUT=uzrzlEHI3q`Z3em0*qOrPHpfl1v=8Xkp{!f9d2p!4 zL40+eJB4@5IT=JTTawIA=Z%3AFvv=l1A~JX>r6YUMV7GGLTSaIn-PUw| z;9L`a<)`D@Qs(@P(TlafW&-87mcZuwFxo~bpa01_M9;$>;4QYkMQlFPgmWv!eU8Ut zrV2<(`u-@1BTMc$oA*fX;OvklC1T$vQlZWS@&Wl}d!72MiXjOXxmiL8oq;sP{)oBe zS#i5knjf`OfBl}6l;BSHeY31w8c~8G>$sJ9?^^!)Z*Z*Xg zbTbkcbBpgFui(*n32hX~sC7gz{L?nlnOjJBd@ zUC4gd`o&YB4}!T9JGTe9tqo0M!JnEw4KH7WbrmTRsw^Nf z^>RxG?2A33VG3>E?iN|`G6jgr`wCzKo(#+zlOIzp-^E0W0%^a>zO)&f(Gc93WgnJ2p-%H-xhe{MqmO z8Iacz=Qvx$ML>Lhz$O;3wB(UI{yTk1LJHf+KDL2JPQ6#m%^bo>+kTj4-zQ~*YhcqS z2mOX!N!Q$d+KA^P0`EEA^%>c12X(QI-Z}-;2Rr-0CdCUOZ=7QqaxjZPvR%{pzd21HtcUSU>u1nw?)ZCy+ zAaYQGz59lqhNXR4GYONpUwBU+V&<{z+xA}`Q$fajmR86j$@`MeH}@zz*ZFeBV9Ot< ze8BLzuIIDxM&8=dS!1-hxiAB-x-cVmtpN}JcP^`LE#2r9ti-k8>Jnk{?@Gw>-WhL=v+H!*tv*mcNvtwo)-XpMnV#X>U1F z?HM?tn^zY$6#|(|S~|P!BPp6mur58i)tY=Z-9(pM&QIHq+I5?=itn>u1FkXiehCRC zW_3|MNOU)$-zrjKnU~{^@i9V^OvOJMp@(|iNnQ%|iojG2_Snnt`1Cqx2t)`vW&w2l zwb#`XLNY@FsnC-~O&9|#Lpvw7n!$wL9azSk)$O}?ygN@FEY({2%bTl)@F2wevCv`; zZb{`)uMENiwE|mti*q5U4;4puX{VWFJ#QIaa*%IHKyrU*HtjW_=@!3SlL~pqLRs?L zoqi&}JLsaP)yEH!=_)zmV-^xy!*MCtc{n|d%O zRM>N>eMG*Qi_XAxg@82*#zPe+!!f#;xBxS#6T-$ziegN-`dLm z=tTN|xpfCPng06|X^6_1JgN}dM<_;WsuL9lu#zLVt!0{%%D9*$nT2E>5@F(>Fxi%Y zpLHE%4LZSJ1=_qm0;^Wi%x56}k3h2Atro;!Ey}#g&*BpbNXXS}v>|nn=Mi0O(5?=1V7y1^1Bdt5h3}oL@VsG>NAH z1;5?|Sth=0*>dbXSQ%MQKB?eN$LRu?yBy@qQVaUl*f#p+sLy$Jd>*q;(l>brvNUbIF0OCf zk%Q;Zg!#0w0_#l)!t?3iz~`X8A>Yd3!P&A4Ov6&EdZmOixeTd4J`*Wutura(}4w@KV>i#rf(0PYL&v^89QiXBP6sj=N;q8kVxS}hA! z|3QaiYz!w+xQ%9&Zg${JgQ*Ip_bg2rmmG`JkX^}&5gbZF!Z(gDD1s5{QwarPK(li- zW9y-CiQ`5Ug1ceN1w7lCxl=2}7c*8_XH8W7y0AICn19qZ`w}z0iCJ$tJ}NjzQCH90 zc!UzpKvk%3;`XfFi2;F*q2eMQQ5fzO{!`KU1T^J?Z64|2Z}b1b6h80_H%~J)J)kbM0hsj+FV6%@_~$FjK9OG7lY}YA zRzyYxxy18z<+mCBiX?3Q{h{TrNRkHsyF|eGpLo0fKUQ|19Z0BamMNE9sW z?vq)r`Qge{9wN|ezzW=@ojpVQRwp##Q91F|B5c`a0A{HaIcW>AnqQ*0WT$wj^5sWOC1S;Xw7%)n(=%^in zw#N*+9bpt?0)PY$(vnU9SGSwRS&S!rpd`8xbF<1JmD&6fwyzyUqk){#Q9FxL*Z9%#rF$} zf8SsEkE+i91VY8d>Fap#FBacbS{#V&r0|8bQa;)D($^v2R1GdsQ8YUk(_L2;=DEyN%X*3 z;O@fS(pPLRGatI93mApLsX|H9$VL2)o(?EYqlgZMP{8oDYS8)3G#TWE<(LmZ6X{YA zRdvPLLBTatiUG$g@WK9cZzw%s6TT1Chmw#wQF&&opN6^(D`(5p0~ zNG~fjdyRsZv9Y?UCK(&#Q2XLH5G{{$9Y4vgMDutsefKVVPoS__MiT%qQ#_)3UUe=2fK)*36yXbQUp#E98ah(v`E$c3kAce_8a60#pa7rq6ZRtzSx6=I^-~A|D%>Riv{Y`F9n3CUPL>d`MZdRmBzCum2K%}z@Z(b7#K!-$Hb<+R@Rl9J6<~ z4Wo8!!y~j(!4nYsDtxPIaWKp+I*yY(ib`5Pg356Wa7cmM9sG6alwr7WB4IcAS~H3@ zWmYt|TByC?wY7yODHTyXvay9$7#S?gDlC?aS147Ed7zW!&#q$^E^_1sgB7GKfhhYu zOqe*Rojm~)8(;b!gsRgQZ$vl5mN>^LDgWicjGIcK9x4frI?ZR4Z%l1J=Q$0lSd5a9 z@(o?OxC72<>Gun*Y@Z8sq@od{7GGsf8lnBW^kl6sX|j~UA2$>@^~wtceTt^AtqMIx zO6!N}OC#Bh^qdQV+B=9hrwTj>7HvH1hfOQ{^#nf%e+l)*Kgv$|!kL5od^ka#S)BNT z{F(miX_6#U3+3k;KxPyYXE0*0CfL8;hDj!QHM@)sekF9uyBU$DRZkka4ie^-J2N8w z3PK+HEv7kMnJU1Y+>rheEpHdQ3_aTQkM3`0`tC->mpV=VtvU((Cq$^(S^p=+$P|@} zueLA}Us^NTI83TNI-15}vrC7j6s_S`f6T(BH{6Jj{Lt;`C+)d}vwPGx62x7WXOX19 z2mv1;f^p6cG|M`vfxMhHmZxkkmWHRNyu2PDTEpC(iJhH^af+tl7~h?Y(?qNDa`|Ogv{=+T@7?v344o zvge%8Jw?LRgWr7IFf%{-h>9}xlP}Y#GpP_3XM7FeGT?iN;BN-qzy=B# z=r$79U4rd6o4Zdt=$|I3nYy;WwCb^`%oikowOPGRUJ3IzChrX91DUDng5_KvhiEZwXl^y z+E!`Z6>}ijz5kq$nNM8JA|5gf_(J-);?SAn^N-(q2r6w31sQh6vLYp^ z<>+GyGLUe_6eTzX7soWpw{dDbP-*CsyKVw@I|u`kVX&6_h5m!A5&3#=UbYHYJ5GK& zLcq@0`%1;8KjwLiup&i&u&rmt*LqALkIqxh-)Exk&(V)gh9@Fn+WU=6-UG^X2~*Q-hnQ$;;+<&lRZ>g0I`~yuv!#84 zy>27(l&zrfDI!2PgzQyV*R(YFd`C`YwR_oNY+;|79t{NNMN1@fp?EaNjuM2DKuG%W z5749Br2aU6K|b=g4(IR39R8_!|B`uQ)bun^C9wR4!8isr$;w$VOtYk+1L9#CiJ#F) z)L}>^6>;X~0q&CO>>ZBo0}|Ex9$p*Hor@Ej9&75b&AGqzpGpM^dx}b~E^pPKau2i5 zr#tT^S+01mMm}z480>-WjU#q`6-gw4BJMWmW?+VXBZ#JPzPW5QQm@RM#+zbQMpr>M zX$huprL(A?yhv8Y81K}pTD|Gxs#z=K(Wfh+?#!I$js5u8+}vykZh~NcoLO?ofpg0! zlV4E9BAY_$pN~e-!VETD&@v%7J~_jdtS}<_U<4aRqEBa&LDpc?V;n72lTM?pIVG+> z*5cxz_iD@3vIL5f9HdHov{o()HQ@6<+c}hfC?LkpBEZ4xzMME^~AdB8?2F=#6ff!F740l&v7FN!n_ zoc1%OfX(q}cg4LDk-1%|iZ^=`x5Vs{oJYhXufP;BgVd*&@a04pSek6OS@*UH`*dAp z7wY#70IO^kSqLhoh9!qIj)8t4W6*`Kxy!j%Bi%(HKRtASZ2%vA0#2fZ=fHe0zDg8^ zucp;9(vmuO;Zq9tlNH)GIiPufZlt?}>i|y|haP!l#dn)rvm8raz5L?wKj9wTG znpl>V@};D!M{P!IE>evm)RAn|n=z-3M9m5J+-gkZHZ{L1Syyw|vHpP%hB!tMT+rv8 zIQ=keS*PTV%R7142=?#WHFnEJsTMGeG*h)nCH)GpaTT@|DGBJ6t>3A)XO)=jKPO<# zhkrgZtDV6oMy?rW$|*NdJYo#5?e|Nj>OAvCXHg~!MC4R;Q!W5xcMwX#+vXhI+{ywS zGP-+ZNr-yZmpm-A`e|Li#ehuWB{{ul8gB&6c98(k59I%mMN9MzK}i2s>Ejv_zVmcMsnobQLkp z)jmsJo2dwCR~lcUZs@-?3D6iNa z2k@iM#mvemMo^D1bu5HYpRfz(3k*pW)~jt8UrU&;(FDI5ZLE7&|ApGRFLZa{yynWx zEOzd$N20h|=+;~w$%yg>je{MZ!E4p4x05dc#<3^#{Fa5G4ZQDWh~%MPeu*hO-6}2*)t-`@rBMoz&gn0^@c)N>z|Ikj8|7Uvdf5@ng296rq2LiM#7KrWq{Jc7;oJ@djxbC1s6^OE>R6cuCItGJ? z6AA=5i=$b;RoVo7+GqbqKzFk>QKMOf?`_`!!S!6;PSCI~IkcQ?YGxRh_v86Q%go2) zG=snIC&_n9G^|`+KOc$@QwNE$b7wxBY*;g=K1oJnw8+ZR)ye`1Sn<@P&HZm0wDJV* z=rozX4l;bJROR*PEfHHSmFVY3M#_fw=4b_={0@MP<5k4RCa-ZShp|CIGvW^9$f|BM#Z`=3&=+=p zp%*DC-rEH3N;$A(Z>k_9rDGGj2&WPH|}=Pe3(g}v3=+`$+A=C5PLB3UEGUMk92-erU%0^)5FkU z^Yx#?Gjyt*$W>Os^Fjk-r-eu`{0ZJbhlsOsR;hD=`<~eP6ScQ)%8fEGvJ15u9+M0c|LM4@D(tTx!T(sRv zWg?;1n7&)-y0oXR+eBs9O;54ZKg=9eJ4gryudL84MAMsKwGo$85q6&cz+vi)9Y zvg#u>v&pQQ1NfOhD#L@}NNZe+l_~BQ+(xC1j-+({Cg3_jrZ(YpI{3=0F1GZsf+3&f z#+sRf=v7DVwTcYw;SiNxi5As}hE-Tpt)-2+lBmcAO)8cP55d0MXS*A3yI5A!Hq&IN zzb+)*y8d8WTE~Vm3(pgOzy%VI_e4lBx&hJEVBu!!P|g}j(^!S=rNaJ>H=Ef;;{iS$$0k-N(`n#J_K40VJP^8*3YR2S`* zED;iCzkrz@mP_(>i6ol5pMh!mnhrxM-NYm0gxPF<%(&Az*pqoRTpgaeC!~-qYKZHJ z2!g(qL_+hom-fp$7r=1#mU~Dz?(UFkV|g;&XovHh~^6 z1eq4BcKE%*aMm-a?zrj+p;2t>oJxxMgsmJ^Cm%SwDO?odL%v6fXU869KBEMoC0&x>qebmE%y+W z51;V2xca9B=wtmln74g7LcEgJe1z7o>kwc1W=K1X7WAcW%73eGwExo&{SSTnXR+pA zRL)j$LV7?Djn8{-8CVk94n|P>RAw}F9uvp$bpNz<>Yw3PgWVJo?zFYH9jzq zU|S+$C6I?B?Jm>V{P67c9aRvK283bnM(uikbL=``ew5E)AfV$SR4b8&4mPDkKT&M3 zok(sTB}>Gz%RzD{hz|7(AFjB$@#3&PZFF5_Ay&V3?c&mT8O;9(vSgWdwcy?@L-|`( z@@P4$nXBmVE&Xy(PFGHEl*K;31`*ilik77?w@N11G7IW!eL@1cz~XpM^02Z?CRv1R z5&x6kevgJ5Bh74Q8p(-u#_-3`246@>kY~V4!XlYgz|zMe18m7Vs`0+D!LQwTPzh?a zp?X169uBrRvG3p%4U@q_(*^M`uaNY!T6uoKk@>x(29EcJW_eY@I|Un z*d;^-XTsE{Vjde=Pp3`In(n!ohHxqB%V`0vSVMsYsbjN6}N6NC+Ea`Hhv~yo@ z|Ab%QndSEzidwOqoXCaF-%oZ?SFWn`*`1pjc1OIk2G8qSJ$QdrMzd~dev;uoh z>SneEICV>k}mz6&xMqp=Bs_0AW81D{_hqJXl6ZWPRNm@cC#+pF&w z{{TT0=$yGcqkPQL>NN%!#+tn}4H>ct#L#Jsg_I35#t}p)nNQh>j6(dfd6ng#+}x3^ zEH`G#vyM=;7q#SBQzTc%%Dz~faHJK+H;4xaAXn)7;)d(n*@Bv5cUDNTnM#byv)DTG zaD+~o&c-Z<$c;HIOc!sERIR>*&bsB8V_ldq?_>fT!y4X-UMddUmfumowO!^#*pW$- z_&)moxY0q!ypaJva)>Bc&tDs?D=Rta*Wc^n@uBO%dd+mnsCi0aBZ3W%?tz844FkZD zzhl+RuCVk=9Q#k;8EpXtSmR;sZUa5(o>dt+PBe96@6G}h`2)tAx(WKR4TqXy(YHIT z@feU+no42!!>y5*3Iv$!rn-B_%sKf6f4Y{2UpRgGg*dxU)B@IRQ`b{ncLrg9@Q)n$ zOZ7q3%zL99j1{56$!W(Wu{#m|@(6BBb-*zV23M!PmH7nzOD@~);0aK^iixd%>#BwR zyIlVF*t4-Ww*IPTGko3RuyJ*^bo-h}wJ{YkHa2y3mIK%U%>PFunkx0#EeIm{u93PX z4L24jUh+37=~WR47l=ug2cn_}7CLR(kWaIpH8ojFsD}GN3G}v6fI-IMK2sXnpgS5O zHt<|^d9q}_znrbP0~zxoJ-hh6o81y+N;i@6M8%S@#UT)#aKPYdm-xlbL@v*`|^%VS(M$ zMQqxcVVEKe5s~61T77N=9x7ndQ=dzWp^+#cX}v`1bbnH@&{k?%I%zUPTDB(DCWY6( zR`%eblFFkL&C{Q}T6PTF0@lW0JViFzz4s5Qt?P?wep8G8+z3QFAJ{Q8 z9J41|iAs{Um!2i{R7&sV=ESh*k(9`2MM2U#EXF4!WGl(6lI!mg_V%pRenG>dEhJug z^oLZ?bErlIPc@Jo&#@jy@~D<3Xo%x$)(5Si@~}ORyawQ{z^mzNSa$nwLYTh6E%!w_ zUe?c`JJ&RqFh1h18}LE47$L1AwR#xAny*v9NWjK$&6(=e0)H_v^+ZIJ{iVg^e_K-I z|L;t=x>(vU{1+G+P5=i7QzubN=dWIe(bqeBJ2fX85qrBYh5pj*f05=8WxcP7do(_h zkfEQ1Fhf^}%V~vr>ed9*Z2aL&OaYSRhJQFWHtirwJFFkfJdT$gZo;aq70{}E#rx((U`7NMIb~uf>{Y@Fy@-kmo{)ei*VjvpSH7AU zQG&3Eol$C{Upe`034cH43cD*~Fgt?^0R|)r(uoq3ZjaJqfj@tiI~`dQnxfcQIY8o| zx?Ye>NWZK8L1(kkb1S9^8Z8O_(anGZY+b+@QY;|DoLc>{O|aq(@x2=s^G<9MAhc~H z+C1ib(J*&#`+Lg;GpaQ^sWw~f&#%lNQ~GO}O<5{cJ@iXSW4#};tQz2#pIfu71!rQ( z4kCuX$!&s;)cMU9hv?R)rQE?_vV6Kg?&KyIEObikO?6Nay}u#c#`ywL(|Y-0_4B_| zZFZ?lHfgURDmYjMmoR8@i&Z@2Gxs;4uH)`pIv#lZ&^!198Fa^Jm;?}TWtz8sulPrL zKbu$b{{4m1$lv0`@ZWKA|0h5U!uIwqUkm{p7gFZ|dl@!5af*zlF% zpT-i|4JMt%M|0c1qZ$s8LIRgm6_V5}6l6_$cFS# z83cqh6K^W(X|r?V{bTQp14v|DQg;&;fZMu?5QbEN|DizzdZSB~$ZB%UAww;P??AT_-JFKAde%=4c z*WK^Iy5_Y`*IZ+cF`jvkCv~Urz3`nP{hF!UT7Z&e;MlB~LBDvL^hy{%; z7t5+&Ik;KwQ5H^i!;(ly8mfp@O>kH67-aW0cAAT~U)M1u`B>fG=Q2uC8k}6}DEV=% z<0n@WaN%dDBTe*&LIe^r-!r&t`a?#mEwYQuwZ69QU3&}7##(|SIP*4@y+}%v^Gb3# zrJ~68hi~77ya4=W-%{<(XErMm>&kvG`{7*$QxRf(jrz|KGXJN3Hs*8BfBx&9|5sZ1 zpFJ1(B%-bD42(%cOiT@2teyYoUBS`L%<(g;$b6nECbs|ADH5$LYxj?i3+2^#L@d{%E(US^chG<>aL7o>Fg~ zW@9wW@Mb&X;BoMz+kUPUcrDQOImm;-%|nxkXJ8xRz|MlPz5zcJHP<+yvqjB4hJAPE zRv>l{lLznW~SOGRU~u77UcOZyR#kuJrIH_){hzx!6NMX z>(OKAFh@s2V;jk|$k5-Q_ufVe;(KCrD}*^oBx{IZq^AB|7z*bH+g_-tkT~8S$bzdU zhbMY*g?Qb;-m|0`&Jm}A8SEI0twaTfXhIc=no}$>)n5^cc)v!C^YmpxLt=|kf%!%f zp5L$?mnzMt!o(fg7V`O^BLyjG=rNa}=$hiZzYo~0IVX$bp^H-hQn!;9JiFAF<3~nt zVhpABVoLWDQ}2vEEF3-?zzUA(yoYw&$YeHB#WGCXkK+YrG=+t0N~!OmTN;fK*k>^! zJW_v+4Q4n2GP7vgBmK;xHg^7zFqyTTfq|0+1^H2lXhn6PpG#TB*``?1STTC#wcaj3 zG~Q9!XHZ#1oPZo zB6h(BVIW5K+S@JG_HctDLHWb;wobZ0h(3xr6(uUspOSK0WoSHeF$ZLw@)cpoIP|kL zu`GnW>gD$rMt}J0qa9kJzn0s`@JNy1Crkb&;ve|()+_%!x%us>1_Xz|BS>9oQeD3O zy#CHX#(q^~`=@_p$XV6N&RG*~oEH$z96b8S16(6wqH)$vPs=ia!(xPVX5o&5OIYQ%E(-QAR1}CnLTIy zgu1MCqL{_wE)gkj0BAezF|AzPJs=8}H2bHAT-Q@Vuff?0GL=)t3hn{$Le?|+{-2N~`HWe24?!1a^UpC~3nK$(yZ_Gp(EzP~a{qe>xK@fN zEETlwEV_%9d1aWU0&?U>p3%4%>t5Pa@kMrL4&S@ zmSn!Dllj>DIO{6w+0^gt{RO_4fDC)f+Iq4?_cU@t8(B^je`$)eOOJh1Xs)5%u3hf; zjw$47aUJ9%1n1pGWTuBfjeBumDI)#nkldRmBPRW|;l|oDBL@cq1A~Zq`dXwO)hZkI zZ=P7a{Azp06yl(!tREU`!JsmXRps!?Z~zar>ix0-1C+}&t)%ist94(Ty$M}ZKn1sDaiZpcoW{q&ns8aWPf$bRkbMdSgG+=2BSRQ6GG_f%Lu#_F z&DxHu+nKZ!GuDhb>_o^vZn&^Sl8KWHRDV;z#6r*1Vp@QUndqwscd3kK;>7H!_nvYH zUl|agIWw_LPRj95F=+Ex$J05p??T9_#uqc|q>SXS&=+;eTYdcOOCJDhz7peuvzKoZhTAj&^RulU`#c?SktERgU|C$~O)>Q^$T8ippom{6Ze0_44rQB@UpR~wB? zPsL@8C)uCKxH7xrDor zeNvVfLLATsB!DD{STl{Fn3}6{tRWwG8*@a2OTysNQz2!b6Q2)r*|tZwIovIK9Ik#- z0k=RUmu97T$+6Lz%WQYdmL*MNII&MI^0WWWGKTTi&~H&*Ay7&^6Bpm!0yoVNlSvkB z;!l3U21sJyqc`dt)82)oXA5p>P_irU*EyG72iH%fEpUkm1K$?1^#-^$$Sb=c8_? zOWxxguW7$&-qzSI=Z{}sRGAqzy3J-%QYz2Cffj6SOU|{CshhHx z6?5L$V_QIUbI)HZ9pwP9S15 zXc%$`dxETq+S3_jrfmi$k=)YO5iUeuQ&uX}rCFvz&ubO?u)tv|^-G_`h$pb+8vn@f z7@eQe#Kx|8^37a4d0GulYIUAW|@I5|NIh%=OqHU{(>(UhKvJ}i_X*>!Geb+Rs0MWf66Lf z-cQ(4QOENSbTX$6w_9w4{5eR?14#?)Jqf2UCk5US4bnz8!e>vFduH6(cZZ=5*_!M# zUTZ_b<4v@}dSQOcH@wt-s;3JhkVDct$6k9!ETdi-tplkaxl^qF=p}Q8KMVm+ zeIa2q?RYr}nM0d_W2YWv%JKyCrGSePj8GrRN)<$Nsq8l$X=>`W;?>0eME3|8t&d$~ zH`XG45lBh>-te_f0Mh0??)=Ee0~zESx=sZPv<#!sAVv$0qTn@CmCUNJU<#=`GC)&P z9zuV~9*3_n2*ZQBUh)2xIi;0yo)9XXJxM-VB*6xpyz{Rx2ZCvFnF$2aPcYFG( zyXkO(B30?mt;5GW&{m^w3?!P`#_o;Y%P2z^A`|4%Bt2@3G?C2dcSPNy1#HMXZ>{+L z3BE#xvqR@Ub}uKfzGC=RO|W%dJpUK#m8p&Dk|6Ub8S+dN3qxf9dJ_|WFdM9CSNQv~ zjaFxIX`xx-($#Fq+EI76uB@kK=B4FS0k=9(c8UQnr(nLQxa2qWbuJyD7%`zuqH|eF zNrpM@SIBy@lKb%*$uLeRJQ->ko3yaG~8&}9|f z*KE`oMHQ(HdHlb&)jIzj5~&z8r}w?IM1KSdR=|GFYzDwbn8-uUfu+^h?80e*-9h%Nr;@)Q-TI#dN1V zQPT2;!Wk)DP`kiY<{o7*{on%It(j0&qSv=fNfg3qeNjT@CW{WT<)1Eig!g9lAGx6& zk9_Zrp2I+w_f!LRFsgxKA}gO=xSPSY``kn=c~orU4+0|^K762LWuk_~oK{!-4N8p8 zUDVu0ZhvoD0fN8!3RD~9Bz5GNEn%0~#+E-Js}NTBX;JXE@29MdGln$Aoa3Nzd@%Z= z^zuGY4xk?r(ax7i4RfxA?IPe27s87(e-2Z_KJ(~YI!7bhMQvfN4QX{!68nj@lz^-& z1Zwf=V5ir;j*30AT$nKSfB;K9(inDFwbI^%ohwEDOglz}2l}0!#LsdS3IW43= zBR#E@135bu#VExrtj?)RH^PM(K4B`d=Z6^kix`8$C1&q)w1<&?bAS?70}9fZwZU7R z5RYFo?2Q>e3RW2dl&3E^!&twE<~Lk+apY?#4PM5GWJb2xuWyZs6aAH-9gqg${<1?M zoK&n+$ZyGIi=hakHqRu{^8T4h@$xl?9OM46t;~1_mPs9}jV58E-sp!_CPH4<^A|Q5 zedUHmiyxTc2zgdxU?4PyQ{ON@r+Ucn1kjWSOsh6WzLV~Bv&vWLaj#Xz4VSDs*F#@M>#e^ixNCQ-J|iC=LcB*M4WUb>?v6C z14^8h9Ktd1>XhO$kb-rRL}SFTH)kSu+Dwds$oed7qL)Jbd zhQys4$Uw~yj03)6Kq+K-BsEDftLgjDZk@qLjAyrb5UMeuO^>D43g%0GoKJ~TO0o!D z9E$WfxEDFTT?~sT?|!7aYY*mpt`}i;WTgY|Cb4{Cscrmzb(?UE+nz1wC3#QSjbg>N zleu?7MGaQ&FtejK#?07Uq$vIZX5FqR*a=(zUm`Fq$VUl){GQ{2MA)_j4H$U8FZ`=A z&GU_an)?g%ULunbBq4EUT7uT=vI6~uapKC|H6uz1#Rqt$G(!hE7|c8_#JH%wp9+F? zX`ZigNe9GzC(|Nr8GlmwPre3*Nfu+ zF=SHtv_g@vvoVpev$Jxs|F7CH`X5#HAI=ke(>G6DQQ=h^U8>*J=t5Z3Fi>eH9}1|6 znwv3k>D=kufcp= zAyK#v05qERJxS_ts79QVns}M?sIf(hCO0Q9hKe49a@PzvqzZXTAde6a)iZLw|8V-) ziK`-s)d(oQSejO?eJki$UtP0ped)5T1b)uVFQJq*`7w8liL4TX*#K`hdS!pY9aLD+ zLt=c$c_wt^$Wp~N^!_nT(HiDVibxyq2oM^dw-jC~+3m-#=n!`h^8JYkDTP2fqcVC& zA`VWy*eJC$Eo7qIe@KK;HyTYo0c{Po-_yp=>J(1h#)aH5nV8WGT(oSP)LPgusH%N$?o%U%2I@Ftso10xd z)Tx(jT_vrmTQJDx0QI%9BRI1i!wMNy(LzFXM_wucgJGRBUefc413a9+)}~*UzvNI{KL# z_t4U&srNV|0+ZqwL(<}<%8QtjUD8kSB&p$v^y}vuEC2wyW{aXp2{LTi$EBEHjVnS# z+4=G$GUllsjw&hTbh6z%D2j=cG>gkNVlh|24QUfD*-x9OMzTO93n*pE(U7Vz7BaL% z@(c!GbEjK~fH}sqbB1JNI!~b+AYb5le<-qxDA9&r2o)|epl9@5Ya7}yVkcM)yW6KY7QOX_0-N=)+M!A$NpG? z6BvZ8Tb}Pw(i9f7S00=KbWmNvJGL(-MsAz3@aR~PM$Z>t)%AiCZu?A|?P*~UdhhFT`;Nb)MxIg*0QlkYVX+46( zSd%WoWR@kYToK7)(J=#qUD-ss;4M&27w#03y6$gk6X<-VL8AJM@NFTx#Z!n)F5T357%njjKyjro(yW8ceP{!%;*Y>DN`&_18p(z2Hg$%K zohbgJcp%+ux%q6F?(sc_mYJ<$;DxgkTEi?yjT6Du@+n(KsKtFHcO%7O z=AsfLSTdE2>7a@0^`;)?Fg|s2XOPV&fo<%Q)Izaw4s&RvrX0^+aPNq|yE?oSa7 zsnNs!+vGcTM4yM|$9so*2Nv;ngDD}b0MjH6i4e|l^O`lzCRj)-qa6f%|afJpmf(S1J2k7Nt^!;Q}0 z4ejPF?^M~Sv+@LYn&IFUk2;1h?kb8lfrT`oMm=JBm{fo5N|HY~yQQ`T*e2?!tF%*t zf+ncx15$NdF82GXrpP5rJ7!PVE3>u`ME$9Hw5RlP zUh+s#pg{9kEOsAhvu2pry#@dvbB3Lti+9VkLxPZSl;fNr9}wv1cTahUw_Py7%Xp;C zaz__|kz*ydKiYbsqK{?cXhqR(!1KMoV-+!mz>3S8S`Va4kD#(aKyqecGXB^nF*>mS z1gG>fKZc?R~Tye>%x+43D8=e zf0eKr-)>VEu7^I{%T}BT-WaGXO3+x<2w2jwnXePdc2#BdofU6wbE)ZWHsyj=_NT3o z)kySji#CTEnx8*-n=88Ld+TuNy;x$+vDpZ)=XwCr_Gx-+N=;=LCE7CqKX9 zQ-0{jIr zktqqWCgBa3PYK*qQqd=BO70DfM#|JvuW*0%zmTE{mBI$55J=Y2b2UoZ)Yk z3M%rrX7!nwk#@CXTr5=J__(3cI-8~*MC+>R);Z)0Zkj2kpsifdJeH)2uhA|9^B;S$ z4lT3;_fF@g%#qFotZ#|r-IB*zSo;fokxbsmMrfNfJEU&&TF%|!+YuN=#8jFS4^f*m zazCA-2krJ-;Tkufh!-urx#z*imYo|n6+NDGT#*EH355(vRfrGnr*x z5PWMD7>3IwEh=lO^V>O>iLP~S!GjrvI5lx<7oOg(d;6uEFqo5>IwptBQz;`>zx`n$ zjZQ#Hb)qJdQy#ML&qcfmb$KT+f_1#uYNo7HHDY}7xAw8qbl;9LWO-cndfI=5$%jBw zb}K3U%88Fg^|&0Vc~99bKl|$3JzdawRZ|`7%1S<8B7>9*rWAT0U<@mHDfnL1`~1U| zDw7m@<@}C|zqeHM(OK@di6~sKHiJvk^I0^S<LBe^_xZsUOzVkYSE)Bxn*NekQYbyTn5SRt!n{EseOo-$u)vjM(PV%6cIG3Kv$>dd}HUyXi;_Lv>}OyUj38dPe8+1Pr?{LXnIBCoTnocD60@vhsz+GG5lJB9ncgP8T6@LwuzZ)J zKETBS~AvzGE!{u^+Rd-|Gn!rc@UUnioP0{@_j_>tg8YI#?y zL-H$=&xXkCJ2Qe7&exbI!z`OyPxBp|4_ zZrrc;OAb%T4Ze%7E}FBB`8t$QN0sA3vpwU>?7QAmE%-ethXdCtby$Qm3v$lNxB2a7 ze6F5eEWV`={#W(G)Va}7?$D65WF|f0nmfZT;?=LE6Yz{{W3CV2h^Ma+LXdZ(HMVKZ z!YXJ*34lo!FA>)jSo@*!Hs_)IwmTo6pBr3c^j2u_amZ~g;&Z2jZIw!}v@w8DtZz7|A%rFksD4^HYB!xFAqX;u0HxPeG!3Z(z z4}+^N5-nckKf2YSR5R_}PD+2?Wq#BOiON74#{`u=4f59WKdy_77EYq~_|X6cNtno{ zZ?WLwbV57Z6uI|uY_;vzv~~`eiiOl($Au7C*X<&MY5v0b`KEu-GW}{2UNfmmrP!^Y zAOczy!}TIJsom=}kxH)9W`&Rp&rR6T7y&~5nXbut;wcs@M?aa^9j{ZDtx=1?P8TV{ zee2kKf%CE$mogyKKT=xQQ#)OCl9bjc)}{p2X$}aG`^B0w0yi-rI!d4e-u9uR$kJK3 zhqBG9Wx<-3DFw5olJ6neF@hB;8o(r(GB_;p1i>}cjN`JNEZg-dlxtLL=8~gfLrBy_ z1~bGh{I>_xqh(}?%bCf1U6~K@+N*i}bTi+pUAW)oM0`D*PeJq=S(-|Plxe9OqxBRg zM((r)xkSH@j!8@+=cA4US0fDL&O?W~x=Mlu>7zvHO2sy7D5_7ulP+YMecP~}F0b*K z3oO2j{o&WHd<&UWcyA(&6hvBJv}qUZ!@R<(mwKB^;y3zeE1>LzbDWSkRD1|5MZPx( zxd=&MsQi1eE@@6W+4N`cF?yh!3R5JlAV--&RONWQ#?SbrQ95<@ag>C{jQmGXpQX{) z1dbFg1_`qLxuDZnX#PKfCW*Jl3F&^7@gO&{>Nb8um$VBcF1!AL=N6`A%BFj=`QaPI z+m^`n+{o)KLif;Gt|7aQ(XXRP@x)jJt}s{&S`I3}jPTY>$@W0BD3Oif^ehs~!H7T1FUSWxLS&W;0q6+azjbWn?3!q$ z9qbmdr4H4Y)p^NOACJ^L>u}NS8T0_5hW)G z%Hv}dAqM}d@t;|hf8>+NHHPi*xePsRlqr46njzhiXXZti7i5+GTKcrlxA->OJ9*Pna`02EIA5~(SMV`T@H6F2VtwwP1$tYujbC1^VE$Yd&I`WSwB^1( zT7NP3|85z#R%&wktjwY_i*n_$RRZPM^ota{LPV%*>=>sAv%fn*cnkCIX{^SJRmwZv z!?f@T&D%Lz@*!mNYTGp{J|7)~PR*ib`;l^E)rQw@)Qn0ECnB8W1S_SbLZWdqcmo?V zX5g0_3qhn4TrN27^x#Qdq*4*G1L|)I^b8GuP_8O{p|M`uvZO6McXa>OSQRW|kQTNPZ#Zyj~SZ<`6B)Y+}jxpn+YT>MhZ!Rxyd@rU>N zP>MkDBLX|<)SJaO?Ge=!D>i+Wq&PgneO?ZXUq4IQuTq z+V{ZGkuw77o~o$!b>4ov`6CKJ)$cf=S6%1ZQyYU!kz_qiuNxY2*Bh;K9J6o_YV6xQ znW|>x+#Mymu&wF9P|3wP*(ZjwE+ou|{eFqMv}d_iEyH zQ?NSf3VX+EpbrIKmp|oD-t_rh(D#e)fp)dYbG{=yPj-3-#l+iu7r+~#w|(#wv@G0` z38`Yhf5CznhyDEhD;jzaz7fc8L?(n-m zR#|5hqq#yRoeTm+h^9J42mnB>BY>HSu&&O-Hxo6j!dqck)dGS&odS@Hsk2-*Z~x z0!%{@gT645S5DeF@JZeE$DFl*nJB8Z|JKvs%7d`KjbJ*AsA_=fEZ&V9=*+K{(TF^( ztjjYr(7@fV^tDs9c*#=8)ZRKO17A5Z`8v*)U+?hS>3sEfgh3`#vFO^7n}&&adV?}n zdy&BY1h|I@eBm=l*kqiJn>vNkOH4l$Op5Hw3K_w8lF!6T@-H)S2W|Km#6!-X#NqLJ zsiVDrc%*@I3^Gen$)6O0C_qw;8{aucF;}U^1%YE`?AYTtb`Z$B$vfhcHQF`VCB(Pf z_G#fV*Colv-k!O+=^nDNe(03?m+RTu&28d%>JrrwFNb{ND&?Ad(=DP@voz$usk1|w z&#gTB7F)#*LtY6@pIb(g72*LcnXRlTPQAD?)ZFnB*EsZqxM&Uk_KGXnR{4}K`I6i- zU9}R>tiO0De1Hx=kAy>7O+nKO@kGQEYOai&S9&WTY+flvR?uhI695W-xZnq4aRMh8 zwfp)+KYWVB#r=5AwwlSdM4@x7-R_{2;1iqz2lXL$7iu1>5W*+I)jlkMs>60=LN)Y= zbPw;;%U+%p_&{2Obemh$BLmbpDd31YxJ8#TpH3~3B8QLUMvx1X5Vl48hWSNN*UTlO zQgQyZbmyjGC-s$3tnB z0mfKUu2+_c`ZVvDVwUy#j3W*l^BSXXQ%=r6Z}C73jx8DAk!t7k{dK^udpHIcUejp# zyx}og$Hr+f>9kaZvno*Om`d|VTUce9tHM=R8thoG!a=NT$s;g@n_rAN%cp7nnLuav z6}j56TSSfPL$p#y#!5TVyqa3zTzi7@#IoeR=E6CdS`JrR+@i2DwZ?T*bh+(k5!a)0 zgRdF93z8XJ|5?>hDN!YAW5cK=+BwDLNT_+otd zqC@*{S0hCKZ+TnN*2&qx+WP;ZjHA`yytPcwKl~)uy)sQ}Q*0-&3X|YFYAjmolaciq zxS$r5^fxICetD*Dw78M9leVvhAOZ$=;SP7L!Vs?+0f1h*YCuTXIt03iAf)0=0KEvZ zB69o-zg`0C#hQ>`4`}1g=a~EID(j9HbjJG^tV-zumR-+fahTPveA{%0u2uQwMZ%}5 zwY!|}i0oTd&>^QSRhIKU+cMC#|C3f>|647?v1B(wH)EWb{vuJEJh~!#|J7%=h!x3| zCH6m}wg;>Q&?@5Ct1%n`lj%*>9a52d@wmvE`=aQjtz$sWj3V;fDns5<7d2*``)u1( zh!Ub>!#N0m=Vz1n1=El zwb2IVRw$6NIFRpGyUoM0iqc$IPehcmm7<0s7F*Yv+zq?_%pf*SS~~}s0M`m(rMbx% zi?|Wjr6fJN`_J8&B2$4+V+iO~m>s~Zr2T3Y3HGREFQ%%pEoU0N));AeSVM#gYQ>l} z0`RhgS`R^pJH31YQ~eTeJiI}g$&^|nv{!h?8mJK{{XDt+sG8D`7)$jvM#hjPI(5sS zfFW4s7wao%Lo| z#pJRC?iZOai;57ANs|vm6%}rPlGo}}Aso1t#xJn}%VW@~1WSjh(@JTgM$0x6ZQ)gB zdiox3f>kqGZY}+R<;wlNoWJ8#X-v)1;wRD*ec*wnvsN06Q@cZuD`deT-Bu&G;2fBC z0FE1%pG@{Yo2O87&dE;w???%`9s1gs=3GpM8xx_}=AB$K9y=cD);^iE*p4;T1RU%B zBPr)yqOBX<2}xt%g9qr>;z&|?4vhhw7@$a}Uy2b%_^VdB^VfzrebKUPnq;hliCNU% zVt3R5EHkhN^Pv`REF+npA@#HdCQN9IbQbqSDs^+zt(A6;rLwN+@Em}WrV5vPEo!w^ zSCd3RZ8{7a@d9@|IF&&G%irS7FHle?@49LctrtTt=rP$W)se*#RkFmyf)D1^U6EYI zfh+N?uH?-))O$9zM19VsuGn8?o~5`scXU?!P@_cWP&1U4PQqGus=sQzrX+YvKG%XBL3nt6!&M<#}wqA;Mo(}qrq<1lNkpQD-T#-y>grt|E+JNU) z2j+g+QPcA9VEFc0k;H(hSNOpp$I+!$ z&d&W6kBM9+c{X%vr_X0}tdB5dvEDyk5H2*T(QW8Yz-#tjvF?up=^Kfym``^!&O-X! z@HdfpHn;}_)y$Xjb-5cR$Q#-XdhKpmJG5pl>h*Q2(u*gt_4(>6?kG)%T3*&TT0qI( zL!aR~4HiJiaHlgdNcOQP6xx1f3AWx&8}(NEps|G!cO>J^rE2@&-t#_Jb7GYgnLnML~1ze1D$?~BwbgA^=pr55tC|d7w42vN11_8bS75u z_MRKqE7Xik8fk>6(VE5{qT}6rSzd|o}Zb>*aI*Bwg%ccE$_ytH;g2H z^i3qY!+aE*&s^BMH9TI6GLm&9c`D6)3{-+?2Pon+040Yuv$2(LqV*krKhTg5CHOj* zquacxc1&~=S(O@gR8aI#?R%)meONmw1rub9E2QzeM$pBBm2wbPNR3tab{op53<oFwaUbARdD5jSA_6zmKX7!VicEP1m)rYnk{P- zruRj;4c8S29Rd#Baf|fq_pA^r3K#qRHS;($XNoLI*`puZjM?bA0tH>FDiVc9qR*|3 zGn#nhqxkvqFwRfCB~2yA0pxWapfjCdAem$utuon-`*6}mUP?l%$CE(FjAwL%Oe7GQbu7*+&q>*(cAofJr^gg>xw>hx-SO7Lx2)I} zJ)tV1XKbkE4sS&La#-smSq>S9gBzGLH%v?KVezdGv%Xs}kDJZJi{lDl(FpLZupBta z3iDlkd6LlkRro}+El?GIObw06D%NTXpL{W}Ve*%u#{wTC=+VHS%o`sAez&cYz|Tn` zcK_~pvN%cd^8FlFypCjTjw9@ulLoJ^!QAK*++^wC2~}CFeoY;q6y~r&f^+0>LR6)n z$hSev@GzzGgDc>)#u5_;{T9^5y5I?m=z7=J!eVId8p6R5>NV8)h|bA}#3KUufq4CPGiWYvGj%0=H@Q66);F)#cDMND4 zX|?rg>Bb28q*a!_sgVF(A=OeC&je$C4>$0%yy;Fla-hl(|9Ww4!@Q#E2hpJMMxpQ2L+R;+ZMpS+|j*F`Fh}p)`a_*<`AaeFzNEq^- zlF$7BFKD%p@K+3$Vx%N{QOayKKWU#JOAwXiLO62cA6=|DiDG_Z=ef;f&gQ5-?+Pb+ z)4NsyEZXCdjq5tgDN39V9!6#w25+R1;PD7ss;hFvQn}Hnl3^3h<`ylzJdVEL>|Jj0 zg>=Pscwx&;pWEzMn`ld**$1F-nhqlMuX;G{lWrT<<4$7MZ^*4a2hAMf)3eYiT$lRz&9({j<=%DWIRpgu zoOns@gF}AQ_6Y5RhySg7yMtJcYQap6^hgy{`zX1Zv26q4<)g@t%aIi|-lmcySuRN8*5f*$aEFi8o#kMKRCMnrAY~l`= zez#50^@Qo+6r508>iKfAbbc3JwCnjnmw;~=mlMG`(H8EJz7W6mh@mdinO&)#zHX=| z&|fo@s`;njVkkCMczSnp+TnW8YPU4w2&QmzEh1}orF~KlT=V+`!!rH|PtULCcL!P*m0EaN0Ad2qBw%Gs40jfu=%`N*k@z2-p?&B?Yum-p+h?7(!D^ z&f2Bn_#t!4HM2y^*1GN;U+_x8T$Z2>U9Yx;p_9Qf=ww z2hxO^*{%p9-CwMKz}C4mTi8xvqhivltE|}Kgq5MK@f6tBT&`@RYzsFFi>*eMZ0Z6Y zKBl`GOh!U%C+PXJ|7PF)V*~#8eS80D@v-NL2U&;i62W}k+vJAC+7xF`eq%c0b?{PVTcqiDr%6jLBdkVcTwLJSd313SP)1r=;2`cORbMzrhqZxMWcTWru5-l_H8;f|?{^M%%7>sU zGx2{fX*t;7SewS|NvPR-6F5p(ji7d}CK#%7y}jsPkgj%F5cUbQ?b7uWpYks^|DL*n zau%X$^(%wXMS3c;C4=p*#q>ahmLH5woLsn-YcZP~mH-rGnRyl#KU4MsLu+G3z90+q zM$HCWgZYR`8_I%8)SYuBltP$sN`-6hcjnzhDsVl+Y}yqMN*4MWsJX_6R>Cyw8cHGQ z1>r%vkDxxc#ACA4+-ZO|QBMUz`YHrS{l-*$> zi(n_;4{Gn+d2gn)TA<9) zibWdKJv#s_f5K}vM=d0NaYrd;5A+Fy^=+WgKC`@bS>!P5@K4fzE#VYfMcNdbbvLPY zeR~!f3xU>|pfq-LOsoF=t94x%K!8>#8tR4KQ2G3Yr?Cb98^KL*+G8``rHMpNUN}-T z5HGAkiLh{WR;N$Nk3X_2^3pW=vOFTOb(LS0Wu)0)I{8sZj>}5ZGtD=va-72l&5`L= zhyzBWie2UrC|?(sTcuk$OwvV4oVlxc3ncXPj|cD%%*6(hoKMd5wzPQs^6g)B0xK#d zemOodB7D(!@v!|eYqMfx@M#b+D)PwAuvimOW#13i-xAR5)Ai; zXNX(A@M*y&+TVZI zGHo$F*Ipg~Rnp`KlMNAl2o86}r%Yv9#!O-oo`pe`880;-Y28tR)b4H%nqXXHxN9m0 zI&#!(XhT=T3$WS$)K4#Y=ceN`MsP0v1X{nIoQ14S2^--MnUp21=V3&Uv8|y}^}7Vl zI5tRbOp#?@ay6uncZFE0hg}kt(k%piw^M8;0yynsK_!l~uP??IqzmKJMUqAW^GG{~ z7Fg)Q&zBlp z%Tj8jOUpuR>YHP6zYsX?)aJ`)_pRwu+Tn8I;brOW_`v$u$`$9T)cO*O$j=?mg>dW$ zw=&3=v||fqCr`-$okN*$S9(Nyrs}+Lu#IwDg2xSBz_VfU*?A&26vwv>&>*U_TT7-7 zS~X}fT%9+q(Xvc0qzOG^8gmMcZE9izi5feqvY(aY=%reP+wVZ&cRd`^y6}-gJ&_6n zR%Wdl3vQ4DOt!X9ry7j%=+7pLPdus*@7dZMBo0_WKZPD1(o{=;D> zyc9_WFI3{URv=d6EXcnOG0$(J(R#8Oz$kmuSFQ{-Y20}1027!FkodTU!fouSybwqn zRO-$2BH(w4)$wiPo<1w-4*p=Q0@YKRm^cgiA>~ho)U8^e>SBk*!@xvr0CdvnLHS#CACVuQfgzF>8qV znqf{oO1}RWhiZ3g!Tx9sk!JfLqcP`>Ksx#vZuLg-DC6h4mT!vlU zqw0`0CzZgY!EN0*{sQnDNFn;T<+e_x$zY|n;p0@d^hK*n!S!=#^;P{*D^6~h!T7r6 zoiMxtovMo-dj*{qZPy*c3gaMBEDQDkINU%d8HeBZVlRuzkCId9rx{?L= z-dLlk$w&JX5wn+8`mtqCpKnx+w+$@6DEUI}8P%xN$MEsw%S1-$9PM6r^jP-@?cS<# zhg$wl0X=s3{8EZ2U9(};p{X_b1@jJuGgx`gDK{6MpF|XON_=Rv%-<Ee1cuuy?nl9xVDa~x=+8ppnOQ9 zN$53qi4QQ!co(;f!#YJ8(=Z>_9UF#(QOVjS7T!g2)*Oecrf-R^)tFugBkQsMVNua# zS;1V^#fJS{h+!O+FgS%0=Pd9;lMa0QHn?-n(<0b2$<|@r>fjiyw6u*UoGmU$ayJM@ zfp;c4@{$b*Z_v9?8ZEp{m6Q(mDHW<``n?jg-ZN)Hhvxn*l=O1f*K%{5s77WCt!ugS?*2oG5-Q)JEJd0+W5=doeD$Wh?U$ZRg)K$v8cmQ{hba9jw_mF&X zi-dV?WITgIz!!0uB~jE?(t`&qo{WGyUspX| zc6+F2K4l5$LqxERF#`I&k^^opVIMZjGhsJ^vI0c%kV+|&_k>~}ueTtj;^Dfb@xHs` z)-39elzVA~D~n_aoyBQ1>Qd2!;E!G*pZM&RX`r*y)b`yxvP2;#vM*;CQGPg|gni)} z47`Log3PUyVfdmJ2zvHBhg7T#D-H=myzkeUa$@);WC(yB4k^*$wda3=S-UH5Q1Hx6 zPcGxMP&kXBa+4$s#Sw3-V?mlHj^8&bLpIN~GkYj;!;M!$ZxvtQY4j&Ngz_mxuQRqx zYTbN6epx@-!0jRV5yiSIJ<^mCZ<|;&x2~a)t+(eAVB!1XpCZok*Z2C5P7&>z-Oy?t zf@F(_FLsSrfCus61+Vt~svP%(u<4pzT5{w*0XqfPV%~|=%aq^$=*U+_trGQaoUxbt zBV#Yqx+ULku8yPJs4gGcC?+3iRt_6)Oi0DNLxdb(!n!cup_XUZ3eDe(!DChZ!IG&L?_;T-1GB!R;;Sk;l3Y*JQ!I|l20_f}ZyC;4D7R@6F z>%z~wV;Bj1b(*kp26Ed!Y-OKxNbt3%t))xxOrazWsmwvW;uaSaJ0ou+{01vXvU>_V z6Ha@+;giVaiyg`J8ENQf)Pq>!Nf22>XFHnXTNk84&jp-^YwmlUqnOll8)5mzlO$o! z#fSMwH8Pn+Fy7O5M5#ZGr$cKfaGf8g;XN)<*TrQjMk<}_oRf&b6qZoR38Q{Zxo{V; zby+J_hCZT1>`4~jnQxo|ji%BQ0=BLzC6c!1=B(jS5+fcp%q)JI)=c3{D|=k5;0&c2 zrbRE|qxkNqah2nvextOvjYA{T43n1c6eO7B9DH)tLqB46E7;0xKM=%#wx-*-+*OY{ zQ#7gMStz%I&2&rbo>#T20OD_#g`WYbt9+!MC08%zSMhqMoRk)7VOk%~`sD%(U6zzO zdmSC9@x0GCv2_)umYc5@#%efP0_cu+=f^}k$H9$N_>piA_(5UM_o{++8+Yf8SJ)?C zDd3l=GGm3EEy;&Z6N=+XP@IM0L=uW^ooyYQYyx1vwFR?@U~BAtAqTu%Mi2 zTCQh$K=UZA{P`Cw0I$xAh_f?fq-Goe`7I38{3L8?K3`lRhSAyB)tHT@4c!Y;bJAAS z3u>Q7qx>9SJs4$EB=hxh)u`W5jp?>^g1s_MV7<1zN zXt{FSt?Mt&8aCy67<)b@eg@h0iCW@%+pF-V>p${fyEk6_Gvp|ms{Whi-9eNId?xzZ zm|MI>F;JSuaUnQp#|}k3o&ddCZEeTI608txuU4~7K(wg9 zg%+}(7h2@(%>LI1F*puF(h$ZD`Q+ar!VoVajPY0-XS$>6F_F?sc6Mr7>SL-&{pC;2 zKx@2{@ULz7RCpaKg$iu2rcY+y*~qaPo0}^7T1K$_(NPS<1;V zTj8-xC%WvgDI_YYEG{bySvyO3M>XKY)oXgGG*eB{yDgNQ3s3)A~@n>!O#lNh0! z(-dqW#_z&mMfq#2+u61N`L^({4UoU8wE5`4c}{SGFzKb(BK8hM%cf_zj_HmC48)M& z398ICVJTGzBaz7K{L+Ew=;z^0xA``wbtPs`r+Wrb^_vzzhukq{;A`t&-ktzb zbqy`Z0#D6fdVAiodjF3J+qI*vu#=OCjiL4bIIXEf4?zmN7(H|+<+WfR7@7jrMx7FY z5*0X1enhay-q^M?j}3Pd^|U9(C3#CQU3=hlc~@y9@NQD{UZNfC^5?Cuuuu{ebn_<7 zEzudv*b@QP%)N^5jP;86nQGb<*SOytCM5wmf-=rH#K{Wd$2(X#S$jF}XIxZC1)zir zU2Wq>hIB44nCTqx2x<{_wiVzLSJR}L%P!Y|lFHtA_=bDj=OqvmmSZ}ffuqPge#V-f zZDk|XX0RK}=73LxL`H%OXxK*^I2!fp&kxatErK~&tM3@j1a(Yrq$z)R()i?}p|0^Y zhW&8!IpRA1jJ3e!p66ZY=eBmEA+$A`!%s+{Cz!s$IA`{_Dh0^jt!vn;+Nw}hx019Q z_Wg=#-G-~&@>l=&H~48$L8`LX)!Bcq%(DFa2Loc91u@WcwlHzJwo{cdur>bQ;{fr_ z`rC5QRQ_)`8EadJzz-{K&sUI~>NX>P|c4l)fKS0gkuGe_P ziaQy!%CK(CtAwj-J8&#kyU=G(k%3y`!gS9dU&1xIrGRL|!&aVMEaezUIpopoET~xE zp`%~`LZfn!Lu^+00?>v4UOfM!HeeQoLZP<#o`^9oi69|$0BM?n17R~tGpY)eJiv@$ zTV-~ZZ*}C1J{a}p`>l$Bx8qRBq91;dLdmp84auzmcd|XzJG%I|r z^E-8Tm~jRn_>as(R=@~z3I2E3<=#hXn>A=0`wfOGIxiP)N2%!cG?&^w=E#TR z`lSY@Mm36zu4p3}+S#67MpL$d{gf@dnP%*ZMW=gCXK-%0E(xAC!^+b7hCSMF$m;Rn zCTErbBK#;a)>kHX5}w6PRmnw(!Gy>m_g*2opfklHyx>eb1bu|_lwJdf!ogxhk}X^v zc+^L;F7ta!8+i%6?M}XvQn4b%aOSCpDW+4#JDDG(wvXC*9%9(XBhbv4LX3R5G&(+@ z)nbdivYRQ5pW;9~@YGf{h~Rm(@MfV8Tj&T@EejO6(C#(+z7FVNBR`@j!#wScHM5ki%j+^GykUJ2m zYgpwm;#Q)~LoozUSV($?r3vQ~#ZU_}ggl~J%z*1dYt_^4K6e7o&qs_ORz{km+D+^a zqDdUO)d}|)v9h(Zz3}#DLWyRVCY!=PMCO{=PA)Upb@)1j?c)||l{6&pI=;U#bS#Jk zOOiwVH3FM!SuJDIPnN$|ZKz5fQwHmzn8f^?B+T2ew%~PSE#X_jk`Wu;a{4}9%AHg7 zZm8^bAee$bdpwklIE`$fV15=pI+tgJpll4uQjIM;Q!gvISFc_{@=lUSc-lABE%U?+ zHW$;!NcH1&F;AS~7RH=n<=!NTKnm3t`B@YeL?8d2{WGrmSjG;yBbY*9$N&DT^e?l2 z|1A2482Or7n7KF_TpRn|nmqD}`-=?QJ0z5q$C9Td^sML&aN7OGi+W$uYjDXKJg+0W@S=FoQP2dBI=48|FH>p2mh zFrdu!AwoG$NkvnZp_KT8HEo=RNNJ4IxucGXLr2N*I5Ao>Efb+pNOm9Zw0_7_s|9ac zS6}W##>$W*cBmksip;43p#a4&iTpM)8(gRGekW+AKm5zb)xpUFT>~b+FOH`Zs!$RDgpSCE z>;CL8Uu|EWeR~TvgDX@K=mtReFed;FZ!M2SjzW35i;UqfyemM?rq5yZS#hK5Y~|wt z2#^`Q6$b~uGT_++C3+B~#(oFHdSL&hh`Z8{t5#=ZkoaWVJoLm)3vT_@5HOnZGa;s~ z;4=E`3Eo@=$BxFjS`Iu|8SALB`<#TPTeE%h(dol+#CzJ=Zb&EHpw*=0H*~8x6 z`G`b<@>L2(AS*J!NVp`DN{g!8R#h(~URslf zC8PwGM$5V}+$WcoT*C~*$WmCpS6Gis&sZo|9OfRiwjX$f*&25Gjv6$YPde1smwGw( zb@y=gbl1!8>hm-il3&~zFca0~aJN!?b97+$E>2$Gn$31OR&UnE=Tm= zH44$Dx2HNN1lrCGjfuwo@+(m2j85w-oxre9FopupEV+6HACFyTbt}s-`lCCJ8om5RIE~T#Yg_DWu1u zyAp%jp;3&%D4;CRaR6g=f*ZvPqw2BadP=*ZYy_~CV3@wFx5YA(E8)jfqx z8tjEkMf>msMqi)zaY2fWrMq`lZzZdiMcluc(@(yxK(4hPEFk0~HO3^CUZk3;?Tv3` ze-rjZ8@hBrVPzA$^4hW?<33{d2)h7Jw?$t%V6(C_m+bNhXl9vXCJcBWmMeQoLDm5b zt9|A5pDHY#Y@(rlEo_WzXila!uaZE*WVc`=IM)SSc`#liZ2Wt*~fHgm9uH^ISX2d@)XGZ)_$qnbx6?J<14_=SS(ITs#LPDk03a&%x;bAuGz=P ze^<4p@tD@J|M;88;~IsEOPpB+&3C4!3q;}Kk2tb*WuuE z2u(BE$1(2AwbbBrmU-YLI4>#K((6&QZ~m2Yp;I14x0N8hos}{uoQuMG)Wy?ogaNayqmc&`I=8y6&dPf{Fky#B7 z#F=Xy213s`NFxjKuMqH3+ibWsFRi=QtH*j$9^)Zy8F|^vSmgj~l5<04MiU;BNyAn) zlM+c20Y#%@>WgdY>5kx}H)7*!D~BZJdg8d5iHx|>(jj=!MEmr)-$kH8?A#;DyBone(uz;e^|=9nIwfuWY?yw; zC|H`;8#O$vTPm5AW1Gg-Up&#Ca$<@!JZkAUDbmd*?X}QSA5$(*c+FZ|l+}F%*L1OH z{ck}P=j@=7>6ga#cqzj|ODXHD>ckIBmOd9Fh=~>?C7$uII_3rEX%UKdywsInR~{t- zg|t`~l=L1P_QPkZN53Q>!^A*QDZ zK(f;%VVQo)n1bsy)LWL#?&|wN`hL~Rnxhd3d-bOvlRQAiybH&=i;SlnwP$3P-!%x3^o)t6aoT-zXU}ARq-l^bOW-zg$@b|19Aua zF+k$V!uO;fNwCUEi;6!|5?4_MKtTq}|C`2gXh8EhWP1bTgZ)DqHZ&-x|E2*6Ka!RZ zS5jsHN&IW7%g1yUln@bn$cO!hR2b+`P~1-3dFIx!6EltRa{a z6Z@Y$_ug)~d%u)K$+?LYfc<87}bupdiK(3|m%hiA$Pc>zKNP0hqBj{X*L0rm@j(0s(f>>t{1L0?w#rS+#E)IdBKcF5|Dq-S zZ*-X3x;NeSuOSxS<3Q%uy1zwQ+?Kj&)Ou~-|2+&J{Zi^T=lx9+&+B^K_lQ;hY2H6D zeZ9T!H&;?$+kt+MLCs%i{8QEVi8<(Pft!mFt`}r~k5Y%93jAjQ!fgoD?Zh|Vi~q5A z27G^+_!lc1Zfo3}625-J{(B@p`IW|R4(!c|yX*Pn?*SA0)3iUGUB11uH>ab1{F$$g z|7q4=O#$9cezU54J)`wKI1_%J{14{0Zj0P3wEcKU`%-=?@(1PW+Zs0qGuI`%??IID dD~*3C;60WFKt@K_BOwYX49GZ$DDV2e{|AYb(KrAA literal 56177 zcmagFV{~WVwk?_pE4FRhwr$(CRk3Z`c2coz+fFL^#m=jD_df5v|GoR1_hGCxKaAPt z?5)i;2YO!$(jcHHKtMl#0s#RD{xu*V;Q#dm0)qVemK9YIq?MEtqXz*}_=h7rUxk;@ zUkCNS_ILXK>nJNICn+YXtU@O%b}u_MDI-lwHxDaKOEoh!+oZ&>#JqQWH$^)pIW0R) zElKkO>LS!6^{7~jvK^hY^r+ZqY@j9c3=``N^WF*I^y7b9^Y1eM&*nh?j_sYy|BrqB ze|@0;?PKm_XkugfKe{6S)79O{(80mf>HnBQ#34(~1_lH~4+R87`=6%>+1tA~yZoIm zYiMbw>|*HTV(LU^Y-8x`9HXY~z9@$9g*K^XB=U0vl0(2qg20WAtt2@$xbznx$sQ<{ za5-cN#nT4jm=e{bj#uy8d$;dF3%#$cK8}{$`MLEw^&9;gXiiG?9(MN0QMDR#6Z5?< zGxwc7yuUZl9+2NpqF`phD>1E+?C4hlFGsd;XAjPBFq0uCzMuGXpbg8|rqN&xm~|8FNJG}`RKnZg45_9^T=D3C+BKkzDBTQ5f5NVs=-m9GYb_yg>yI~N z0*$o@HIrw2F#?E!Q<|P|4xTid-M&g$W@w)-o92)dG-oJ3iY_kQl!<648r8pJ~dk@K5;JAztVD-R2@5QsN81< zBR&WBUmt~pxa3IT&?&COh8s%j+K7_~L4V@3sZa3;>*oXvLvzipOR9^fcE=2D>phM^ zvv=|`F^N89g;#Aoa=I=v7GWvM=Fk-s)+y~JwK@4LugDb99J*Gj2r}PUwiq3$wI3T? z$Fa_@$waHnWgk?evWmc^YCUkVOZ1yzvRMc-$tf&FYc@FfY;a;&s&5246dJ&Tqv8xR zhT6&#qzP86Qq&7b*npvK#XBnZ({8EVhH57jay$X6=mEmQ2$GzInz#n+#o<`hHp zoBDSv&BD7%zxj(!Kl)1|P^V{%w`UBw7#%WoYIGfnPmF!JJf65-IYz76!R4?CM+OtM z7oSzSn@U-1gXfaoz9PEz(mf`xuMJ@(W-dpaB4+b(bn!YP*7ba#ST?r z;mOda0fr40t1SX&d4+6<-qeCdm+8(}u!9~db63LUBj@fmO%XHcaw)VRp7#d8BjOjD zOjLB{uU5hu*ty3s+Z_6ZFmHC>{^2}$nJFHvurpdoc`^C#F|0NE=Jj9Q&EPouZdXOB zj<5{T7`zqQj6!NI>DPqZ873hK4Xiflz3}>KZ@5Y;?0O-+kpd@pM^s!ZbDV_R!VE;J z4U9w~$y98zFT`I8=$iI3Z>@#g%EPG<0wjGBNE2^j=f0Q2;Sb~k?!z7W^MeG9N!eFV z1xYJ>kv&1bu7)T+**L=evIl@ZZ^I9u0*;Fj*Js-?R~pef6{9)Bp)kY)<3Sx#EF=&Z zgCq?3a|;w@JN@3%m#VHR>Li~JGjm!{Q*mS2;wa?XpA0Y`fV!1@twpJJLZw_ zpe(lnL$65kHnC*!oz)06cR%I(U?wiSxl-R9IkvSHM7c{?A-?fQ3_jvj3=&vE^(Mq! zx#o!;5dMA2jr4v#&;Q&&jeYUl{yQvyRpi^jiu&xlWC>JK5tvu5{(12Wp?~MJ7@5G6 zJr>!3|F=Ze0Hl;HbPi91KJ-P0TQw6M;X0H-rOBW*D0QdQZc2SFFj@;9go1Z&^4sQL=|s#bi6*{2+D&M&na)7^jE!`QRF@>ND$+2NWl7z4%u@^YA|4h zO-wt1UfK~oczniW<87e4sJf2L90Sp8g|aq#tmP;MS(Oy``;%4;6d^H)aly9vR?kal zW1$^Q46s;|tSOuR6;OQt>uisEn;;mi0G&yQ|AoN@$FAJ=d=KQG7+0N4df@*CVS&Ff zj^+Ocqk@yYho_*ci-oD3i>0xli~YZ2O^ULvJ(3^_FG%vRsimW8{fd;WwQgnOQk?|@ z8K|+5kW7*l@?sgKjKQ>97)(&IzR5vS&zcyr|1bUt4~TLkDXs0W4);Ht&odp)=Kf!A zPau81Jgo_0{h>jDAt@+!8ydq}P?wZ6SkI|3uv@K&VdjR51Gu3_O$1O6&Y|tot7k z`tSLXH1lVvG&rRFfT`NaFt=BgIcykY65hul3hE~It|Zh0Fa4Z?RAExWF=3EroklV`JFe?bjw|%I;N3u#_3at$%`y9ZzUl1Y=Q}W#@6S{@3s@!*%fy-2Xe;nq3ztpVEm_%q&E32wfDO-f3 z>p(AtkpD2eI}`I}0n^qfVpB#PLqR3gqSz>QDSOE7(tN9YQglhMRd7A^?iF+t5- zx(-L+r)T9>S%lN8A}26&I~(0|vW-o3 z$n;7gHsXj@bX)M{VDmBIH#l9A>$r4LxOBZ^3Qc3h?mrLMCFF@s3mgzo94-(L;s1QV z{`CpvXhIsGta^U=S++21#RO|O(qd@9tO=F%W7s%ikkAE?1fvOpjyw^>6o)L=@^DAR z=WviEvx#GSk;n-tbIWaU*=D1Z8HULEkXSlqw*J{}mh~#O_4<9j-5i5^>}?N!Erq=d zna_Unvip8>^C|Ch+)3XBYLKJ@WAL*Md@hDwz47_7@-@=RPnfm0Ld}12$oj_zo8M^P z4LCyI4cP7bOAyc(f`4&l9aSd3+H@YM1H{)--ztm`?=P+oO(4M!Payw*UX{sRg=zha zmrI~8@LiSZ-O7_2;1}-?VW97Df2HZm6qCnUvL4jF-aUQTkE{rPcmvw6BH#;oT7v_A zkQe$7chsJkZ^%7=fIpeo(vqH1F<;z~+o*$yio6bULB0EB}G zjIxX}6)YrZJ%~PANu+)Qie$^h@|;*B!7mUc>xqG1pd~ZOqMI1lzxQ^Ea>5E+Z8;6Inn;RwQZICdr-dBuaL@qfEv+FgC+1v{EYJhQ#LSaDw5VAqfL;jHS39n9FV zkUqE(gi<~E)L8CbO2%cl&*i>crLK}N8x6*-*s6zD#k1Hk3rp0e$QeXrCn;ADiqAEb zj*|vNd^ot09Wz%Hb7u5)>LSaCvv@q4wsGbyjA4y7U{#mQrz5y^ExmQjlcbpz+vqWz znL&o|u$1!{%EQGlIfUfrqKBG#ti#@zK;ERH7`b!B(0$xEjL;vEX#jHrfK5h+H)IeZe- zb7wQR_Q_G*WH(JjZ8EVfOqD{VUw0xC$TZ_s&K$=vWjt8h4WsQkXva^(ugfzpQ-u@C zU6x~J!he`dq6oENJG9Nec~N*Q;kiHURO+o#=h>&&XlRjHi(`c5UasAkxHvW&u%+H? zYuP4(0{TDFd(>C1qv6TJiOa5wn@sO_Uh?HaHZP=uH7bT`aUHv+$l5jmV#q8Pcfee$ zn6U}k)@CsesYMaa&0=O}XoDmBi{|Z;9s1MTu4~)YoekxMS~>zLapgGsE5Jg%Zj9X0 z&~6s#R}0WC@ZU9PG$w)YrADo%52rDX)|PoF*0nL{tMTTs_gfLc(jkGOqvvC&G?nz8 zLITsc&IiI!#Z^o}G$M4_niI3H$m1{rYGjEaNuAq*;64P25*dX zTS*dkTrzjoXR19%^$;@G3P~-rMnUS1d<* z(r)8+V!fo-3x?x(>(=|c?H2pU9vg|ijd>m^(phdfi!%y_PK?yhgvAb$4IKHIa%RcH zU3@0{m_7>wQ63SY3J2`glg!sN=ZSXGUPtw$-A=)p7Ls`)Fq~GBy*N!r?MPRSp4hwy zssj6^BfREg@js;H#v}!G`P$%5LF5o7GzoYN$p^u(wUc$W$Y?{i%*QD^cH<#vJQZvP zevy`$&Lt9ZT1FH_+o6VLkPdo`Cn7FKPasMcR=SI^ny=q(rH7mX0`rAlsVv9S6_TY# z-Jc&_p041Z$uZUTLB!*pLRn>kqa2B{IZoRRx#cXAW(epbZedV@yG1y{#trSDZdSkG z-~muhMP4nSTi<=cR0>%8b3*9HH3hr|l{x z{m3qgh?db*3#m6AD<*}XBxZ5`p7))Gsc)O)jy!YHzLYXZAgDH*ZOg`wYRQfr3DbI7 z%e|J3nH%m^bpOJa z2{VeU$B}`BFRu_DdKm*6|sA>)-a!sa0ZPcXTIhpA$N#C65szy2(vxkgFub(8i_HoQMWkxbns9@~I zh&g;kS`96_a%M8>S)I>j7XsgF>jmXmOUq}FrRiyNPh-k6$$rq6rz?2{Zwn#mT2%$V z0Yc(5d9G%Py6DAfzB9s`2m47eQ7L1yR$8KS0F#B)VPDPPQ>r_U~@ zSc`s+yRlZ&LPgjpW;vy>Iv*Zz5iv`{Ezg^rPQj{Z#63}Ek4r158)bg5VmPW-B+9RU zy!RNL$+AW#9pi>%af{iq7usOsyF^-*ZD(o?bCp5v(TJGTS0P;v&obm1<=AN9Gj1P4;}RO!ivCDYdF`xN)NNq)ny8{Kimq!0Xjo z;k-goG{a@^D$`S&>>$d3oF$D$TWhgrLV5jg<(psV7=t43C>N|#>WY)oTz;R@84qi+ zXBX=lBPLHeyX5kQ(r`41R7U&4vJhs4@4Q0)Hw|S;fmbfu6h5)%(QMbwCHKjFN@Pz4 zdZa(ce(d@V4XTtzWiXT`RdqkYZ$gK?QK#&F%_n1^35F5JE`w|V1zwyr_{z4RFRyia zeS{Bi3GRS<8*JnyThZ)8D67nkw>=$A>h#@|qQJ)|3IFg7;ih z_Jt?lz#vQ^m6!F&G{;)0Slzu5Y!+g;TCDceP4tuRfu$*2ay`)K<3z^GPTh`z%2>;m zOE~rxHkku~n7GWRb_X5qjlG(A*fTccm(4)@fzp|)z#kNT(cHV!J#oywSH0w;)jp&_ zLZ4Fgnet_=kt3Jovc`s4-{65D>JW?2XDMJByVLRRFliXJpq;lxhsBd}Sm6x=-h1!XFo-fF{Rs7%xS|J#feu1pb^oY;! z%jnRPw2M0+Ux$ugC4Qm2P!Wwi1u$Q!DkrG}e)uSqRH>W}M0DG5G^9b6F;xs4z93A9 zhParChorwS@Ci+p_k9sjm3ca}1W<$ft@Me*eq;xb!|+({8H49C&4B?DW?7t_`Kabq zb_L&ANFQfONqA(HvkFnmJsEESmSo!3*(qE2Nc9<|e5A9q5?IQgLd01GVHTn(TGn=Z zu>qkhY*1OUA00{jS+CCM{;e{Gm&-mgZ;zqOU>Nn_{PIaN^)Fybd_nSNnm%06HQd-( zWe)E0_f@yN=v`$AT?-bSz|s)6Y~T*c4)3s680iBud)<~-Rs=9NC+sn9W+yOcrVfm9 zoJcIo9I)p`l)@xa4qJj#S^Z}@o-pefqwzT}qFm`>MrYrNBg4>Gb(1>+sJ_h9L< zKb5x9ha%2oMzu^ma(dIFQ%Jt@e(`iZ*^U0;5f6reTPcAW>*;BJMX_dRG|4ZaJ+rhz z3)95}5zEpv&Z!bY* z*0R?IX20l}_72O4nEE&(U|xi;FbVxl`fQ?Mmfo_~Fs2hOF|x-8W$<_eIrEBx@r@1d zQLKaFnBn>QsrD^vHUpvsG`BxEV$)j8X-1}~wb}>>_n@`f5S|duRD2Q4@O&e>p>mtR zdM9%8l6y-zcZbU93MUw*tbtm{mi!~c5MS{AS@U`Z$P^a*t#v2<8sq<5^ZxCrm^+y| zJIh!)yO`SjSNGmErXMO$07dkMdeI71Wb#RLPGB=tH2$Zk(z_&nX*e;n@t1ZKUw&L9 z%Z3|zSSM%p>N^0mexNVtv_L+6sFKc!^l(l}J7ZcF4RSOXKr?ov8yQ%`k@sZ1o2UPC zP(hXJKsS@w@b_nhcn#9@2xvuvPQ6|$nPGto5fbfTwrGv1W+U1+%D`FHWL6i44s&d^ zG=a-pERGPm-20sMTEP2{f8wR|Djw_t2Lg(K0Rm$F&v->WjBQ+xG&c`VnJC>DU4M3<^B4N-w3P_`7^%^A*~2fB<_ zq7ew1(K~p^A*Bu-FC_x5BQ(l2J}XYAF0IVeonTH|Y13KS^rzx;%?llJu}{q?EvBMc z_M{BJR3R<%eXb^*G`;hKQ-7^mwY1Y(j0d)%FBBOb+xcH%&00M?gh@*y`7~nCi ztkQlxBk&TXGM5~epV?%iwQ(&^5AiYLJgRYz+Vsw8{SFP|;HPfm_CR*uQ~Z3v&Or4! z$3iVAIL2_cRI<)FE^^ZbG-`%sL8k8aD1LyMDZNT#M}zOy-C0JJ&c&@v*;(qqi*W0E znr)7jv$(6)_NM9LB@qS`{L!_RZeoa25smlFpU1u-k#EA3;4XW#laVPWf)Vhadr!0j z>Vv4Tvz9Nd0)ei{rn^M-;bmQ{hv|OHMF|Z75m#?kIByz{Fuan^CG5-#c?3G6G@EMq zR#GLJGt;EbhFWmzcA|WWEyecCWx8#)py-55KX+1v4k;XF!FjGIz?0pp^a}Kzb=}1* z^AcC*!>YKR40~hsuF&Vy#mWx3Uuyfht+@db%Z*VBivV69{ZaT^9>9`0`iaYj0^-{( zF)sfIG?!mtDmnmI&{2D|qOxeijq?T=B6O=#mj!2)9V(Z_*D_f)MZ9PYDATe35eAI^ z5creHr3(e?ts+)=40_9*d<;^g%M+J>aI(51R^35%6jaXoJW&&`r?Ors5lsG27)<7LNvfz*K;lgRyezJy^ax6*kF zu^91WyXL`hs)|>UC7wDVwQT2(GIY*{hud(pr-tf31>;{b32G5T(uUvcLc< zRUbUtwhL+cWSQi)mTE^-!mlBb^wKib#$2^lKjBJU z4@3Mw?;*B*midR!J&_Y72w?;8a)~7Jm1U9sa4$3LGf#B#nY82WSw`~6UV!AEa*52g z!XuoofBneZfe*%q8!FW4?D!)F{bYdrbSDkYAjHTMDIctl5P*qzm0a-iId7u03r}rUwk}_lceAd* z8xdF8b$w}s@q?h!N-NBz}B!nuncB`+|J@uB=5RD&7;suL0fEO@Ybl2dKSWIpPMqR9(&F=Bh;TL%-<07d&H5(P({Q+$bv(XJ~o2xXoxL3Jcons>6UJ~6NCfP z;D`oMc|=yr0|u*R#e!TK%WQ>A-sKEHYbm?29k1KP#%0qo$*V~KNdk$ z^aEAcBOAX-oU)c)8cz8RgVNLDd)N>*@6dh}sWo3zn2sYhSOj*IHCl`{`p0*F0-yBY z3sR@pW;{HM3l8~(?>!KRatr|U`!%-ed5*Xrcg_c7Tf4sV;g8e(5Xjp(0jAfOGCWVg zj)&{3vyWIH-UsrAmz_~vA9r|ckGxZIv@OdfO8KP_jm0{}OuSz#yZL&Ye4WB>tfWt_ zdSQtUq&VLFQf9`(Dvg0OCzA_Z0aOoZ)+-JZ*T4D z@Ne2)c~fpv0D%{p&@H-SiA4YkMM_&@0SVngnjR%0@JED$B5=YTN`?t4%t$OwSfrmS zJyJf=V*~tWY2`&VGDQH7fi!bd(V_E9wY&fKCjhw*1`XxmAR@X9ij0Ahu$CY=IJ#Ja zKPn$$mQ;o^{HKDHiS7t=LK*3lM7k-44x1X9`yzM9^3;LT2E~nu} z#b&AUO4Hx)bo>lM%zF#bu~LHd?YZp-P@))u7Hu-cz2B`%zeTSz;9|ag8i8K#f|*IGV4QhI-2m+S{Q_wPPeV z%xeJy!tOsjnrWKWK8ny$s1AT*39K%=7@#@<1Q_1Ma*M!yMcG{A-WKjIRbH~S$yM_4 z8=cWO`)@i&tn(YDhwt)nM5vilZa_(p6Uw-3ah3|TyGp?*yBFGAMXZ7Bb~k(T?+9VX zo!LDs;97~x*f6LvJ}8p$EZaVeAau9FAty%cN;$@JahZyB5PO0@vHlvO2n{krfv2c+ z1qx-5;S5CNvGMufBmgOGX?1QsUG*327NC$+Wg9wA4mt!5bMP;O4W%nKLbwqz(lD@y2=(>{!Nix_|9#@ zh}Fra#Xk%%*c$!*-_$Q;`=e;De|0Ba7(hT&|2d=k*CAH_mw4s>)}Q>FzR`g2L0-lD z=BIf-x?lfg!(apj>|sc42xcR6u?7y)2)mY!kr*$`XA@A(ybv*8UCUybMYm8Y``bLT zHoiG!n*;J(ChO03srOCyX7tx?4v96+p1!}v%^%;J%}d`=YZvY(FjS8c-(ey~?(SE1uR@5^^ zyS!)&h+kc#tw-L`t6ztY03E)HBmWGQhd_Ujo{vNzU$qe=Um-z>5hs}n%}8-zT%`tO z$5vbzii{_qK9Y;4@IWy;$v$rU*x2c{9X;>%Ac?B$C3(wVtN)OSFKD*X12|6^;OQec zj1C|L(^tDiMa{ZZMb#f%?S2U@el11cRl2o(eZ%#9Ddzd8HF+pT-%X0{xfzB>`B2z! zO4IQ>8os`JHKz9~JScm~2+Z>aKudl|qxKHe9p7Q2_72~ueBk*j+=`=uyd()+KXqT{ z6x0g8zjZ$0ZOpGOx|Z8N3%Kjo{i1hK;V*zF^0FaWvmYjINMH+?fMZUre@JI77f%Wm z$Pe#ovd-`3URusLR?ZPyZ>sCGCVhM*;)+C+*Ft*!wkeS{4H&V_SMUoZi~;PZpkxg{!zF zXrl-{5uTfs5$cvjJ1j6o^e({q`}3u`c&}E}Coq<2;p5Rg1oSn&eOMgbm>8&vM;8GW zfFD8!G-hP2lccpLWs; zH)ywsZ6ZS&M@L|#c~t69fnMmu*BKp3Yiy0ZFpSz7hmcWacy^o%I^#~Hp6^hut5F)Y zlAVNiWZp6s7G_pPU~P@)Il~U(>QgEtNE4kzye8JB@|u#N2N0oI4A7%d86}XRMUh5o zR7RK*<%b_u-1ISfTZEL?zlbc4nYO*aUnv+o=78iHP^kzQ!sEi~WUDiYgR z7V5D`M8srTBp!SScGhPd%9)bQJy{DJ11fqe*!TSGtHWuzkCJSv`OEH?E! z-Ac2^>4XCbQ*y-eu(B{#*Cx74N&33NtaPP47MIh+t@o&e%}Ar8?N8v;wmMHZ#W|V0kLC!Ck(-g8&7Urzb%cNnrrzdIU&uC5qlhT-98O2?=U zG5@ZulhTE8bH&=`WtRTYSY*BMeY4NDXE*x}3YT%xaKyo@=bvwgFxh~n{ljB#l;BBt z&+3m^LH2t=cK5_*K(;UGGlcV#YB9oHQ|P5@Fz73aPb!<70FOZt&ViO0NZNr{ZDtS< zZrCf0IL6=*Q3HptBWf@&TZCposbunl1K>ffz{LXCv<9!29L%(LSNZK{moRD1-4|h; z{Iz@m5tuEO4rRY8QkOqelO$(Z%aT5o<>?!54CRZ~B$?uNm5k^RaKXJD=jT?ch-Eg7>z)(>QSsK0qCbWOZ7vhH#1xqA$db$yMD5*NVTm1 zT8{Lj?+I+~Nz09+bAc{OgHFZlPW|eUc-G$+Y76VK*P8(qWu3dQC6YMdW1) z>`P}=c>;qZXFD4#<&+RC*YQ+T;4Xz&x-R2vo8_-?)LR0i2EDi~F-phJj#_)6E_$l* zx=Hu$tpuIFog1qLo}kALN@=2=SoCUY9H6XUte;w50x5O40w$r>ACKy*rW+62yfe2^ zbjcrgG-FyQtECNnp|F+K+AsA~LQCr{%PoPkW);P%>S#k~pA7;)-)e7p0&9dxV?LAG zoq%UK)6`0Rfz@+bOs5O%>B`dJ*1?J#uE}lU=YA|1;47Q+C!JZT-TcrV1adsRb%)L! z)rAdu_UZbSotn=H>rLpNLUFEsTUe%0ySD;lJPmI-iqH@ape3CkfCab~&vjG*991?Z z+&Ho9jP>l{Srw;oWqbahxII;m8(bw~SbKS*Sn+LAO;R5{XK$M3JvKr-{^nocdIOg)lu@r@zam`OD=mbo)!xicn} zfM8J;L`b@D;}Ti z5~T20ZhC+}+N{C^fJXI4yu|DNjFu{@;|bYzFB*~bwRncTnrW75*y=e4T0iz;o_-l)r(hB$;YVkf4$4%AJ4Y;nMLGPXapH<-7 z0mez?-^6+IuMz#{1X}XH#Do7zoJIfkdE(r-CCHkobql7S4EPf8g zbstfgZYt9qBr?3kWy<3M_Y2}4A!#|#w$U!P7%w(;gM7pO6Djv5IgdXC5D+`Ue~;A8 z*~QSt=D$ReIqI+O*y^ZXxvUEmckPZ_WTLVQSQliCO4^#4!5q+%*U6a^a#o{^k{~WL zvc(aj%tkB|N~w*>sVxYt2aR=xlq|Fj2P|{IA;2X9(57Mfujm{QT6^Bii8PaulDC{a z_B-Cs+mD^kyu9x>>cv#U(xDFrgpg5obgO4ud7yv2BS8-54!G}8Rf&woNILG)6!0Z5M zQeHbVa@~5O>MH<5QT355_-nOwQ=_7MVb6rSKQyE-4o!$6wt7)W(xoqjr9s zL+R+|bexEcGvj(swOEDO3`)nuz}(F-ji)+Z6`9o@T_noqb6>Z2sLU)kr6zFgUxWny z)r!RS-M@`YYl}%M1LFoTNw+yyC^D^a;)Q#7Hm$Yj8K^ST2D!~I(n{Z5 zGuSR}k~-)cF^;?nTCi2Ud9BOQHvfLl|Fv*qg85itxyTkOt&AM%Esz)Qc_uO0jI*Sx zJVPB7`Je;@ypeCK98`iH1+HGJKa^1m`=DLGKvu~+zn#9D&aPT+%AcGfX~)>yDJpb3T(*gi4vGhJUq#(4x&Tr4zaP^_F1vmjH5zp z61%WASsn~KLvhzC4B2}mH6JTke4y))+glL>+EQhxt=qBi`rBB2AmWgKx@U?*o1A*E z<19UJc9$LG5-~f}Mm$lQu;}(6103uH-FacrkDs1zeXVLrvj(_JhR9WUO7XRW`)Nuubqs>pFc_)(l7vIVAeZfB6n|Dd^!}2P zenGoTo>+QAH!OdvMgo6i9wdoRx$z0Njo4Mq#v4ZH98jgQQwM}@;CV!0dM-D7uy4iR zPvjq(gZjmgK};G|Xw(!Fc2nJb7oth}vXUkC_2x5SG}L~E-KxCzk4v6z+a)o?rA)O2 z-hLU7Hr5*_nQY}?IfTjaxRtc#9`CN_(!Z2a?hSn>EUFVa)M!jMt6y?Ol5*P&Du9LX zqP^tmNgRv|HD_&Ya%;>S^CRJRbz0NIHDRuFq`04DP;je`FyCG2XZy}Fq7{#58*-mT z-Xh=qk=aj-S{ftjJ9f$@de~1gZI&WlSH;~Ar!mK+&ajIY-wS7?!FP%>G&VjT*h^!zJd@9eQ&P~ zF1FoS^K0ch=_Ki}gCul$g42%YVg@HVnu1F);pGZ)V8%@mB=W#NGCH;9=dldj_j$p@ zTYWuaT@7Ey+wH*Bc6lJq3y(WnP#TYm4#DM!TQe+9SX{P87DtzyzBV3M zl}DQ{YIN5|$68kJ1;$79k1RK}pV&Aw9vYTUU{Vz1WK%b3@O4>XB}H9mDlRUT4W%&E z;-)Q_10tcU#j{~}O?AXenbg3us)}FQoqkjahf@bMUyfFpO&^5v`KP71>2u)q{8ERK zF)sV?O4%DE+CaBda3W3_B7PvPFD<0N%Me|C$@u0`O~9c$EM;mE^8GkH*_aTM&S!H3 zcYhAS79po(s#k!z(Lk3GPC1{xM_IwWOh8jKw2vXgtKC36IKdL*okNA6B@%7896j7` zLMYUa4rlxdR`!uu(>VVYkVVMa44-B}^bEF`LW=M-0x&OK)My;JLIWxP#-uS>;dYYD8CoZ5rG(uRHv!f_hSRMQ1-hI z73S~=`tT7o8^SxR{E|W4PUwNOSaoZ;Rl5sDzMSKZDYeQYD3bjP`EyjI>s%kE zf7?XWL&JV|@F4wXBnV~g*Z?H6E%pqZlIDKoGAm;-W*$HEAbuRt>CLg>LCZ&Ef;I6+ z?>F#2!}q=EqYd5PpXyAgfq)49n?&Vb;rrkHJxvG$m1ErRZ|6hZSO_74K1O*H6C^ey z6j(wD7Elrx5LF*Zy~H4Fz#m)^tEv`_YTXspd9I5AK~)tb2H=$d>`kk*7A^Cd&X(H9 z(%$dqKXhqF2=VbZ?>p>Y-oE;|Z*Kv-A}lezw@TD;$!5tcMJ1TT(`z;?ewMMRvyOTb zr^YOJHw1qBg!G=Cfz`6fW{GL{9Qv8S^yp3rX|+d2mSomC2PK3&qEGV69+_cf-k#vI zOCG6dVz)N*_>;~ir7D>nSoo(U4L;Fnai^YoRENk%_ac@P#TmPClb!)1sCati0Lez< zgfue8lBv9_edXdhBq#Jqt(LS<01`ZX%GZ*O-UzFn-VAjYM$M8(N}3r6`ifjqsaobT zuwjhAOKg~YS_U(VUKJn%kBvu%9Qjd?D*?Nhv3qMw7K_~)Cw`xcUiHq4p7tPrgpi&V z?JSDpYCqhkS%O*ru&GOBP%*|>Pm8eoxJ1<_I_z-4KHjV+joqm#Y?H^Q6~SAMEpKuc zHMQq-|Gt=CpW?M=1l?mi7-Rk;AK(4}y5zNBB&)kQR$baT!R8}j1l{_>m|oPxKHZ-P z!jDSlYig4JRQl*13G-73#VKMWjR`SH4-+nH{w^OeDua=1H!w29l)5stPFF#*$w%|} z19g%*O{Gp(tJMclS#FujI7ktRWk8mcRgDF~E^~6Jmj@|UQ*2Gk67;Y%jNaG@f>>78 zEZNdTm1IL@0fiMS&}@99e15@5OuBN3NX`q32z#(Ue7=u`Y;j})EW)*a!AN7;lz>qM z9cAp030EVt2O>-?z2>psgQmV;2jgd^>EojrP3ziE?8w$c83ZagFQC1xQLup@)_9A5 zFUG!Ac4sGx#(Q-p&PifevPDJJfO<___~nfGV{kN4kOVK{_JwfpBW}j?=1h>et@7w} zQTBd<^5+$C*+C|BP$RU(>}Z_oMsJE{#yONYEHwh8+$?))UIa?SjBu)p#np^Ecx)67 zE1)-vd^);a>O#TNA8ar6mMPU5Y7w*@=h{}8F_z5c%R|C4L4gBrfz6^Z^rJ4SHfegaAndFblMlRsp3 z4lUTUGdO6(noT7p#S}hlp~Ox&NN)k_ zEdDf1Aq02V?P^ez;kBOj@zB=AZnoC|S7wXfKw*Hr5nlFjl|s=q#(ca)$EKZ_L7+$2 zWbIKp)VFehDC7VptF9eyo*00op0>zupw-QvBtpd4NY)cNqYmPGVx`#zLQ8M>3x0T| zs)-N*Y!>7iSpz;*1uU5%^ywk0HMQ9O#rvAKmb}$-OiX?M1w88`I4zYu>+#aKa4^Hu z7m|-e*uj9-#2UJh?V_d~Q3WjlH)^Qpv9$5s&&)bX(>?>%Y8bg$7JloMIZKwSO^z4~ z7v5ZJQQKuEA9F-V&7eyx4n$uzpVCGHP`<8?*xmnx2qQymriEHl&o6D#u@oH&+>pM; z(^bpfoD#^I%0xc3X=cJk!yE(7?K4sxDzPQCUM_L05FwHGj%Nrryap;bVTr-*==d*bm7vi=Sl@^}l~38vo+;?I zRz7?{wf+ml$MYhq-)bp%99}Pp(W(!T#Vc+c6+RF57t4s5OOwlW`&2!utu&H(lOnF_unxBMNC55}SC0{9%n8;tD3`tjW=%@)=Aa6;#IH zGNqHma9Wx*%EcK})6I4&%3!J|CRrjWjJ~B-#U%Nbz-R5m5XpMNq=vHmEY-rH`6Sht zz*R321~q^9c$DGtyfDJzSU${JkuR?Exnxqs!Zv1_)T zKhRvSo(sQ8l<_vJm-#Pja`8&Voj>^g7AU(v^U2w$5H6ecp+&$~?57H=T|5_hE0E*Q zm&MYryNCU-&apqrV(HQ3vzvca+o`;_?Lv+C*prFLqw2F;eTC~mrYUy*d0MNfq86PA zkrFVo`NHmS_W*0z14Yn`zZ^8<4%p_}9o%&7NxKm)9@h!9@adi5Zr449+o`yx^ApIF z%fUy1t6lJ9?~ag}_w~@^u>lh@qbg+1@k}%t%hOYOA(su8y<-=dO6SLE_$W7{B}RC{ z-eUhocJi#B=4WlGvt_DGu=|j{STWQ(XBVSBlU)91)f*qyo%VES$jF2Ighsdg zU7H9ohegXP;W=BsskWBmzycZhN`I@qm4QD2_`XPpI7O*o>`M%VgtQ3rTDVXe#~=G> zF(JP}d(lJ2gfv}qS+tRlbJhy{67>pyAsZnMOteoWj)_FxoJ0@bLQopjNMH>AjLO3| znzN5~jYDKE{&9KBkLH=#@PoYLPl=sv!zLOm)(sN3iw~Uciu;?FXRdESu~}jBhfs~i zHaY}3kNosmXo(dF>Oik_-Nt11W%e*43Kg6t^O>dBIG-ee*Q6Q$liqx_`PVw5Xkq46 z^Y$0>vD&B18Tz|j&=u*0k8TM4iZ|KQv{y0{pM*k>KI(B>-b;p@Z^F$HA7{$cXhL2g zp+G?3odnNXz7F~$r4Es1{+sr1Y88KD60M6g2SDXW-T4O>e=tuMiv<=VBT?^G`tW|f zV!Lv_BIcSHu}wtPaD#X>^*$Um)&8*-2^(j$lH4i#i)_s9!fW0~>&*9odwuJC?VF2V z+V0}3?-!7$#R!*pnf#0J5*L?0N#!^DH+e-o-(&g=zHq>YK4Y|Ew`*&$cmW#^?@lRw z#BV;tYv0PEdXptJF8`6$iw{nF@jV`oK5;-+Hln{+3H$Y!{gNbzf|QK%-%a})AM6u?*rijx|PRW6H@2oxF?I?P-Q1+hXI4|+^fl7l!HgYoKE-Si-WKKt?y2z21#%FH})#`uS- zVvt)`37%Ta{QOAEquN+7QdJbw>t$!Q<8MLD^?JHCVJsxt9 zu@Sp-W=156D{AOlKPaCQ#otlRbjmU(Y#sFylq^iD>hL9Q!)>dkLxUWlRn{pmx3U%H z{c+<$AX?H(Lj%UTjegLNSxOlDm(iZ+Oj*ZLfNDXFrbkt7I-VD|QRFQ@diIxA^rZmh-_IO92K{{#cCT|6=Sbfa7SBEQJF{~j{&jA>XvQG{`-)wWT0&d)|_-tW@EDel$i>}7&wh4f?U z=lY*rw2z_IMYxjB+0k5V$;9R-i335+3PoNz07%wKvS|FHIg=%2a^kpJZakdj{ zXFsyEF7hF9PKcYxbBQ==dmPEXP>$6rVV+26YdUtK)!?rlI)pO0FmHuEi@O8}5OGb% zF&^fg1}a?t*}ugVQ*@309rTQec1~24YYEi?7wJ9~a0c7kZz&m%d&ZS{JB!5gg)O>- znGLic;?|@RZIS7S@>Z3E9VJ66Cb*oA9ip1Ym z3gkfRBGpTTE0963;Y?DHz>Z17_8 zZJ3;AYaEv&k`}h%t4lcqeHixJwOW`g9u=8Lh#w@mzhVoEs6LKsR4UD4b>&e z{Q{c2F&TSf0E2})<%G$-A;_eHUv3@Ba|$Lh-Fu76U$4`wW3{vO;wC!|Br;gSTYb*; zCT}m!3JYW#e3#DHCOpCKZmhsd8fTd+d@|%>44Z~~b=&S=8r?F8jGd_J=n91`6`__a zrj#2oik&FbET^=}3#8Q$h1sX-<{+FP4#{*RM=kl?Ag<8!8>mF=(s|?ZWrAbADJg7# z5Sz^ovnBb-b0$irD@5Fhw8Dr4+HB5^yTS##pxNc>TG1X3=V7gdqAGMj&z!kJ_3LuoSVg*lj7X4BlHLrygY%(&sh#)&UJ<< zESHfQnJ9v%Ygqt5)waqR*2Ph=kMY)}ldN5?Gux;;|0t_9ByA#vc-QF!J39Lsw=_T0 zn_$XME&$mE#M)~v^JBil;EvngrmfqX7B>(IqIvd zhM;6cG?wU#m)C}}Y?o*oy#3~ccqU)_2w_SkriOM=a2=Tcm4+IC5w#)Ll2P1SSX@2w zqnKI&*2X$3J>5X{gr>R-@RHf1U3OxSL5#sY+md8%r}$%>tLP70fFtT%kV+U)_9K#P zY)DNew1c*gCe7Ca(5JfG7h=bqo(b+-T^>y*{e&7-Uy&XnS zrmRlMqdExx4`Iew-9OR|TUdiKh3O3;#Rarg4C}0;N9lVbAvSAL@7sC{jViw;*A!fS z#T)FpT;%W6Th3Epu5PE~+gHUXgZv8Ut;lP#p+YPz0Xf5qRt%7)ED$HqJD}LR5-p9t zpWexJ=gQoNG3z1CJELTFhH;`c7)8Ok2gx{Or!CU--WMK&o+KTf4xunxZ)5k0B+j4C z0pFaZDdi8^u(0aHZ*RaOBE`LV`4&CsKzwkofTN+C&RP?spfxt1+ zX39xzn7aqdDJjlU&<~*^-!jv_)4;I~(vLL~^lq-lp-7L@sshZ=bn(!a0JAir`txi` z*w1e9wa2*egU&YTG0g$U^QG@BItfhe^K58m^hh67NK1B7M!!r3v)J(K^3bM@1p0nO zo=e~@$4UVh^T*z}K0t_?c6^`$pTPrws9WBcb4wAIuS9-sz1jCP{lG3M&2H(Of(_w( z3zCGl>~|2`akh-?Flny)U*mD_`oSi-Jz- zCPaw|Wvp{+72i)1Wv(EeylcM?b^&ZElx` zaXPB^z)x{+%}IW8?#S|4iA`YhTAg*cn)70-hj0VV)N%l;5T+p@HV_Q!e_M8%iH zGAMCqvw7h}*9T=L?!I%0$vHhjp84?QPB7Thw;eCb{$jP@MZPct% z2prUbYI2>@rqcCM_!0TMijRi+s~)K0ztT;Y19Z1p*b8K1NFrdr_Pn=;N-81UlMvQV zrknRR+Wk50@a62MH~Bqg-7^Y8VH$Fl;de)akV}Jtog;wQ(JzoAyDl#%t51e9x*ArrnVi4Tcpz}B4BbNV}+JffKWORxZ>#1IYnuIy2R7)D#N zfaU-LAh}}_PVzPI9g0B=@{5(>v{20Nxx+3{n(4y|h71{<4Bt`MV)o~Z__em*xu=y3 zmMbaCfpOs0WpFqycRVm?!LpTe@3S+K4M3gc$$34c$dQA%eml6-$SO<$( zB(pq~rV`z;RaYszrV8+GG3;@Yof>6G>)Ra51$YM`;DiCrbGB+61=6!m;bCL|auCFMmlND1S zVrl#-)32%*0|Fe*|(&k|XM* ziFH|{$C4BB@MJ8a8wa&+uqo#8^BmlIq@*RR&d}g)l3|t03pF07nxq$#6Yr>|d z!|1AKXp$D7l98*Wu#1bCow2Q%Gnt%&iIJ_?=NOl>l`+88%HbdVuqi6Kvbe%%?-S;0^Ud?k zcN%BpI)vLAYb3s^5Xun5iy~2o0%#P&NR;~Sy`}|^HE8f6gs-6QR7XFUlLuhC!?L)4 zU9g08_&@qWeM2Q2WC{!+;iJnqtm0mOdfY6KyTmO|$|>bA%3nq~AkonF$wg_IcQ~V! zzr0qR*M5@Isy1)M=4`SgWBEOmzn04LPH{cErXZO;k5YzxU{|5G#~Zvha(N{@-EDi9 zzIkqjAe~-Wu0{Zuv{v~*f+q`}uVhFx$x9i25nsR}ms?sFSXn6lGp?SB64=X@;>Cze zH%@98s-yc97rcSNVfOAYTwS83?c3T$GI^yTKQR1IS#fgB31hZ9@uh=M_K7TCU?=+G>Ni9Zb;RcL8FfbM4v}G@mE<#qM_gjauEyl?dL8 zC-PgUf8VoIa)FSTpY07spBy$6{~vbn_bN$>hLtGp0y;lv z?l1NTUErb&QnM|!8wyKq9hPo%^7K&Xxz$PGOCp2Sa-;l%E2SMtOI}Rp11Esj-8?=Z zoZ^Y;V(nr7xA%npde+l{|GEcim-cFmqn1NAb~>`&U<`CoJ3KCn77c8@escdT%_%gA zR$5k~lmeF74+n|d?NnQbk=mkdRAjtfO47&VcHSVxu&W=?0#TFVm+%6NGni^V%KIzG znSBi`d?nkmG{5l%G)cm@DvW&OlRFuDIs2wK#h*2>Hd3FSn0})UxRX8-{AS!_4896t zGDuEhEPc$2B&6oz(bt;2NirX<8=tQ?!JvcGS+0loCaFo2k&y0=h;lJWnpLHZx>0qZ zO*3azrM-c3Ir{-4?(L%8PX0FvSRlzwW07}G&Jyj)TJR#PM&T~ zq3OVu|0gGgY^ZNpEiq0uc0;_^;utO)ve#6j+(BUA{^Mq1V3!!NY!m5hvDsKMrv`$z zu;DmvAmeVD>q>G{C${4s`TFx5hQ*d-sFYT-lm2|85{8qBXRMCp++z9Mf~&WwKsPcA zu9uxU6bI82W{2Wm3uAgqf5hEgFYT0})=?ZImX-}@VR167pi7C`%hRH<^}(yq;s2qnM=o&P-U7UZj+fY zY;sBAoDwybKO?{++aeZkLsh}%);%czhd#b$?$ls4zeWkiLUcZ1j?!=lQBQk8&DzkR z_%9`ogmjygMXFV{Vh;RXnwA7aE&DFCFH+L1(SFPxMyC&1b?}r;TxkMiuqa#NyoMDg z`gS;s^(boXg+wB4J7Yh8CcXEXsCA-(O0yzPV2<2p5dWrSYA#^2h~r1WBRI&2m7E-EIAV>~ zIdf@~;1`sJp6UAlVB|1RzS2ctP2ba>loQC^cE|CH6J(OWc@Gz~dSnHnySDamSTeBN z@6V)~>;}(QaQz|rfb}|Vb1@rb=8WcN^rnQ}^WiW@&s^jgWjEL9uSdOs zH5aq(l!&8lkBtnaIk$ZL>7j?-92;b(+>5(t^#0~Ic%o$c^xi{-oX!u`#k;NB?-Q$CQ;F^|i(`DT?>#$Ae`+l*E~pmu!sdLEWD>RA_3>?`L+dTut0G9gxhT~(`hVDkVs^?`u&RMt;O7TQ#=4WRY*>TGo$ zitpz~l-R4B;PpC#VF(HxU}eCBUL%JRN%7iwB&&pHymCEtQ#qq=^2HPN?!&g0a|x(E z^pOglCTs}Acd^Q?YNzS;G$`+IY+ftrS&hi&hkD05wXhF!4oUil9PI8&-S*+HCJ}#o z7(<%&a&vU%7Lw>tzXianIbOJ#L)GmaQk$25RNFkEslF2|R}9)m?{MiHxj-eYDelhp zVfYc|eh}Yovj|AMY7AI>z2WoDxCX<}caX3?m8{*Z_m6gl9x0EEQ#ENBc;-=*IRa1= zl+a>%ls=F{B&`hZufwjlovmYRp#k{4leK?R$b?Sk09yLm8`v8a^qi*Eto8bL#IBt_ zLO9-Ch8aWRUf>lY#|Z|Gevic$ns15_c83AOp1~B=9sTj&xcI;L!p{iC5V%d1P`#B} zRFn+lLeY9eVhOtnyVFYV?4dA>Go)cqeMqSFmrre7L@6G4W+ZgUQxsgmelZl|y28l- zCQS#o9mlsJ%ddl~a!dl&#qO~^K&fT?sG`~ zlOWgC%FIQ|$o`XE_n#cMs;Zi3?;O%x#CT#tb6RSV8a?!Nm=)wwy6Dza5HeKZ9gCt| z6q3E%N5c_94)=aFidhqjVZQ;VawV+yA}Shk2Sd1R{uGrg?r;er|Rf2Hs~5 zRUL_)A8$K~Ac|W$AZzJLm(Cyv>CoR$RAIM49}As%KpvUfC>W%!Qu$1$5$OZS$%?d6Mbf6C#-)g>x|AHHbNTDi z({X>cGO_aVi!yT%@JjCOlAlFl3|pGhBs$vm%85hjDCn9`Ov_mqjP3%y4u^-8B=mVrOlz9kM!^kExmd6#ng1kqEp#pUL*vM#2ER~CvLhi8caNUtIXEO%+(`HE zgpjl_)r9{28#;%%`HjM~So*hbS!Uk0UbggQ7Wlm^RyTTo7LKGERG-k-T+6vL3|b2* z@$+$_d%@ahCgQkTtGH9){Um{S4SX4q$F-0dvf%&;`p-KoL8R++vWC7-&yhc))c@dh zFK{qejvs5Qc+ze-6pm)fXMZhUx!&+>E&#&b6a z9ER3`^6s;afk+iqyIQ`@l#OJ$!gElWDtkj0THXV8w5lG*@SPv=lbQ6&4xPi92Jfh? zKtUh+bOqLj!+~cY(!gj{)w@E~leD371uSg9cBQ^ebGCIUtFF;(x%F4#if=+)rdq-v zI<&-D^vMHe@l`GgVCFWRAdxwPP&%ZC9=$kk9@&wLP#gbe=ec@A)<|D5BmNX@j}LIkJ0J9jM8MOJ23N{fskhFpFPaK*w2`)x>-~ zUpKs>VBhUHV;gqoVVZ%%+WI3A#GHO$A!n3vPv(VJw5~PSLxts$^h4B@n+1`T&N2V% zYXaV;6W*=^QCI6$d)N+fH4f6Q=8&7PXK)6zWcT!fKisxE=8WvpAx#jpa=AFj^VDP= z3^*29R(QrqrP8BlFxI5oJWc!&r6tT*eY!|B)+6oUJ}@x{JJRKN?_eA5UIFh~?@f;HYA z+wOyhpZu~l2-=u9$iad|=Fe|hm6iiKgR<|D*~`5B^&>9Z93F?F`39@1Fm-tc@9hzr@)A!K zx$l9GeFQB!IZ?GSYu9$}EpD$fiUV?TV~5xPlF_kzQyj8{2rctB_y;wlMeBLKboZhl zR;Q@qj{UY_eptgf-96#ICnD#vxKIh7;K|b`(Z>H}uJ|9rn4%8$=2jK}XQO{+p)pBz zim1X!gC8pv$HF-vpyE}LjbV-|kU7#GrIBUEr9#`d&LItW)SAxj^L>g%5it>ruONO@ zJEv=4XRY!+tgO7OA4?k(O`RXFuaLQcl2&>>KCp12QoT}J1P@WGYRxT^(rqj*t^16`pHKhtP4Ymyr^sH4J*#07likw~UG#d1KmL(%rscp(i7@Kxz@gK< zb_U+iWYfwa7-c#pSkE8oTy@3~Q*1*3q}yq*$mK? zPNt4rudrsXCez+MIQ|J_qw!fjTxx!2N9R+&(K^~Nm_KyXypCq#CBD0-^Xb9Wl1V!5 zT{@8R?g*hPr`+09R z^c)0F!WlxpGGQH1@+y?@kFZ|PJ|i;m6CRP2ADHO(1#uzw4Lf{)Wm$6S8;&KBP|je{ zmQ!I1ff=#hA{voPuxJjf*hUHBtLeYHkn-gxOhpQWb9&X|i?I=D7g zEsoLPP;IyzQd$kES+#%%-;IYW%G-uBPcq_B38wp?jT6uH3m3tf z*VWD(Ka4JnSJ^%r@pgt_NiwyqJCb!G;_z7%i1q}D?Fz9$6&g1s$$pQ|-KzJa+0V!nwRRG(`CgAUH%hpSgV0s*8RC{Mq{VZ!bC zFwsZoNy5D?J!rz6ryV{Ykv>Y%M>N_?EAx-&VBSl#3a;LYoAzg0=p2(fMy6hIJ})d~W~@(mZ#!PiLYrqN(KUT?vptfBpv=ucc*a5W4Q=u{nFQC zRnr?V=NwdcniRnFNy^G*NzEzRrE5+P6|c|v8jXqszGmc-O^odUJ#oyVNC^DhJITCn zsI{q>&?T2>WV4K?cuN(od5s1YlFhIIwHbN6eugY9tSM;}($saQY((YdpXvZh$j%Ns z7a*?en&JS_Z-xA~$SkXkO(UrRmq&`btHg2e{>(D@GW#+ZDJ~vynauXQ;QKT$M3us9j6lcF8AR_HEy=VI;a0!-VX8B?7=7?Yil)>sC#*V2sC z2Hdas6O*pgY{FEOK3i7=SUriKl+mVLxl^*4~H{qEl#Y{-(gUgDpK%6n(bVZt5RrnVa#r-cAnYE@yfZ^+aK+g78Nw=v?X8nL+sfeX+^Icc-W)0!J8APDB$~} z^`u)1RNH31ol>AK_FuW=(BU0?<5dbWoF&zcf=zK4PqcjU9@M)-XGF0eLU*0hRP*hQ zYe5Ngx$`o3aTSNG(M1)bS&b)~u0p1Fh)RN8kCCtI#*gfXSZhaZO8~Yj$ugDQ7LLSq zi}j7{)0;D=I({5?fQvp@KH!#sdjoIJawS+zrtf#{}nt!@6 z=IWz!O#9_nbY|Y;XTQlTyL;XLn)d6o*bsSPnDnFXSp{0*?@!o`&y89cNY#5!$!7XC zo`@k-1q^sX_uiD^#D-KHAf-z>dVFPfL9(E0_QSCo07%VHt)yL|z_nt4Gi*YLMWu$1 zliYG?j1{(>702;9!We`V0Uvw9=YYON;_?Q_pU`% zT?`4U`+0sr9?Z`b)pm*2FKE@mB=lm&72KODYjHTh^sQz(PNg5 z!!QI5&LN{WwfCmkWKqXHs~0#jc1(``tfUB=%wp425SXNWNALs1|B{O(hloVC-kM+~ zY#7}AegL&$QMfbffavaORRXjs-?~&3oS7p&0-^eqqMT4+Ne5OMUm8AX>`TT^X5%B2 zx?9~nQ|=lrt~qaN$WOQlK@~hK;*<7%hY7#RNnJof@Y&1J+6ivl)@Vp!P(P)~Cub0j zcn}V(NPVJZ<9rqI`fX$sHG5R}p+2^Kr-lw2ZTFGV_NdJra(O!@8Q*)NP0CFvHX)}$ zOC%86sls=3e1Yk_WDK=Z9ke)w-3ZMo^IWFz9>!U#3m}wyc-yguRXaGms6@vAQEEwR zH{{L2yek901zM5BG86Q522`XRn1JFZRZJPaKzen&*H~W9MCiZ^xPB~&slRe%B z7W199)Czu#tePl2T^oSWRL4br7p)|-i_rs?CuO=v(u0V4&C;XyT~mdnBl56>&(9VB zu=?A}b!(pX5aXpT!hT(z!#Pp9)Q`Xj84=1R;w1TGoD87-d)}74p)F8>75A&-o1x7a zx}Rs?&X&1mnzR|=R4Cx0PL@f4O@5++$#E()ip5AMGnQ<`Rmd}agGSm5cHh$AMGO3UHu4$Sruzst z<5<@59%{1gy5c1=28f@frlFRVk!(H zx6d}oYAn#tuYglGlgGUp#Cc~0oDMxq*b&<)8!a}E-8FsW)cBz0TUV%;A^)_GK@RP; z-HFb*QAzVwIKmHss7%2=E%Y_ltxtp#EewGRYpkTt&$UUsT~6)hryGiSXu(oliYKMS41y^gB`tKNY}=wzkz$WXwp3IiXS(cmrKj5l@U|w9CCD;wH_KoLyL zT@zvC4Wqop!m13|g7*eemdNLYPC@%Q(`NHQ}ud4j7Y+!b>Q`_l}js+Bj72lWkIy560U zn7Tfi=a+;h=o)7|&eFJHxKF##Etesl@F*r6Y2Up>xPOj@7BSq2?6<6Y+;SDaOx`jy zkCWR_>I(sW0`|_DZ~tp3B4KP^AwDQpX=2X}Y< z#_b(uEOiCO1~@A+oa~5IkhsEXK_6dAX{*MK$ zXO`Bys^kZk41nPEt{^#sDZXyG<&w+Enb1ubQ&4_Bin1bspxL+)66q{ZxhZu|>F$ z#`yQO>woaX8Ld4-r#UQu)<=MtwQ?)llaPAx_=38mZ$ERZs8i*eJ%|Fy-N%`(oc*>r zPKp(Fs)1?x)2QsiX7WK|RI8+!poT7Ob$ z$YmSsFjboM*?gbL#9O7+Gf?umDBL9~xlMju4MfEX)3Dc%F-}Ok2327m)Vlh3Rs-uN zJdM1lZwfE<{wUA!CpzARKPHX@E77T|RfX#InT&X9Fk(gS?7y~Y#yW?6+qQ7svL6i4 z8=haSF6L=)VvHdEFl<_=-rk=GP9sgNH(yd|;^mpt%Wrtj-fuN+k2MN?Px3Nrk6^~$ z!9o?5b0DP@Nl6H!FbT}DEg&)u%Q+-*Gds$-^2(B^J+T{EwhKDlyGQ`!j zz(T{d+so;ysq>nGJcy>>&I+J)enBUZH#?}JuZg6XhOAIpUw|)hio+f-_~Ti6H$dQ} zig8g0la>G4jQUBK?+YKb&4+y=<-{o6)VT3u@dIL7l?>h`>+pVvolfsGI%yfEgUQ~a zh%4A+9FQ|@XAss=g%--tk#N_I@qJ%GHcw}oCidl7AopR;k+X{NTfv<8+K^4kyj`di zZ_Vs0IaSi*UAks#ula1}<-Y_UjF%Fo%7$#l*TChT_X5a%>9f)YNybKi~0 z#yxI`80_D;wGn69Q#Rcy4y#3YL=byNib#jxH%uZh4zRMj-9@o5dOmAC;}9g@36W%G zfFIDrf*jf3g5BPwaw9Kmkzk9G#X$Hb1v5m_Hj8hE<4iFR_CQ6qW!oUjzj&Q5eI z`+6LrV5olr^*EJ<`40K-fQoO`gs0?Z_loSNNBs}p^j|hCVP^|~-KU__Cqb{7<39nz zl!S2^aAvd+#b?%nCZLWT?Qzd}qdL^81}q6|&t^~R`K(pCggMIaSZU2(`DPE)WnLc{ zy?P_Gxl@w2^M$+O(97TnZU8HrEY-KsU^`3zCIZ+&CS3MC^l{ibzi**|nE2tHYQOj* zKMo2S!(KYFnlHnm9Y$O_&XjUtN(Li14no;BMNU+RYY%E5s$uyQ96G+_7#zvD{s>pG zu`LlM&6qL8OvOO}f1zF^!*|>Uvb?;acW2=#gYC1QEa_BFru(|R{Q>3?6!U2sNXgGE zs-SKA0}dyQCMBPa9XS>TJ#a$MK)m*a{euCOI&Ntjg?{&rF+ByG8P(Ml@MqRj;XP;T0+B7*)PAM{{r#vtJ1Ks{fzy&Di)usLjAuT%fGD3Ut*gWWqH|NAtc|~KLc|$ z<&={oY_Jl197ROp%Ft9~9vj6c_2g?qZmQ2Ke2?I-%G(?vC~~m+T5kK}zaK(>m907&Gf3Z&ZteKa88rcaovVPXT;;5ispEVuySTsP9&$#rt0; zpzX;*j42i}9W^QWsEiV(RU*D&^*L=W$$FfJ{J{7$hhC`@=W@o4#PA-#|2Y!(?h1>U5epTxxqnvsYEI2%OY?!<&aYF9s+h&Z+ z@Qc^sH%jXVJv8S^1ftF^YxS79svTI~_jxNIw0xs2(4rx=f5p*uuFFr^$%Y1Bm%Gad zxh8=W5A$O9FAzC+1;QKrCp@0{zk7B57DN8a{Z;%IQ_s?ncAwQid*9_sHHjj_LZKWJ zrHYkzTw#-w?nNqY#11HwhEYa45?I3>6D=rqeSqyUFGVGL}DPSheSAGBSeCQVhdnWJSl#6ID~o zELekjZ&rB?klEEPW2BMW`Bq~>JM z)SO5(o?tjIhJMq~+C-GsnPE6FM#fs4!O>_sGL=Ny(l5^blVG-Cxe&i^A6Lf4Q&qMs zH8m9pYo?)1A2epV~Ow7s2fVHHbQ=hmxyOVoTR{A73C9Uz4)gC!)->Q@-(}|4Fa_3(4La zOJRaAIXORoj1QBH#B~%kN>sJ0C+w_9e>@V2X4D#nK?wMK zr|gPCrAUxgkiDdF=#|g64BnKeJ?$uItbUBTw}|>es0FMqaTaGS!e8kB2KbY?Os|A~ z+M_$?%iSa0RNF-b%VE?I{R_Q4=nNJZAz8E7QnabxJ}9huDKJ6x_(}d_Sz{j>9f#%< zt+?3Aa+_|D>z9wPoBItaTbU_V5uFUlM0qmhq7@F-U?4p(s|az=JB84GCpd8OvgPtk zq&w|Vrh9?pHnjx3Jn(V%)r?-;FJXDq#Is?WqS1`CAv4$4kD^2s_x-4$Bvu;w_`G`p zmfxdV z#NfO&%wH|gu3^nbGWdG+!s(s-^v&)3OoVWut>qb9{_^HcclFT>^1UI?3MEIB{lbv$@^hA=OJQWGI7!l`nn~ef@*mx zM4^)MVjPRCWT#QWb6Yz*{HBkn$0PRj=a3Wahs80aV0{l97Kp74>V5o^!7}VdQI>Dx z{p@+b1q}XAQ@r?YTmbZAl(0-$=a6VG*CAQvu1qs0+#kV3s6;p4{{62%6=6D;BJ{zy z`#O5LwgWQvbuW{4V3f%~XH9#9Pd`;W2JK2GW|%nX3*AgkX;{gZ@P)6xghP>;?vBli7N`^e32p@(tMTn_%vj(?=aPBwRzZY$L-rv5ATRL0qgM zb^>Mq4j`5RpkU*adsKM?+xheTNMVetL7_py!rAao>ehO zuDKP*k!Y{^1C)fFdUE<86H4Aqy{SP!OcJ3_Ttu%Nj`@sYAOB#equfbh0owwmW)5&( z>Sj>7LkFvNL6T6xh*Gd6&SJBHSi?h{#uqAL25EB{`Av_pT}RyQh)I$pHg3+Y|j5pa1|0Q z{5KU)@ej);9XPkW)^M93gFGte$Uw^QGbP;_h{WS9Jr58>^5SOKEuVdVfwA`g(r=K! zBY{Uo&TnX0%KVjL+(XAIPYS53Vaq85*rqkL%l5byxR~h`je`HuR1Ho?+8;>GZ>(3M zb5@VYIp~iB5ow>zuq!TfIfa%ELz6jH!DD3q1pVJ6WmG1Qws?IRA2GgdvUW|qEIRBu zl-dj*{zVA1p3e71`Loyg0hZY>^-WNFq*AWpQ-l*0hmG>aw5tgL^~I&HVoL_2v#Y0D6Xm2g$yGoFpIB2w8a*@D1$&A{qwk zAn}C+q7On2HXUWFixin;8>|?T3`-|^L1r4&7)#39OCWurNKg2yIh+hro}ImnHA7kH zb$ubG8NbAGQe-)nDtv?J-TcQq(^3m;$KoYT5P#mDX{f@47LA>`>03)OHBt%hXJXk? zUP$|@XTIFh2G4(`8Cp3>3dv`5Sbv{Nje-+==SU$hE|t8X|Y>0|2|M(+!akK zJn-BuzdRhZDi+{YN7gAH<2_o@<>3>mPh8VV297Bj{aJtq$KseM!Z?=1<2dQR=jcmg zG9-b|mN;h)x2h_%*uxINOlXs_2(}oDu-9|!31I+jP#7~Z=u)M`h&Mf~Nh1o4XpL=G z;#9NKtx`t!9gN8QtQ@b_p{2O!gToDWwZ)-A;Lx#FM3;8c#I07D{jOw+&Muq9i5RZ` zYyftBvXmQyAt`adKMr_ScQr=Vl2Nlz;h@Eg%DzHUw`%-8fCbEGGNlS3y2H3=AceO+ zZntHE*O-V=GuNNMd2y%J2Fsqlw7xw*(c0?)ELENTiG zU8Kuc!o#yA_!NOyqA z5Z1a$D4ZX4n+7&OImMiub=U3RppIfMVgfJHzq)9)auex_Vd{!7%69i^$ho(t=7GC! zH%EXv2VK}tPe=%dZFbxBV3XO?E;@KXtU5W#IV^3VNpr`3iqYVk=Z1*Z{eV^N`A!Wg z0A{g2;jkZY0fxowg2%=z(k$khG3GXvR2j#$5V2kxg+&6ZNxK$q4E9Qo(GQ-;8!iCh z-!Fc(Xx~dRP2Tp1`R`f8{hpy&;omZd&#v^psIC0xUFpA`)W1i(E`NVQt5WO~XO%uD zYkuLL9Dc#23ZH}v6oO06%MWKp_JJN2Lp4P;T&l|G}z@|3Rkrq}|^|d-+n?O4H}!2hb0r@CD=x6+hVHH1S6(xqwf}-Ut<~&W8gH0_&FX;%g+_M2 ze%pCYJ_1EkyAyS{6n=OE=R{3rHtKNUm%JH$N4>8He(4j>s}s{X^l!z4ikB}DaHFtF z_25QTmsH*W-u+f|9$F4KW8g)TiZoy8Iq?~+_ggQP@_}qk{qdUy@)Qfq!&3*5&?5cp zq2G&Fqh*o==4?JdknwF>KJ3%|2heS*A64b|Yv5Dc<}nBvaiseJUzjQhcG7o- z`*YEgJGh@{SfcSQV1j_>=U(V1dGxv_&Ak>H7(c|nXg{?kh%>UG!@)<@-6CA+G+&6N z&Ej%f%M3J^ZEIjeHIFm7}|iCDDWfqlseHXcSwL#me49rO4V}g@DwD{ z-bdItM-B4r_FOVhLqHO7C3pZBPrBkbi|?5U1}1Hc&0oTdCW2|1Y#_635|t9z9?VDr zU(~NOD6toJ zrFN3q4z0>Fv3e4#EtHkHq{_UGX_fTEXpf}my6<(um1?UK2yi2HOMyS-)~^Q8XQ=XNZ8v21%AxSfO0f`-$8}zW>YDv)k(3fCvPZA7i(1ZV%^c z-jmt<-cA1RFDGyy*jOx~3B1BN`K6rhw8swE%-IOTR&c9ArOjqL_ zT|jbVw9*m=>9Ku$DkJu{=G{a?MSJzs_a$t&YN9db=rDh z#f@3)q0_Iv;a@$lV$_^vwzevVZ5P2~Qu3@g{@UB(mY%I*P-Vw?MmppSf!aZo8+9KL z`2p(Ye>gCrOT~Yd(x#~(T0@%GsxVVoAtnoioA8!oZPM%|)&FztB5D+iXln8ZeW0WK(F5{aI`2-LiXsgR`W^E)iIklu_=J}j zu)$nQ6&vaQZGtuD5qV30s0acf$mv=$``ow|O@R76RJBN`{1HA6AHHK%ytz-aP@-Qm z`+^U^*}s+jUCglo0)T8n7v=;ECexLO)$gXz1#C@vcinHEr1zn9?{`=o!$2FuIgwHC zV@)UZz;_tUo=b%IKNh%Y^sG8Ui*5VZv_W2@m!;^vFADg-@iC1yN9<&e8W_W19`dEH zv>mbxd8gHGW-I-PsS8Ie(!+@n>gU{_y~Sr7 z>}d4achGQj!fQDzQPD-o*Ft547CcZRN4Qb>@A@3 zO0q6c2yVgM-Q7L7yA#~qU4y&3ySqbhcL>4Vf(0kIzOVnDdEL$Q^qW^}-Nj`sYS*Ri zsk*1C&e_{zlVr7au&JU+=~C?;zRivj31T44H;@9qp;<*)5fTaFd}6B0o!PeI>ES6P z28ivF00!B$A$3Ly`tG{kCcm)X7+D3G75NVH`{(aTy=+4H${U8_%^iMvsi)#=k|8mEcjpkx9`eV@dB* zXij9G3}Z4> zJ*CaXP^H?UatFWB+s3L!o;H}9p(H)Xk$=Iqe+h9)CdjBz<|kAsI0rqt)D`}b@8JFo z)Mk(*W(4aJbZHQoLi9_6j*|KibQZZC_dv~#tl6R+>B(lUy;|uQkxjga&p!EIeZd$o zZh8!WANYs}1jPHlSgn+et*g!NzTod4N+l07;AOotvF^>nYEVcj&snX2YWhSP1la0x*P;?W81vkhwXOT<{t0 zOMOD|A;A0WB&hRE(Ek4KLR}1JSg~} zS`heOQ^bTk;lrtymju~*V+loW&~m>nA_Gm`pEx&sx=`r1B%tW)52cWFk}tx)SbgOB zYJSa?Y(qlQA(_~eKykfnjgdZ|1Xu_)fN2sJCz;8pTkw=M4aIv{rf@RkVqJ#Xn6Z~8 zS81>&?9roB+|od1`hqLS1-D8WA`jpYRfpY^2q00`W`vccO2nFr8Qn8~v%GDQYF!RGAK7(f z<@~`hl(D%;4EI`&J;g9jQ&xHPXDsyx>zjsVPWC*`3Kh>ClAs&7mbMV$(cZ!#3e+}A z8u{EsNSf5dlJ#hlvgpw?RST|{^ri)RDfe%1&X3I05A{sF(-=@S5=*rDF+iZN&-^6T zK4(QX2IyASyZV&yr#v*f`ke6Sm!}LMtSHSo%*KO_md>&H=lAG0DqYEc@JR&UMg z_&p#4pElAsV{h_xG|3GWsS_3;Rxz#ADi?P(N)I_`5fwlv_zlfIB~F#7d^Swa0Udun z-6uJv-TjfC%1u?xEQvgnaM0o$U`fF+BG8?i96~D4a#=R4aRm{Jt8zxD0IvXLILU=S}PO% z3U9rcvZ7-mkNBxYQbd;P$t$%{bnfC1DCg~ zus~_hq;Yku*2J87!5211@pSY)lJOpgSgH1IOl*jvpD%b9X$UOQYmj6YCKI9c2ft4J zhg0UtGfKf<4&TyEon;_dCX0u_=rWgIL;;C1dlFSVzSb~vd)=@v8G$x-SP_(KAXM6i z)DDfsaB)Y*BI{IQ!(}7$3+nEQ%t*4`mK7Q4BXcD%ar16o=}s%KtSJsZIkQF!IWx_< z=L$&Ibp}^^ERL(mtq{4;iFeFVbjlh`Kr~Mp_#``g|lQ!Kb1YI%E~k zE&BCi3a97bTw7!P&B;4iN3_|8ezj2k`T>6K>M{6)+`^em_2|i1al+q&EQGoQQqBWI z{H1&n9)-!gb=Dv77ma$~b}z%!LZwY=8YbqpxUy!gHc(DGv0x_B1PKtOuo*&_l2kp5 zYl|*_1_<(p^<5`aVC=0OnyE~6PGyy?w=p~OxE9-p*Tj#TX@40XA8QTz8V|OnV17XL zxDq6o4ha8C|{g?;XWEhwT?I#=2~920N}@+;7>cBCv-UyMd0y zXZ#Ba>%Q@duo4q&1e1J>yF1?zw8y~Rf&4o7bOuGmdz^+WT!*#(WA&!-W3Jw)fo6@s zz?}>6%pqr}W<5HN$RM6_-JZQN^hs|fvU+Q_KHt-!GWk9e!VdBd7qp1iPpo8Kk*@7y zZJj)XxNPRGCYSUy%EQl349FP<#R+*(A_BT`Tf+h5^ooJByRX=W?GVlhS~p)R$DoX$ zeDTGaOq~@5khw!P)C)KkwXI-rB!y}@a1%+}0+?hWMCE2VrVJZU8##2hu(c4Zt?)!9 zw|!qP=H{Z6jL7b%WPin=b zshKDw`iz(TmpAw2Xv@%D)pP~40m1Zhh_|)|TyBuO_rwtKUzVqT+kUwN95nt zs^&7d6jK#UNlBA-Q=@j#0`{#ulZkgy4KX~n$LZUgWHf%YnlfR?1u^WEPiikZVeXel zTP0$}FIqP=8hH#kU(|I0I%kkx#d5?{cWopni@ z`Iws5Y;nSNdBfnTGaYSFNC@M3mB>*vPm9(fQWTK8E?ZwYTD$4YOoHSn%fqlt0?QHD zIfZ2PWAyn|{G>>M@-LD$+5>isd@VL*A95Y0LR@>$x*6aZ;1%6FrD%1>0sYdsxCg$& zM9(`0F%To18IvpVxw2a=AKvIySUtDd#c%CT%FlzLUKACdgY>Uh=wLl2m*YO~8%oiR z9YSSb&clNQjFhf+0OOj%(&$a}5S?MP29AR#GvGng?LVy&2OsHZPB5%`f?$$;Z3)o- ziP8^+l~udekNf?_&vvyKT50O0gW>CDcvdkbPp}ocsnHQga-e3BJ}X>2i|}0Fp;2ff zd7;Q*8dWWbF!W$f=vf>Vp<}FjB2Nor&xVjGlIf8Z3&SvH{FW5-_#szJ9l}=>!6rd_ z{5o6OZ1ASJc59rf!5KSXbnlPW5+m-Smy{rdF#HJX!=LOu@K^2(TjluZurZqLju1*n zvI-$b)fn*n&x4`JP*WWu@k4xU#u=CW$v$(M*wYHr-g|`RO<&x4#%4}t1NBQ9{cPjIe{qoh;VK)%dvtWhtAkhF&O+LSM7zI zqp$R@D3tq#oHoG!SBJB+s_wEDVEtnN>;In|&VQM`tGj{~D*v|)>2s#KP(^J+ zG=c8b%V=cPqbC`QuKOjFP?jZ4!+-OvnTz_flnwVx&JO)W1U?HQYy59P4nvMoy>XK$ zVY(h?oCj^wjvmu(r_;KdzCaWPtic>ZEQhUxYP(px0P?Ze+1TO2a7s8TXetwy0eNM6 zr9s+Yw@I6(Ru%fRnPKXGhttAyEFD(>X<01{jpti3>(6#RD8sE<5H@~EwyOIBh@>6YI%{Qsc zxEfH@2Ax$@7W*K9Ysy$tfN$!wHdGr9h8v--SXa6Gv2@bWZ?Lk%4zA7ydYHDQ!Y5t7 zR!zNp-7u94^Po3Q0scl-&0)BD3fE2MqDAno(Z0zcT};-N%UIj`D}Bp-p=rZRk&8#Q6N4;f zUQDrU&MX4>UMR?DA&y6QVBR+zIC<0QI5i^SR4b;GO_1@r8pu7eJA~IC=U}HrJW@i2 z1>&`^!4%2)IH!c3hyctcrh=;k-9OL3*l%tqSi?2MAO!A z#2iy}Z@lugc51ox0RzB$^XQCJl`@0bBTgU?+R-q#zd78db-GK6Er+)fc< zUqy89xT;hFhw#e8k&Wi4xdLE}9F;{gU-=J`5OA&V7EvD1#|+aE80#BIn8eUV4{iTC z6qwC-o_Ya8p$ae**#DQc*Y88&{T4yezX!p>i~<`*&6t;f{TOs4(^Ur62O528r@rf*RS-B{Dw*qK&}(#;!=)9zD_Q-B@$+vA#PT_BpR zAb%DUlNrGi=$hJ=eSqPc#ZK%Q;y4S6H=_PK1hnbTjh?PfX?6a=DC}<6u>9bJGcx zTdl6qY6KtH3(~0Kv{cV)8*c7sPBO9fvB7%k2D)3f;<-Aea8j_hEvzWysy$FcevsqE z%1aKLH6IlT9yJSrx&M&Wqz_$_H|A$=WR|SI*i?R=?xGEE1)4V2g6Vqu(QR^(o7F;N zhzmsXexx47c_w-3$vt?@`5SDfN`noykJ4P#RZU=em$|ubcqg8A1YEvqx$JD!WlFKx ztGd`dr$Ck;&od3ujAX80TLi!UzCAx^(|%fbwSSPWQG_0$Uir1o%c#|j&` z%Gt46HmROIhINdsMxxRu^peYx`UC3qlXVDLHE!}>-@%}5)k;KZ4YM~4UYr8J4{<37 z$wZ@Fgc@hfipGNmt|<-hB|`O6vv~zayYvHpC#Y6f%Vvzn1f6^(i8=IKD2=xRv|HrKyHSx1 zbG2Uzh;b|aPu{G*Kb`t7n-NKh+Q0E;@iu5Q9FYx?%!_wh&7l;8R_sI+LbAzgLTZX% z=Gi6~Ey*rTjGYwTqd#+cQ(gB0;`x!ztv(144V>^~a=T9Rrg)yM@jrKi*hR|mF)dwe z8}tiJ_LB+SHYk73WHiERSA(^oK7$EP0_0m6u$(}@B)AffDX-Yah^c8wdFGI4|N2Y@ zyEkr0YhL|<86zsm>HU$u}G3)&c?i)97mH3R}tP5&FCW_fK}tpOv- zKDJzOxzT=2Bch6qSRW)jz_(d4pIGFxSdrmi4}rZ&sV!3=$2-ctr#e+EXU+uS)(4gv z@hD}+q3?nY{ytYUe)j3wY~)2m%U~&;A6m#7Z?tL#*+svb28SED?dJ?F0ZBw%;~o5z zE;P;$#rT^Sv>FP!NT`cC*w#k2M5W3t=kN-3sXB{aq~l)9i2S5ZWIHGBmp@Y((BukQ z+)|P|wpG(C+l$M8mZMR}Kwr^iOp%cX)B)_01 z`4C3N_vO6M{%qY}F9V3*}Ww9A;u5XF_n9KAJJA zBbIVvU@Pr_7nZB=i8kt;@|vmmMeb1S=jCnuwj+lclWH-)-FZAFr~9apOI}4Z-03hp zW@$9dT}|FWxL~8fniW`H>S)uNvxSzEEx1hwYlYF4*7jZyu_YN(rWF@KaBms3Nc|D7 zZFd)Wdv}Z#C%{Rfz+@#@$Iq4GJuZ{Mn#DFXR8pN^1dRdDM_v{LN(}|3vP*Uk2P!%x zT;4$j?V|0A#5Ue;gV^!W;SjJ#BQZ59@<13mI;A(iD3kZx66G2M6N6F>M|4SI@*+Mb z;|4!mJ<}AaL8st|uWmFs`?A-b97Heme}d_Y6rZsN1LUq;L)VoSKxi1~P|cJ&@qFlv z?0w5iam8)1fZ)p3lNg2!##EOWc80BR8#8eK3ng-_gh@4xf~ zO_V3J&sDZ@^4q3K+u+^xg?oX%r%L`RUGCugNm?1YCXmMJOTfnZvdH!mR0As_ z8>h|*69zf0h&D)5SnJK)2OH5jhep$5yaGG_f;886iO-p_hdiYYj;8-QrFEjefi?NG5!jr>we-mB?6dM;$70PNorVE_L=+~dDLJjhbs{Oy$f^~}0O@JNqHS_Hx$ z^2sj|Sa1Z=kA_f#Y0xNGc$2OGbMX6bt^xJMj|_UxOE4sv$gW3r%-yzAVf({K`1XV0 zmnqIoPVN@nuFf||J;VyG$GF+NaUmfcA%&1|v8&WYy)nyp7%WLFG|c$pX3G$4SV_9> z@m$po?+E=;llFz#g_-OL&elGJSYZuDWQRWY0ZUB{kE^Cf~5)L_|y- zn}qC%q{Uigm_?J@c^{|--4vSRjW)qrJCcPUKl1RC;CMdt6WEsHg%4Gb@3hXICiQW9 zhNu$LxO!fxz)8V|UhqEAChg5V9D@ZP`3f*!FP;`t_a);DKIT9+39d5wPT6+0zraZr zEp{ev);3!&YZq6nb-*&|5g6-X#;{g0Sl#|mNAy#11{sGt`NmiGHN_wwLQpl6g&`bP z=+Sipw&JZ#NG*P_-vFb{MiW-4^9^bRdDtOiTj1KkZ29aiy!QhyZ`Q5B7rb(4ItZx+ z0u3?=O-vGK^sRI8ZH#0cjdm?j$`5LhdDI7``3)`|91`XfMHChw%hPi3d z1@x$L-aXU`&db!y;_JAyB4bcvBRRLkg80?cr{x=v$$>9YuTaw4!0XflDm(ZFWbqBH z5)P5iFBE#IjZpF8cM9xa6Z$9If1UB$AV_K<02bd4I5%VZU%cS|SOq32ZQ6bZn7J$^ z3XCIIOPQm>n!KKs@|_7ox;P6X;VRMu-mQyYurp=LelznU|HDoM8Q(p`y%^@S^|Da_ zsQLG7{JYF^uY=6hO<$ka4|YI{qG;S~4ojm27Q0Z{nt*d61P6NWqv0CJG>_dtJ(s>b zG4<2O@7x_2cf2cBPI>@JNWov^E7a`E>=jJaI!+Ss0C_D-RsEHs_g#I@FXO@R_8oBLaq-k5T~tE z{lQ_*CKKt(#|bkY(V|deY5-AHkTb|cKSf^h#tSq+0!7NV#C{I-v_NJq%#oEh9wDeVurS~id-D0cr*Ub*QiGk+VJR+JOP^vG^ zb4#|Yv?r)_G4VlY`nGAet?j-bTt9O>15)j3pMOBDMr5?B(yW8uF`!*;N$YNn5rH=J z`Ko<bDt0N7fUj2cLS%4ClszF*{CDYjK z(1i0B?*1Y+gC*32C{}zQ$qH_zABG+79n#j*QeYPjeDxA5a>i!HM00Vf0`!sDNJzo} zI!%E ztZV>>Tm1ivS*h4q{=?B$r;3acfd9t3VU$e2;S(gnB@CiMJShTXE>S2^QIQIYW{|@c z8_DP6pC&0QR*BtPzLx|lUdrwl5N=mHi@g!(^pEH?o@}291xrcrI-I7juRUjfeQj`m zdphL?a$i$L=x_D^DDCu(ihQDwL1~AeMh}ZwK`UwpD?sbEwM2|@7{Pa7z5c8^3@G5S zr`g$cd1tR)$0SwVUW?eYwZrVF&EI%GIZH8Ybr5xSp`ta8>z+p_v>jZ?VGq-{*AcBH zYAyXBy;(r)vX3xX|DK{@TB&lET->O)QN}h-Kn~y3O7@%1WtwyFMZHqt&R3B!i=xJ| z_Lzs_q6l0tYo8@NTzl$%)$~^eK|6=lpUl!ypx`JovX`)x)eq2JVZ9p5n)H7@`zQ= z%as~r054FNw?~dpSTjg{IyllBVIO1zx?u@5UPVmvX`Ku*z>sNKiOe$*>iISrG1$JE zJ-*nclIQJPU~m1&`9uZWv5jH9cZg_WnoSNo9np1A7Oe)O?S zDi=8JMm|-Ny=6^Y$#i*H`2iKsAR>)Q0uc(Tg9w9300ro&4-h_xg9oQ^FeC0nOKDr=Efj%S zTAH)YTO5l56)aIzPcL*Wb}jCycy|r9G@d)VdsitEoV%X0Gp9*_BR`3qbvmAN9%MV7 zadvy2rL;_U*x~fhxYMF@+exyPs5lM{7$35NlJOj}ijWKse6+{hVH-#w*I|@S-C>TS zZVOH&3zpK!R%fD-3m%7@2Pn8EhJ7a8BrlMOOlAy5NyQ*H^k$NM!K=aQ&gU2wF3CJj zfU+>jw;(G^8|9-cq;trYE5=}&7iRRBpArd1$)FIZk()B5pH)`M=a5uUDh5rYZbL0E zE6o15dCgN6k6DgsG9ryU&omwjBR!F{96Z5TxH90?_DwiyLPhu&Y#C#ny1RZ?m}ZkA zEex!NnL!&;tGLO%QQg%TQj_Abknm}}GV8ds2A#8oQyd}sfqs+LP6BFhrE%7_OS{5eI$ zr3oV6&yB=l#HII#v0rK@5l%yYogR-{)OwCM!}o33154D%Zk`TioMl`Wv_;T-M(!01 z_yKF7mDb%NQw+6C%B4G#g8G zQ68tzfuAY#$~t+Gnw}=Hkt8{DU0ew)Oi$XSVpA9q_k)i%kRo+DP1eKb;XY$q93MAV zmua_DpVfo=`OZi8u=+yCepV+>C;LWku(ZbX&%qK4QrG+2*uqw!wb*PO13$YskS{?uW=EGgRctq9p zfh-(ud-L*)bGUqLH`R9>$SQc@fS;}g-*IhW6t5EH6c+8-l5QF+;SggNPcJ)aCfAt3Zp;*%YAEe{;JG!E%2-h4Po{W`3l+1+(seGQ5I)8Z#mgc zP?6$;Nb}S91VqVDN>MJEu;@lpG#Jnbmx@dmv4mb5p6_=Z4&qzA7kRhGzlwxqB#pchs zO6W%hR)~13T8VJ&QA;&gjf$^KmWzP-lm`#8_0GLkPhjnf zyufn7EI(VB7`1cMJ4|Cf_l@?MLfXEjuU`*!9eD%DrGjJ(azqC1C>e9~oeh-XIJ5O!Vep)U( z($W6}N=KnoTx|?RuAaG0C&DB=%jY;&;xG@(!oFIkK9h;b3_3^}P#{cM^O(uY{K#=Y zH3bvg$C=9`5uREie2*48Sq42ZBrevN#+od6UI#)Vqvk+!GRz0#x@`laD_`JwNot_F ziIxItV7)dJ`%$VoZXK=5zXl2#B47`gDODs=RO(iooITD`#W5?_w=Oh9!|vU`kRnu0-0@5WPp^pMLll6ziysTcGL=@GS_3 zwT;ovj;Df{nQ@_2)HI87EFCdOLH@VC?ww7V zhiHebgsVi-%_MTzhwLETk=bOP*%)51on)R0qA6`0>W`+N*&w0GJmf8!R~LjmvdR;C`g)a8z-yRWV>t z!v^NNE{*|F~kpH6WDTa&YpZ5*zq&# zuybYDQ01s{SaE`J-I5j3ssGX1VKs86B6@;qg_S?hC(bdav4jIP4ARShYHbS>XfDgL zq_wm*gluUNI*5^DLBDRD#rC2EvcTyjp-9=d)i7SJxM&pMZ0YWs7-OCOG?kW|%RO;%h%NDQa7S z{Yq5RMCvfCN+-Rz)A>DC&f%2A>?)dHIYku8H?OTH=XTX6ID(x__b@gW=s%@9KfivW zRX+z+;=|9-*I5BsHG>(zI^nf{$qNih;jZ+Jq@Qt4FFQQv3 zdyx|_U zO5sxG5$yrOB@~9OVVqO+u>eDtC*A`k#Yn~5tpeAScebSKXikvu^L8S;QOM_AYcA=d zFCF5ogh;Y@TjDZlECsSh2No*d9DJIW#?hAOHYQ-R7t9I^yoKaX6LPX|eiHkKH<$;I zI};H-`H5aF%v$Q$sA5BVL)SC#N@K-(_{EHg>mDQoUoARtFW|tDbr&~Pl)SCckipMD zZDhHWi2m62j<^BdgN+Gi|GHk%Eog>?-=cf&m2u&4C>-+3Iqw`d%cm~@$l(z^6lxi% zg+7^QRS37P`N!bQw0j3|2u6CC+I7ctp{2=$2^fENZP|EVDzb#RisumeEsB-M&2h8b zH>PBds6aXHH7nEm5&at1)P2)9t(-)5BAN8Zb11@s!Dz4o7pb4XMMxb1Frv%_O5Fkc zq$Lf{zCZ{15Og40y`1Gg_b9}8lL_xT@HYGTyE1Ovx_^pAtHp4?;)!DM6)$fL>q>3! zgpM1FZP6Y3l^j8Kgv9-d-0#RawNnIg+#1q~9I@X9eyzvB;|Zm2*c@-U16HJVhgm+T zou;Mchc3YGDpB(9NH3Fx!8k@B1udNs;2F57aX2w~V|csIJy<~b`N%mrQGnqJ?~vi4 z$Ckt!lW91DjN|7F+W*s&p`)zQ|2!EHZf}?&z6P>o(;Kz`6ygUi>lnHhet{)Vl8+qw z5Ke5#bM~{pO(gG^I9`m!LiJ&Gr_uh*Ti4x85RQ;UANa88)1g4Dn$6XyFp}16&;*uV zr*6|9eKyk7w_J%}g%rw-!J8MqQl6+LJ@L}$$YxO{owAFaJ&_7gj_=%*oDy;d=K?4Q zoDs|5iE1DQd7^*mlEH*obc|Vb-(eK*ecLolqOmm)tHSk3kJUCblOz^sYpI7IMNv-I zU5IiJ(b|ZDo|h}VeDGc`<@w^(O>a)8(z|Zq;So^6)k2`wR{0ZQ|2x&Iq6_LmY8ugG zpg1$BgGax0+xL0Te3*!`h{B2t^>e{XJr7DECH&>c;A&=Os&>YP9dlels_bkLu+=7v zY2nmx(K!QL)g6cCW5gctlL6F2VPu;=(c*rxp>-3Ua9TG!wH=71aQt1W=kP>)J?z&= zlk0qu;NE2WB|798svxrj#gkZ=IwdT`c$pSv@bT)~)yJQc%Hc9+DE)OtgvCOU1|G)AM3Wy%?W-`sb8>~AGu#c0+g^}l8zjpn!Cz{7#iZRkFzuf2 z=tc-E>&Q{S&`;rrA6!uhFDVU&|714w%EH5hWCCg05FQImbXE}h)DXH9f!A>u8Y{VC zV`tMKm`$9jqPrpQ-m!98ev9G;y%v%>2bQhDx)E;Vq7y5GY;vI2Z;fZt^MpFgAoflE zs0VRKh3s3YroOTWJKf38m(oi5@{)^=Pu=&22@=9Rm?stP;g*=B*ls_uF~KA^CwVR< zB1sOkWcK@{gyqq1!%u; zQHoMDfUehALvh3bx{Np!BRWyb*G6#6gH>`3ytuD|>W(;d=gv5w!LT*7?<+%_ZJXYf z!?~f4?(3kKJ(O!6G@wDz1okQ;2<`Iu>|+V~M&dH9by0)?_t1e+!Xs)f1`K!Vg85DE}dw$^wC3 zRPnc3vP#gQHOIf$IYix=Ml#l*!af?F^F}UGXG;wJY>NDZK<*HR;*&2-X>WjLXbLw& z*b@r1%Xvb!!57*uoNqI$p!s{0mkG5xEA*TW&UF)ET*0iN+1MU=0{^)Lf9PG6hzK#HV zrf7aaL?7X=T4!8{=N8edb43vwSNY%{u{>H^itHC+CAfUE37}i9hVB_(qa7_N6{gE_ zW%uF5_KKSyG@b=1%M?2xJ!P7jqlOUua(|Am(MtiTM5Xyo12UuBFTsjiFuE zH0fPMkgE8;p{7XX2(jYB=avk8Q&T!DX}hQ8z2jcc@a=JVrmsF&p}j|bxiii08y+Z^ zOFbf2x|_#nJbD@vl3TAlufU16{dSiWQDRrsRkQX3x7hL9B>N|YpIuzpUu&Yt&nmom zypy^|S4TNOa=PMW^TG*vA4rOQV5iMd4)0A7fh!8^c$d$!n8>TB zF1Ft0ri@;ZX|YE#XW!xyvL1FTxyKP)if#EMc$Y11pzWs2P7a4;HyF?8TD7P3Eqo3s zTzDbc&oB3tIUQ4J=U2q8pKD3`MibJ1(3>qX@cGMk3LUGDzgl!r7MvKK95loFIS_Br?707I zd-nD&YrTQy4CV!}MQjMz>>~TmZQ}nsYcTp(a{6zaf&V&URy)?kQN#2xp`WOihLorC zBReA7tEZ9rMzR7#ne=TS5D1{&L^6LEm_?I7$8F?_CS)n|xk~fgRis%o?sNA|j=b*!SdOEK%aU;jc=trd!Ne2afp^ZGgUg%y`Dr&0M<~C@j6WD^P9)Kn zAPW+El|cg(ebdWKH=dduB?V<}Zu+^c*;ds6^vig+j>;WoDn4uxT(tb9Fg1${PA#R& z2P`k(8qo_8RNe6JC*uk%JJeKNSR&YHMEB`#zP$dnp?B;-LoI=OEtVI!TFB$)&|l8W z?tMTP3l4iMS?_^$(7E_gV(`O;kEwhr^-5T6GgR4pt?a)~r7g3#4$&RMc!rZpZ;K2tXR57pXn2k-|xMbXfX1-rEmhysisVdLH zgK}BPiVTM-mDU0gfudFwOYl*bHr+VpYS78nu%=1{$&^=Hy4XI+D(>hS&Ve1`GQHXK zOVFCsu+gX!(qjl|YLm}U%qbvF@JyIUDTlHG5%Bu^@kRe^j}&M)U>OgNhV!`Y6r64h+EVdg1@8GyPGd zkN*B}qZ{fq#*WqW3T^th6hoZv@S2s&9Myq&2uexXZy)*|q|Y2q?1CBTtH5^&UjFgu z#cvTHsQ7N&W^Vi+EjS_rpz)UOxiZI(BK-B>@OvOQ$yqx5avaso?!kP@^r5;H5!!P$ zCzfv2XD%$CMF(w{5i;7;?1lQzFFe6Q*3vi;jz`E1_gaz~)O?D4770{s?`_j4Jmh#3gmDRFvrW?r246BEZwjv;VfIVC2YVPPvXXol-Fq5 zK~O<=9fUJBL>)EAleChlN~S^ElGvj^+1}2j=yP?8xFlL9R%s;h z2v1!QUrJt#;p)Pd(`mGEW?{VWSwBs923W1pKR$QF$ymd7T?sVbfFY;V)i>LOA7*$N zAb_$x$|!xe{M!w`KUP;vZq5}@t~4QJ5_b)mYA(qFLaL6y#YaJuew2!{PwNQ8C>4~V z=efnEsOkQfKd4+NTBB!CEKr}}xXBmf#j+m#2y``KA8%|}2-joXpi2}Zl- zkHp_Ru+l4DBa@Hx{9#L}msmM*kqn|x`UN8)FKHV$5*hqI4mSz~A9Bp^a^WBZOi!A| zo>QG=X$xUDTx_|Sjf~EH62G8vv{M(i`Pk>FBgC>?>xt=E91rKYSHY@P5B-t0>W#Q9 zGQ`FsjFZ5!6dREQp$Of6!6aVAJyZZ7uh3sPl0f2_$h})Bx?LwOg7ah_t(eNnNns8T zCC9rmZ6Ns_FKD7C zKHXgjK=EBG=TJk`N)kcN;18xnTfM5Q(q0XhN=b2M~Pf`62I=6X>JzQ_Q{OIjj6j9C|`$ireF+CzXMWwLo z?8`0CdKI?ZD{lM3H^%jEnDIrM#O0n~+P*U3ebADN*hUkSx77j*bhW0!4hS&x)lb*n_m)$ctff97nz~@}8M!AQMDV z;`Pi`$v|bBs%cS5)b6)c^v0h-XHnA`EXZ7JFeQ@-Ymn_No$MoaV!tj(LJz1@+g;PT zEtB}WPU&!7p-@JN=U6I`Lm@SD{#b9=w3|LVr~GJE)3rl-BckS^76)n9t~$qx&I`;~ z{N_A9o~mRuZI8q+=c==%;uw`O9+BEphM1l6X`@o^wsj;vzpQb91f;Ol( zd<*8i1L3|2=ClGhXBGhj?9luV4#e;AYQMV?QA*l!bDvOn*K5wi{EQ#uLG@7sjTOpE z?}3Rz&BRq1H3E8D^j#If+fR#6k+w@Ntac*cQ%gZ5=1hGPFJ(XLX^>pz&8Dq-P6Oh0 z0TQ)<*!9%D1eSV=@>FqRe*w$1ezO1n^QL~0?SeYk0&X_lY;aaYqssch-q_70~$tYgy=n^Ya`P*sU#+# zrQ95$^Mfu`!0JTWB?oay^)FMRR=8Ys8k`e|+TykK_o*BMc|v+qTL?oX@{G8HZ8$0| z96Al4Ur-&jbhH~SSxr<(=OovWn?+9J!S7UyfWX#+E*lb28k2Zc-S7P8`|-*Ope+)) zsm#%MJ;>am=U^*T(QyhCc9TnTOYGRBxMGclDcgK6rED13l|LnSs>IT*!j<&pK#jU= z;T$C(NeIDvpgLvMYTMy7(^6U<3d;gCR#0HGoV3|wY#0(~F7LlTLEqI;5CcuBS)c9G zu8!N*(q@}3xNLOeB-GE;hKFF8FjVC7OOx+EX!c(Vum2DzmMV++G&|i)HGhHe3k!`T zZ{`jAoH8-#Mn;DaepN0e_$-pz<->WhdC~Tm0u8%vP;O#n^!FZ3a8#d!u8KbG^7&3{ ztvp`}DSiw%>96AFbX+3eqBu@R9W?3XjXo-@059+GCGHRsSw4mOh@3R!c*m(e==xI` zD9?&<(~b<2UO(M~wBi_?2CB~v+J>IzpCW`cWqytMF};I6@G+Js55LdukphSJ6Pds6 zx7$*tpROmQ(YZQQH-{w80zc(@ z@ed1O@MBe@a7pTdFvwOEhF&BY830}(a+|dn!(bAwoGv*z2zGN|_qXJO``Ssk^D9=B z&aObamu_xJtbS{@?)uBFF!Hcg!W;+DvOARGMOft9J2Fu%mmxtfKu9kPAf%V;Z^np& zt%b3n)Bi$;oE0x6*Y^n}Xc`Pu*o$AjKmVi$G#$fvmslZ^I-dmNPKZ01(K-Yc1nNyv zjg0O$8Qfiza>ga$U7E9_OwP?~z#`I)ixT7>{FUjToc`flES~1CJwVP5TZ2|-J45Nj~!PpgVt5A z{J2-dbEs+Wb14J91lcrNDg_f8Iyg(K-`ty;dCe{g1_wr2RNeH5PTXo7F5^}SAEq5n z#T=3@O5d-MCL%9@M$p1l)u(5p2|qGPK=y7v-1&|}fi73t-VeA4k|<4BOnW(7AS)%;=bdqR-N z%@N831~f96e@(wlX0~or!c4G89sA90C*Vxy((-K(IG%@D%T~2>=|ufd=Hj~@YauvqwiL!cgiYn| z)MKSlAtyOL(SOQTF@=((+BdBGXpBnj7%)c7*abZgdPZVb+;!dfg{?a;joyhCY?3CQ zyUYymlP+Hqx}4AQMDy((yDa=$zZyV42?($h{y%l~fARSP0zUqk%YW}ZgFhrBBmhDH zaQ#s*0JjFt=2k|u4#tMY=5|hhRt1ovrJ9XHJjTsyekpcnvGTya= z2B`VlW64Vae?a-|?oa3dEBm_=PUCN1pKiY;Q9^rk3tE! z{eP>;2*^r^iYO`5$%wv3_^rmj8wLa|{;6aE?thah_@^2G{-HmW-hb8jm$1P;Ww3A6od` zUwaSd?kAm}2Y?v^T)&ZI|526!=Kc?Gfaf)JFm`m52B^Io+x%OA;ypa2M`3>lpew^* zf6s;Z1AY|qZ{YzH+*Zzx04^C(b1P#3Lqk9dGWs_9rvI&htlLpg4?u?p13LUSMZiDG z0>R%lAm*SCP)}6>Fjb1%S{qB-+FCl>{e9PvZ4aY80Bo)U&=G(bvOkp!fUW#Z*ZdBx z1~5E;QtNNF_xHGuI~e=r0JK%WMf4|BAfPq6zr~gKx7GbU9``Cak1xQw*b(024blHS zo{giEzLnK~v*BOHH&%3jX~l>d2#DY>&ldzp@%x+q8^8ec8{XeP-9eLe z{$J28rT!L8+Sc^HzU@GBexQ25pjQQWVH|$}%aZ+DFnNG>i-4n}v9$p}F_%Qz)==L{ z7+|mt<_6Ax@Vvh_+V^tze>7Ai|Nq^}-*>}%o!>t&fzO6ZBt23g4r?*WLL8)z|!gQsH?I_!|Jg%KoqXrnK`% z*#H3k$!LFz{d`~fz3$E*mEkP@qw>F{PyV|*_#XbfmdYRSsaF3L{(o6Yyl?2e;=vyc zeYXFPhW_;Y|3&}cJ^Xv>{y*R^9sUXaowxiR_B~_$AFv8e{{;KzZHV`n?^%ogz|8ab zC(PdyGydDm_?{p5|Ec8cRTBuJD7=ktkw-{nV;#0k5o;S?!9D>&LLkM0AP6Feg`f{0 zDQpB`k<`JrvB<<-J;OKd%+1!z`DQP}{M_XnsTQvW)#kKd4xjO+0(FK~P*t8f?34gT zNeb{dG5{jMk|Z%xPNd?)Kr$uFk;z0bG4oFYGnNlV6q8Vd`WhQhkz5p#m^vZSc48n^ z)8XlE1_e=c^$WG1no(|j8Tc`PgwP}{$Z2MV1V$=SXvP)gXKtqW)?5PUcJu&?e*#h! zqs>gH(jDQk$9cz8;-w$cc*dE1}qLepfsBCXA@(bAJ66ft0aCq$Wrcq)WXX{0nm+#w=uBj1o9rLyA i;x|p)^~-yfPOPa3(|vBayXKz \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,92 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d6..e509b2dd 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,22 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,25 +27,29 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -35,48 +57,35 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal From 7edd860f19ad02385b2663141e9a0dfe9903811e Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Tue, 13 Jan 2026 14:28:44 +0100 Subject: [PATCH 21/24] Upgrade dependencies --- .gitignore | 3 ++- build.gradle | 8 +++----- gradle.properties | 8 ++++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 00b35b5a..9fc451e6 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ bin/ *.ipr *.iml .vscode/ -.java-version \ No newline at end of file +.java-version +.DS_Store \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8edd5e7e..e39564a3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.github.ben-manes.versions' version '0.51.0' + id 'com.github.ben-manes.versions' version '0.53.0' } apply plugin: 'java-library' @@ -39,11 +39,9 @@ subprojects { annotationProcessor("org.projectlombok:lombok:${lombokVersion}") compileOnly("org.projectlombok:lombok:${lombokVersion}") implementation("com.fasterxml.jackson.core:jackson-annotations:2.20") - implementation("com.fasterxml.jackson.core:jackson-core:2.20.0") + implementation("com.fasterxml.jackson.core:jackson-core:2.20.1") implementation("javax.validation:validation-api:2.0.1.Final") - - testImplementation(platform("org.junit:junit-bom:5.10.2")) - testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.2") } test { diff --git a/gradle.properties b/gradle.properties index 52798176..8a979666 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ version=3.19.0 -springBootVersion=3.5.7 -lombokVersion=1.18.40 -spockSpringVersion=2.4-M6-groovy-4.0 +springBootVersion=3.5.9 +lombokVersion=1.18.42 +spockSpringVersion=2.4-groovy-5.0 fintModelResourceVersion=1.0.0-rc-3 fintModelCoreVersion=1.0.0-rc-2 springHateoasVersion=1.5.6 -groovyVersion=4.0.26 \ No newline at end of file +groovyVersion=5.0.3 \ No newline at end of file From 679ea1d1bcb8d0a6a8452eca725b47e4680cf204 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Tue, 13 Jan 2026 14:30:05 +0100 Subject: [PATCH 22/24] Upgrade fint-model-* with support for inverseName --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8a979666..218d850f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ version=3.19.0 springBootVersion=3.5.9 lombokVersion=1.18.42 spockSpringVersion=2.4-groovy-5.0 -fintModelResourceVersion=1.0.0-rc-3 -fintModelCoreVersion=1.0.0-rc-2 +fintModelResourceVersion=1.0.1 +fintModelCoreVersion=1.0.0 springHateoasVersion=1.5.6 groovyVersion=5.0.3 \ No newline at end of file From 57eac61205d38e08d4ce7f8124d3f0c60ebd8f28 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Tue, 13 Jan 2026 15:07:34 +0100 Subject: [PATCH 23/24] Move datautstyr to correct location --- .../fint/model/ressurs/datautstyr/DatautstyrActions.java | 0 .../{ => novari}/fint/model/ressurs/datautstyr/DigitalEnhet.java | 0 .../{ => novari}/fint/model/ressurs/datautstyr/Enhetsgruppe.java | 0 .../fint/model/ressurs/datautstyr/Enhetsgruppemedlemskap.java | 0 .../model/resource/ressurs/datautstyr/DigitalEnhetResource.java | 0 .../model/resource/ressurs/datautstyr/DigitalEnhetResources.java | 0 .../model/resource/ressurs/datautstyr/EnhetsgruppeResource.java | 0 .../model/resource/ressurs/datautstyr/EnhetsgruppeResources.java | 0 .../ressurs/datautstyr/EnhetsgruppemedlemskapResource.java | 0 .../ressurs/datautstyr/EnhetsgruppemedlemskapResources.java | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename fint-ressurs-model-java/src/main/java/no/{ => novari}/fint/model/ressurs/datautstyr/DatautstyrActions.java (100%) rename fint-ressurs-model-java/src/main/java/no/{ => novari}/fint/model/ressurs/datautstyr/DigitalEnhet.java (100%) rename fint-ressurs-model-java/src/main/java/no/{ => novari}/fint/model/ressurs/datautstyr/Enhetsgruppe.java (100%) rename fint-ressurs-model-java/src/main/java/no/{ => novari}/fint/model/ressurs/datautstyr/Enhetsgruppemedlemskap.java (100%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/datautstyr/DigitalEnhetResource.java (100%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/datautstyr/DigitalEnhetResources.java (100%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/datautstyr/EnhetsgruppeResource.java (100%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/datautstyr/EnhetsgruppeResources.java (100%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/datautstyr/EnhetsgruppemedlemskapResource.java (100%) rename fint-ressurs-resource-model-java/src/main/java/no/{ => novari}/fint/model/resource/ressurs/datautstyr/EnhetsgruppemedlemskapResources.java (100%) diff --git a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/datautstyr/DatautstyrActions.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/DatautstyrActions.java similarity index 100% rename from fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/datautstyr/DatautstyrActions.java rename to fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/DatautstyrActions.java diff --git a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/datautstyr/DigitalEnhet.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/DigitalEnhet.java similarity index 100% rename from fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/datautstyr/DigitalEnhet.java rename to fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/DigitalEnhet.java diff --git a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/datautstyr/Enhetsgruppe.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/Enhetsgruppe.java similarity index 100% rename from fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/datautstyr/Enhetsgruppe.java rename to fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/Enhetsgruppe.java diff --git a/fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/datautstyr/Enhetsgruppemedlemskap.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/Enhetsgruppemedlemskap.java similarity index 100% rename from fint-ressurs-model-java/src/main/java/no/fint/model/ressurs/datautstyr/Enhetsgruppemedlemskap.java rename to fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/Enhetsgruppemedlemskap.java diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/datautstyr/DigitalEnhetResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/datautstyr/DigitalEnhetResource.java similarity index 100% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/datautstyr/DigitalEnhetResource.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/datautstyr/DigitalEnhetResource.java diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/datautstyr/DigitalEnhetResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/datautstyr/DigitalEnhetResources.java similarity index 100% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/datautstyr/DigitalEnhetResources.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/datautstyr/DigitalEnhetResources.java diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/datautstyr/EnhetsgruppeResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/datautstyr/EnhetsgruppeResource.java similarity index 100% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/datautstyr/EnhetsgruppeResource.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/datautstyr/EnhetsgruppeResource.java diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/datautstyr/EnhetsgruppeResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/datautstyr/EnhetsgruppeResources.java similarity index 100% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/datautstyr/EnhetsgruppeResources.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/datautstyr/EnhetsgruppeResources.java diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/datautstyr/EnhetsgruppemedlemskapResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/datautstyr/EnhetsgruppemedlemskapResource.java similarity index 100% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/datautstyr/EnhetsgruppemedlemskapResource.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/datautstyr/EnhetsgruppemedlemskapResource.java diff --git a/fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/datautstyr/EnhetsgruppemedlemskapResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/datautstyr/EnhetsgruppemedlemskapResources.java similarity index 100% rename from fint-ressurs-resource-model-java/src/main/java/no/fint/model/resource/ressurs/datautstyr/EnhetsgruppemedlemskapResources.java rename to fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/datautstyr/EnhetsgruppemedlemskapResources.java From 76a820ba8c23e5e3888724bfe1ea7b6d47af6529 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Tue, 13 Jan 2026 15:16:46 +0100 Subject: [PATCH 24/24] Update fint.model-core --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index bf495a79..af735416 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,6 @@ springBootVersion=3.5.9 lombokVersion=1.18.42 spockSpringVersion=2.4-groovy-5.0 fintModelResourceVersion=1.0.1 -fintModelCoreVersion=1.0.0-rc-2 +fintModelCoreVersion=1.0.0 springHateoasVersion=1.5.6 groovyVersion=5.0.3