diff --git a/README.md b/README.md index 4f137ec8..9febdc3b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # FINT Java Model -Version v3.21.10 +Version v4.0.0-rc-8 -Generated 2025-11-04T13:27:51 +Generated 2026-01-19T10:09:08 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 ccf6ad4b..ef9df0dc 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 @@ -1,94 +1,107 @@ package no.novari.fint.model.administrasjon.fullmakt; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -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 @EqualsAndHashCode @ToString -public class Fullmakt implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Fullmakt implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + RAMME("ramme", "no.novari.fint.model.administrasjon.kodeverk.Ramme", NONE_TO_ONE, null), + FUNKSJON( + "funksjon", "no.novari.fint.model.administrasjon.kodeverk.Funksjon", NONE_TO_ONE, null), + OBJEKT("objekt", "no.novari.fint.model.administrasjon.kodeverk.Objekt", NONE_TO_ONE, null), + ORGANISASJONSELEMENT( + "organisasjonselement", + "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", + NONE_TO_ONE, + null), + ART("art", "no.novari.fint.model.administrasjon.kodeverk.Art", NONE_TO_ONE, null), + ANLEGG("anlegg", "no.novari.fint.model.administrasjon.kodeverk.Anlegg", NONE_TO_ONE, null), + DIVERSE("diverse", "no.novari.fint.model.administrasjon.kodeverk.Diverse", NONE_TO_ONE, null), + AKTIVITET( + "aktivitet", "no.novari.fint.model.administrasjon.kodeverk.Aktivitet", NONE_TO_ONE, null), + ANSVAR("ansvar", "no.novari.fint.model.administrasjon.kodeverk.Ansvar", NONE_TO_ONE, null), + STEDFORTREDER( + "stedfortreder", + "no.novari.fint.model.administrasjon.personal.Personalressurs", + NONE_TO_ONE, + "stedfortreder"), + KONTRAKT( + "kontrakt", "no.novari.fint.model.administrasjon.kodeverk.Kontrakt", NONE_TO_ONE, null), + FULLMEKTIG( + "fullmektig", + "no.novari.fint.model.administrasjon.personal.Personalressurs", + NONE_TO_ONE, + "fullmakt"), + PROSJEKT( + "prosjekt", "no.novari.fint.model.administrasjon.kodeverk.Prosjekt", NONE_TO_ONE, null), + FORMAL("formal", "no.novari.fint.model.administrasjon.kodeverk.Formal", NONE_TO_ONE, null), + ROLLE("rolle", "no.novari.fint.model.administrasjon.fullmakt.Rolle", ONE_TO_ONE, "fullmakt"), + LOPENUMMER( + "lopenummer", "no.novari.fint.model.administrasjon.kodeverk.Lopenummer", NONE_TO_ONE, null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Periode gyldighetsperiode; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Periode gyldighetsperiode; + @NotNull private @Valid Identifikator systemId; } diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/FullmaktActions.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/FullmaktActions.java index aac0452d..862eb6f9 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/FullmaktActions.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/fullmakt/FullmaktActions.java @@ -4,26 +4,22 @@ import java.util.List; public enum FullmaktActions { - - GET_FULLMAKT, - GET_ALL_FULLMAKT, - UPDATE_FULLMAKT, - GET_ROLLE, - GET_ALL_ROLLE, - UPDATE_ROLLE - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(FullmaktActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_FULLMAKT, + GET_ALL_FULLMAKT, + UPDATE_FULLMAKT, + GET_ROLLE, + GET_ALL_ROLLE, + UPDATE_ROLLE; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(FullmaktActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 940dcdb9..47cb0363 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 @@ -1,77 +1,74 @@ package no.novari.fint.model.administrasjon.fullmakt; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Rolle implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - FULLMAKT("fullmakt", "no.novari.fint.model.administrasjon.fullmakt.Fullmakt", ONE_TO_MANY); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +public class Rolle implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + FULLMAKT( + "fullmakt", "no.novari.fint.model.administrasjon.fullmakt.Fullmakt", ONE_TO_MANY, "rolle"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("navn", this.navn); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("navn", this.navn); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotBlank - private String beskrivelse; - @NotNull - private @Valid Identifikator navn; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotBlank private String beskrivelse; + @NotNull private @Valid Identifikator navn; } 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 767a29dd..3d76ccd1 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 @@ -1,43 +1,33 @@ package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.FintModelObject; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Aktivitet extends Kontodimensjon implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Aktivitet extends Kontodimensjon implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 1bf8b0f7..b6524163 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 @@ -1,43 +1,33 @@ package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.FintModelObject; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Anlegg extends Kontodimensjon implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Anlegg extends Kontodimensjon implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 2495abb2..2eb34b89 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 @@ -1,74 +1,84 @@ package no.novari.fint.model.administrasjon.kodeverk; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Ansvar extends Kontodimensjon implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Ansvar extends Kontodimensjon implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + OVERORDNET( + "overordnet", + "no.novari.fint.model.administrasjon.kodeverk.Ansvar", + NONE_TO_ONE, + "underordnet"), + UNDERORDNET( + "underordnet", + "no.novari.fint.model.administrasjon.kodeverk.Ansvar", + NONE_TO_MANY, + "overordnet"), + ORGANISASJONSELEMENT( + "organisasjonselement", + "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", + NONE_TO_MANY, + "ansvar"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 6467b8d0..43f671df 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 @@ -1,72 +1,74 @@ package no.novari.fint.model.administrasjon.kodeverk; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Arbeidsforholdstype extends Begrep implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - FORELDER("forelder", "no.novari.fint.model.administrasjon.kodeverk.Arbeidsforholdstype", NONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Arbeidsforholdstype extends Begrep implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + FORELDER( + "forelder", + "no.novari.fint.model.administrasjon.kodeverk.Arbeidsforholdstype", + NONE_TO_ONE, + null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 71c01a5a..1e1c34e9 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 @@ -1,43 +1,33 @@ package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.FintModelObject; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Art extends Kontodimensjon implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Art extends Kontodimensjon implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 4d91861a..acc97230 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 @@ -1,43 +1,33 @@ package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.FintModelObject; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Diverse extends Kontodimensjon implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Diverse extends Kontodimensjon implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 ce601873..b6ee81fd 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 @@ -1,43 +1,33 @@ package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.FintModelObject; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Formal extends Kontodimensjon implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Formal extends Kontodimensjon implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 4ea347ad..e2e5f6ba 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Fravarsgrunn extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Fravarsgrunn extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 b6f1c041..117e4943 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 @@ -1,73 +1,72 @@ package no.novari.fint.model.administrasjon.kodeverk; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Fravarstype extends Begrep implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - LONNSART("lonnsart", "no.novari.fint.model.administrasjon.kodeverk.Lonnsart", NONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Fravarstype extends Begrep implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + LONNSART( + "lonnsart", "no.novari.fint.model.administrasjon.kodeverk.Lonnsart", NONE_TO_ONE, null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private Boolean overfores; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private Boolean overfores; } 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 239d978b..904a62d3 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 @@ -1,73 +1,79 @@ package no.novari.fint.model.administrasjon.kodeverk; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Funksjon extends Kontodimensjon implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Funksjon extends Kontodimensjon implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + OVERORDNET( + "overordnet", + "no.novari.fint.model.administrasjon.kodeverk.Funksjon", + NONE_TO_ONE, + "underordnet"), + UNDERORDNET( + "underordnet", + "no.novari.fint.model.administrasjon.kodeverk.Funksjon", + NONE_TO_MANY, + "overordnet"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/KodeverkActions.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/KodeverkActions.java index 76cd2576..75cf547e 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/KodeverkActions.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/KodeverkActions.java @@ -4,83 +4,79 @@ import java.util.List; public enum KodeverkActions { - - GET_AKTIVITET, - GET_ALL_AKTIVITET, - UPDATE_AKTIVITET, - GET_ANLEGG, - GET_ALL_ANLEGG, - UPDATE_ANLEGG, - GET_ANSVAR, - GET_ALL_ANSVAR, - UPDATE_ANSVAR, - GET_ARBEIDSFORHOLDSTYPE, - GET_ALL_ARBEIDSFORHOLDSTYPE, - UPDATE_ARBEIDSFORHOLDSTYPE, - GET_ART, - GET_ALL_ART, - UPDATE_ART, - GET_DIVERSE, - GET_ALL_DIVERSE, - UPDATE_DIVERSE, - GET_FORMAL, - GET_ALL_FORMAL, - UPDATE_FORMAL, - GET_FRAVARSGRUNN, - GET_ALL_FRAVARSGRUNN, - UPDATE_FRAVARSGRUNN, - GET_FRAVARSTYPE, - GET_ALL_FRAVARSTYPE, - UPDATE_FRAVARSTYPE, - GET_FUNKSJON, - GET_ALL_FUNKSJON, - UPDATE_FUNKSJON, - GET_KONTRAKT, - GET_ALL_KONTRAKT, - UPDATE_KONTRAKT, - GET_LONNSART, - GET_ALL_LONNSART, - UPDATE_LONNSART, - GET_LOPENUMMER, - GET_ALL_LOPENUMMER, - UPDATE_LOPENUMMER, - GET_OBJEKT, - GET_ALL_OBJEKT, - UPDATE_OBJEKT, - GET_ORGANISASJONSTYPE, - GET_ALL_ORGANISASJONSTYPE, - UPDATE_ORGANISASJONSTYPE, - GET_PERSONALRESSURSKATEGORI, - GET_ALL_PERSONALRESSURSKATEGORI, - UPDATE_PERSONALRESSURSKATEGORI, - GET_PROSJEKT, - GET_ALL_PROSJEKT, - UPDATE_PROSJEKT, - GET_PROSJEKTART, - GET_ALL_PROSJEKTART, - UPDATE_PROSJEKTART, - GET_RAMME, - GET_ALL_RAMME, - UPDATE_RAMME, - GET_STILLINGSKODE, - GET_ALL_STILLINGSKODE, - UPDATE_STILLINGSKODE, - GET_UKETIMETALL, - GET_ALL_UKETIMETALL, - UPDATE_UKETIMETALL - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(KodeverkActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_AKTIVITET, + GET_ALL_AKTIVITET, + UPDATE_AKTIVITET, + GET_ANLEGG, + GET_ALL_ANLEGG, + UPDATE_ANLEGG, + GET_ANSVAR, + GET_ALL_ANSVAR, + UPDATE_ANSVAR, + GET_ARBEIDSFORHOLDSTYPE, + GET_ALL_ARBEIDSFORHOLDSTYPE, + UPDATE_ARBEIDSFORHOLDSTYPE, + GET_ART, + GET_ALL_ART, + UPDATE_ART, + GET_DIVERSE, + GET_ALL_DIVERSE, + UPDATE_DIVERSE, + GET_FORMAL, + GET_ALL_FORMAL, + UPDATE_FORMAL, + GET_FRAVARSGRUNN, + GET_ALL_FRAVARSGRUNN, + UPDATE_FRAVARSGRUNN, + GET_FRAVARSTYPE, + GET_ALL_FRAVARSTYPE, + UPDATE_FRAVARSTYPE, + GET_FUNKSJON, + GET_ALL_FUNKSJON, + UPDATE_FUNKSJON, + GET_KONTRAKT, + GET_ALL_KONTRAKT, + UPDATE_KONTRAKT, + GET_LONNSART, + GET_ALL_LONNSART, + UPDATE_LONNSART, + GET_LOPENUMMER, + GET_ALL_LOPENUMMER, + UPDATE_LOPENUMMER, + GET_OBJEKT, + GET_ALL_OBJEKT, + UPDATE_OBJEKT, + GET_ORGANISASJONSTYPE, + GET_ALL_ORGANISASJONSTYPE, + UPDATE_ORGANISASJONSTYPE, + GET_PERSONALRESSURSKATEGORI, + GET_ALL_PERSONALRESSURSKATEGORI, + UPDATE_PERSONALRESSURSKATEGORI, + GET_PROSJEKT, + GET_ALL_PROSJEKT, + UPDATE_PROSJEKT, + GET_PROSJEKTART, + GET_ALL_PROSJEKTART, + UPDATE_PROSJEKTART, + GET_RAMME, + GET_ALL_RAMME, + UPDATE_RAMME, + GET_STILLINGSKODE, + GET_ALL_STILLINGSKODE, + UPDATE_STILLINGSKODE, + GET_UKETIMETALL, + GET_ALL_UKETIMETALL, + UPDATE_UKETIMETALL; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(KodeverkActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 8d7559f3..a7726d57 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 @@ -1,72 +1,34 @@ package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; 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 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.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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public abstract class Kontodimensjon extends Begrep implements FintAbstractObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - FULLMAKT("fullmakt", "no.novari.fint.model.administrasjon.fullmakt.Fullmakt", NONE_TO_MANY); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; - - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } - } - - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - - relations.addAll(Arrays.asList(Relasjonsnavn.values())); - - return Collections.unmodifiableList(relations); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public abstract class Kontodimensjon extends Begrep implements FintAbstractObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 f698882f..9a3e0193 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 @@ -1,43 +1,33 @@ package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.FintModelObject; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Kontrakt extends Kontodimensjon implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Kontrakt extends Kontodimensjon implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 7795826a..7a54f180 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 @@ -1,73 +1,71 @@ package no.novari.fint.model.administrasjon.kodeverk; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Lonnsart extends Begrep implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - ART("art", "no.novari.fint.model.administrasjon.kodeverk.Art", NONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Lonnsart extends Begrep implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ART("art", "no.novari.fint.model.administrasjon.kodeverk.Art", NONE_TO_ONE, null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private String kategori; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private String kategori; } 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 7141412e..1a8f3ce0 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 @@ -1,43 +1,33 @@ package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.FintModelObject; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Lopenummer extends Kontodimensjon implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Lopenummer extends Kontodimensjon implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 7aee4ad4..9195b55a 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 @@ -1,43 +1,33 @@ package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.FintModelObject; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Objekt extends Kontodimensjon implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Objekt extends Kontodimensjon implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Organisasjonstype.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Organisasjonstype.java index bde6c886..b65b48e3 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Organisasjonstype.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kodeverk/Organisasjonstype.java @@ -1,49 +1,34 @@ package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -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 java.util.Map; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; -import no.novari.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Organisasjonstype extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Organisasjonstype extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; + @JsonIgnore private final boolean writeable = false; } 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 2fc58859..8d38a34b 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Personalressurskategori extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Personalressurskategori extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 1d49de4b..32fa152d 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 @@ -1,72 +1,73 @@ package no.novari.fint.model.administrasjon.kodeverk; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Prosjekt extends Kontodimensjon implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - PROSJEKTART("prosjektart", "no.novari.fint.model.administrasjon.kodeverk.Prosjektart", NONE_TO_MANY); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Prosjekt extends Kontodimensjon implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + PROSJEKTART( + "prosjektart", + "no.novari.fint.model.administrasjon.kodeverk.Prosjektart", + NONE_TO_MANY, + "prosjekt"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 bafcdecc..4ecfc1bd 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 @@ -1,74 +1,84 @@ package no.novari.fint.model.administrasjon.kodeverk; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Prosjektart extends Kontodimensjon implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Prosjektart extends Kontodimensjon implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + UNDERORDNET( + "underordnet", + "no.novari.fint.model.administrasjon.kodeverk.Prosjektart", + NONE_TO_MANY, + "overordnet"), + PROSJEKT( + "prosjekt", + "no.novari.fint.model.administrasjon.kodeverk.Prosjekt", + NONE_TO_ONE, + "prosjektart"), + OVERORDNET( + "overordnet", + "no.novari.fint.model.administrasjon.kodeverk.Prosjektart", + NONE_TO_ONE, + "underordnet"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 dbd915a0..d8e1d49a 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 @@ -1,43 +1,33 @@ package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.FintModelObject; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Ramme extends Kontodimensjon implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Ramme extends Kontodimensjon implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 5d0f7b14..d7e69efe 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 @@ -1,72 +1,74 @@ package no.novari.fint.model.administrasjon.kodeverk; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Stillingskode extends Begrep implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - FORELDER("forelder", "no.novari.fint.model.administrasjon.kodeverk.Stillingskode", NONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Stillingskode extends Begrep implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + FORELDER( + "forelder", + "no.novari.fint.model.administrasjon.kodeverk.Stillingskode", + NONE_TO_ONE, + null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 317e5dfe..bc9ffeef 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Uketimetall extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Uketimetall extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kompleksedatatyper/KompleksedatatyperActions.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kompleksedatatyper/KompleksedatatyperActions.java index 54a7e9b0..59183f9d 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kompleksedatatyper/KompleksedatatyperActions.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/kompleksedatatyper/KompleksedatatyperActions.java @@ -4,20 +4,17 @@ import java.util.List; public enum KompleksedatatyperActions { - - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(KompleksedatatyperActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + ; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(KompleksedatatyperActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 9dd7e4e5..df156946 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 @@ -1,74 +1,79 @@ package no.novari.fint.model.administrasjon.kompleksedatatyper; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; import java.util.List; - -import no.novari.fint.model.FintMultiplicity; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintComplexDatatypeObject; -import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; 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 @EqualsAndHashCode @ToString -public class Kontostreng implements FintComplexDatatypeObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Kontostreng implements FintComplexDatatypeObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + AKTIVITET( + "aktivitet", "no.novari.fint.model.administrasjon.kodeverk.Aktivitet", NONE_TO_ONE, null), + ANLEGG("anlegg", "no.novari.fint.model.administrasjon.kodeverk.Anlegg", NONE_TO_ONE, null), + ANSVAR("ansvar", "no.novari.fint.model.administrasjon.kodeverk.Ansvar", ONE_TO_ONE, null), + ART("art", "no.novari.fint.model.administrasjon.kodeverk.Art", ONE_TO_ONE, null), + DIVERSE("diverse", "no.novari.fint.model.administrasjon.kodeverk.Diverse", NONE_TO_ONE, null), + FORMAL("formal", "no.novari.fint.model.administrasjon.kodeverk.Formal", NONE_TO_ONE, null), + FUNKSJON("funksjon", "no.novari.fint.model.administrasjon.kodeverk.Funksjon", ONE_TO_ONE, null), + KONTRAKT( + "kontrakt", "no.novari.fint.model.administrasjon.kodeverk.Kontrakt", NONE_TO_ONE, null), + LOPENUMMER( + "lopenummer", "no.novari.fint.model.administrasjon.kodeverk.Lopenummer", NONE_TO_ONE, null), + OBJEKT("objekt", "no.novari.fint.model.administrasjon.kodeverk.Objekt", NONE_TO_ONE, null), + PROSJEKT( + "prosjekt", "no.novari.fint.model.administrasjon.kodeverk.Prosjekt", NONE_TO_ONE, null), + PROSJEKTART( + "prosjektart", + "no.novari.fint.model.administrasjon.kodeverk.Prosjektart", + NONE_TO_ONE, + null), + RAMME("ramme", "no.novari.fint.model.administrasjon.kodeverk.Ramme", NONE_TO_ONE, null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - return Collections.unmodifiableList(relations); - } + return Collections.unmodifiableList(relations); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 a866741f..6634fb4d 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 @@ -1,78 +1,79 @@ package no.novari.fint.model.administrasjon.organisasjon; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Enhet; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Arbeidslokasjon extends Enhet implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - ARBEIDSFORHOLD("arbeidsforhold", "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", NONE_TO_MANY); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Arbeidslokasjon extends Enhet implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ARBEIDSFORHOLD( + "arbeidsforhold", + "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", + NONE_TO_MANY, + "arbeidslokasjon"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - identifikators.put("lokasjonskode", this.lokasjonskode); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + identifikators.put("lokasjonskode", this.lokasjonskode); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Identifikator lokasjonskode; - private String lokasjonsnavn; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Identifikator lokasjonskode; + private String lokasjonsnavn; } diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/OrganisasjonActions.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/OrganisasjonActions.java index 2d80a10b..3efc7dc8 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/OrganisasjonActions.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/organisasjon/OrganisasjonActions.java @@ -4,26 +4,22 @@ import java.util.List; public enum OrganisasjonActions { - - GET_ARBEIDSLOKASJON, - GET_ALL_ARBEIDSLOKASJON, - UPDATE_ARBEIDSLOKASJON, - GET_ORGANISASJONSELEMENT, - GET_ALL_ORGANISASJONSELEMENT, - UPDATE_ORGANISASJONSELEMENT - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(OrganisasjonActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_ARBEIDSLOKASJON, + GET_ALL_ARBEIDSLOKASJON, + UPDATE_ARBEIDSLOKASJON, + GET_ORGANISASJONSELEMENT, + GET_ALL_ORGANISASJONSELEMENT, + UPDATE_ORGANISASJONSELEMENT; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(OrganisasjonActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 9d67b849..22c448d0 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 @@ -1,90 +1,116 @@ package no.novari.fint.model.administrasjon.organisasjon; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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.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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Organisasjonselement extends Enhet implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - ANSVAR("ansvar", "no.novari.fint.model.administrasjon.kodeverk.Ansvar", NONE_TO_MANY), - ORGANISASJONSTYPE("organisasjonstype", "no.novari.fint.model.administrasjon.kodeverk.Organisasjonstype", NONE_TO_ONE), - 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); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Organisasjonselement extends Enhet implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ANSVAR( + "ansvar", + "no.novari.fint.model.administrasjon.kodeverk.Ansvar", + NONE_TO_MANY, + "organisasjonselement"), + ORGANISASJONSTYPE( + "organisasjonstype", + "no.novari.fint.model.administrasjon.kodeverk.Organisasjonstype", + NONE_TO_ONE, + null), + LEDER( + "leder", + "no.novari.fint.model.administrasjon.personal.Personalressurs", + NONE_TO_ONE, + "leder"), + OVERORDNET( + "overordnet", + "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", + ONE_TO_ONE, + null), + UNDERORDNET( + "underordnet", + "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", + NONE_TO_MANY, + null), + SKOLE( + "skole", + "no.novari.fint.model.utdanning.utdanningsprogram.Skole", + NONE_TO_ONE, + "organisasjon"), + ARBEIDSFORHOLD( + "arbeidsforhold", + "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", + NONE_TO_MANY, + "arbeidssted"); - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - identifikators.put("organisasjonsId", this.organisasjonsId); - identifikators.put("organisasjonsKode", this.organisasjonsKode); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + identifikators.put("organisasjonsId", this.organisasjonsId); + identifikators.put("organisasjonsKode", this.organisasjonsKode); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private @Valid Periode gyldighetsperiode; - private String kortnavn; - private String navn; - @NotNull - private @Valid Identifikator organisasjonsId; - @NotNull - private @Valid Identifikator organisasjonsKode; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private @Valid Periode gyldighetsperiode; + private String kortnavn; + private String navn; + @NotNull private @Valid Identifikator organisasjonsId; + @NotNull private @Valid Identifikator organisasjonsKode; } 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 c8ecb9d0..2c192d1e 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 @@ -1,116 +1,160 @@ package no.novari.fint.model.administrasjon.personal; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -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 @EqualsAndHashCode @ToString -public class Arbeidsforhold implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Arbeidsforhold implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + AKTIVITET( + "aktivitet", "no.novari.fint.model.administrasjon.kodeverk.Aktivitet", NONE_TO_ONE, null), + ANLEGG("anlegg", "no.novari.fint.model.administrasjon.kodeverk.Anlegg", NONE_TO_ONE, null), + ANSVAR("ansvar", "no.novari.fint.model.administrasjon.kodeverk.Ansvar", NONE_TO_ONE, null), + ARBEIDSFORHOLDSTYPE( + "arbeidsforholdstype", + "no.novari.fint.model.administrasjon.kodeverk.Arbeidsforholdstype", + NONE_TO_ONE, + null), + ART("art", "no.novari.fint.model.administrasjon.kodeverk.Art", NONE_TO_ONE, null), + DIVERSE("diverse", "no.novari.fint.model.administrasjon.kodeverk.Diverse", NONE_TO_ONE, null), + FORMAL("formal", "no.novari.fint.model.administrasjon.kodeverk.Formal", NONE_TO_ONE, null), + FUNKSJON( + "funksjon", "no.novari.fint.model.administrasjon.kodeverk.Funksjon", NONE_TO_ONE, null), + KONTRAKT( + "kontrakt", "no.novari.fint.model.administrasjon.kodeverk.Kontrakt", NONE_TO_ONE, null), + LOPENUMMER( + "lopenummer", "no.novari.fint.model.administrasjon.kodeverk.Lopenummer", NONE_TO_ONE, null), + OBJEKT("objekt", "no.novari.fint.model.administrasjon.kodeverk.Objekt", NONE_TO_ONE, null), + PROSJEKT( + "prosjekt", "no.novari.fint.model.administrasjon.kodeverk.Prosjekt", NONE_TO_ONE, null), + RAMME("ramme", "no.novari.fint.model.administrasjon.kodeverk.Ramme", NONE_TO_ONE, null), + STILLINGSKODE( + "stillingskode", + "no.novari.fint.model.administrasjon.kodeverk.Stillingskode", + NONE_TO_ONE, + null), + TIMERPERUKE( + "timerPerUke", + "no.novari.fint.model.administrasjon.kodeverk.Uketimetall", + NONE_TO_ONE, + null), + ARBEIDSLOKASJON( + "arbeidslokasjon", + "no.novari.fint.model.administrasjon.organisasjon.Arbeidslokasjon", + NONE_TO_ONE, + "arbeidsforhold"), + ARBEIDSSTED( + "arbeidssted", + "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", + ONE_TO_ONE, + "arbeidsforhold"), + PERSONALLEDER( + "personalleder", + "no.novari.fint.model.administrasjon.personal.Personalressurs", + NONE_TO_ONE, + "personalansvar"), + FASTLONN( + "fastlonn", + "no.novari.fint.model.administrasjon.personal.Fastlonn", + NONE_TO_MANY, + "arbeidsforhold"), + FASTTILLEGG( + "fasttillegg", + "no.novari.fint.model.administrasjon.personal.Fasttillegg", + NONE_TO_MANY, + "arbeidsforhold"), + FRAVAR( + "fravar", + "no.novari.fint.model.administrasjon.personal.Fravar", + NONE_TO_MANY, + "arbeidsforhold"), + VARIABELLONN( + "variabellonn", + "no.novari.fint.model.administrasjon.personal.Variabellonn", + NONE_TO_MANY, + "arbeidsforhold"), + PERSONALRESSURS( + "personalressurs", + "no.novari.fint.model.administrasjon.personal.Personalressurs", + ONE_TO_ONE, + "arbeidsforhold"), + UNDERVISNINGSFORHOLD( + "undervisningsforhold", + "no.novari.fint.model.utdanning.elev.Undervisningsforhold", + NONE_TO_ONE, + "arbeidsforhold"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private Long ansettelsesprosent; - private @Valid Periode arbeidsforholdsperiode; - @NotNull - private Long arslonn; - @NotNull - private @Valid Periode gyldighetsperiode; - @NotNull - private Boolean hovedstilling; - @NotNull - private Long lonnsprosent; - @NotBlank - private String stillingsnummer; - private String stillingstittel; - @NotNull - private @Valid Identifikator systemId; - @NotNull - private Long tilstedeprosent; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + @NotNull private Long ansettelsesprosent; + private @Valid Periode arbeidsforholdsperiode; + @NotNull private Long arslonn; + @NotNull private @Valid Periode gyldighetsperiode; + @NotNull private Boolean hovedstilling; + @NotNull private Long lonnsprosent; + @NotBlank private String stillingsnummer; + private String stillingstittel; + @NotNull private @Valid Identifikator systemId; + @NotNull private Long tilstedeprosent; } 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 62ad0959..9b53d914 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 @@ -1,75 +1,78 @@ package no.novari.fint.model.administrasjon.personal; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Fastlonn extends Lonn implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Fastlonn extends Lonn implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + LONNSART( + "lonnsart", "no.novari.fint.model.administrasjon.kodeverk.Lonnsart", NONE_TO_ONE, null), + ARBEIDSFORHOLD( + "arbeidsforhold", + "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", + ONE_TO_ONE, + "fastlonn"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); + relations.addAll(super.getRelations()); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private Long prosent; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + @NotNull private Long prosent; } 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 033140d9..5f25b555 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 @@ -1,75 +1,76 @@ package no.novari.fint.model.administrasjon.personal; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Fasttillegg extends Lonn implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Fasttillegg extends Lonn implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + LONNSART("lonnsart", "no.novari.fint.model.administrasjon.kodeverk.Lonnsart", ONE_TO_ONE, null), + ARBEIDSFORHOLD( + "arbeidsforhold", + "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", + ONE_TO_ONE, + "fasttillegg"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); + relations.addAll(super.getRelations()); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private Long belop; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + @NotNull private Long belop; } 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 9443e100..d7dba06e 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 @@ -1,89 +1,110 @@ package no.novari.fint.model.administrasjon.personal; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; -import java.util.Date; - +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -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 @EqualsAndHashCode @ToString -public class Fravar implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Fravar implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + FRAVARSGRUNN( + "fravarsgrunn", + "no.novari.fint.model.administrasjon.kodeverk.Fravarsgrunn", + NONE_TO_ONE, + null), + FRAVARSTYPE( + "fravarstype", + "no.novari.fint.model.administrasjon.kodeverk.Fravarstype", + ONE_TO_ONE, + null), + ARBEIDSFORHOLD( + "arbeidsforhold", + "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", + ONE_TO_MANY, + "fravar"), + FORTSETTELSE( + "fortsettelse", + "no.novari.fint.model.administrasjon.personal.Fravar", + NONE_TO_ONE, + "fortsetter"), + GODKJENNER( + "godkjenner", + "no.novari.fint.model.administrasjon.personal.Personalressurs", + NONE_TO_ONE, + null), + FORTSETTER( + "fortsetter", + "no.novari.fint.model.administrasjon.personal.Fravar", + NONE_TO_ONE, + "fortsettelse"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("kildesystemId", this.kildesystemId); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("kildesystemId", this.kildesystemId); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private @Valid Date godkjent; - private @Valid Identifikator kildesystemId; - @NotNull - private @Valid Periode periode; - @NotNull - private Long prosent; - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private @Valid Date godkjent; + private @Valid Identifikator kildesystemId; + @NotNull private @Valid Periode periode; + @NotNull private Long prosent; + private @Valid Identifikator systemId; } 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 e3aff93f..e6bca535 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 @@ -1,92 +1,98 @@ package no.novari.fint.model.administrasjon.personal; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintAbstractObject; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; 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.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -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 @EqualsAndHashCode @ToString -public abstract class Lonn implements FintAbstractObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public abstract class Lonn implements FintAbstractObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ANVISER( + "anviser", + "no.novari.fint.model.administrasjon.personal.Personalressurs", + NONE_TO_ONE, + null), + KONTERER( + "konterer", + "no.novari.fint.model.administrasjon.personal.Personalressurs", + NONE_TO_ONE, + null), + ATTESTANT( + "attestant", + "no.novari.fint.model.administrasjon.personal.Personalressurs", + NONE_TO_ONE, + null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("kildesystemId", this.kildesystemId); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("kildesystemId", this.kildesystemId); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private @Valid Date anvist; - private @Valid Date attestert; - @NotBlank - private String beskrivelse; - private @Valid Identifikator kildesystemId; - private @Valid Date kontert; - @NotNull - private @Valid Kontostreng kontostreng; - private @Valid Periode opptjent; - @NotNull - private @Valid Periode periode; - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private @Valid Date anvist; + private @Valid Date attestert; + @NotBlank private String beskrivelse; + private @Valid Identifikator kildesystemId; + private @Valid Date kontert; + @NotNull private @Valid Kontostreng kontostreng; + private @Valid Periode opptjent; + @NotNull private @Valid Periode periode; + private @Valid Identifikator systemId; } diff --git a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/PersonalActions.java b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/PersonalActions.java index 29a915dc..739316a0 100644 --- a/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/PersonalActions.java +++ b/fint-administrasjon-model-java/src/main/java/no/novari/fint/model/administrasjon/personal/PersonalActions.java @@ -4,38 +4,34 @@ import java.util.List; public enum PersonalActions { - - GET_FASTLONN, - GET_ALL_FASTLONN, - UPDATE_FASTLONN, - GET_FASTTILLEGG, - GET_ALL_FASTTILLEGG, - UPDATE_FASTTILLEGG, - GET_FRAVAR, - GET_ALL_FRAVAR, - UPDATE_FRAVAR, - GET_VARIABELLONN, - GET_ALL_VARIABELLONN, - UPDATE_VARIABELLONN, - GET_PERSONALRESSURS, - GET_ALL_PERSONALRESSURS, - UPDATE_PERSONALRESSURS, - GET_ARBEIDSFORHOLD, - GET_ALL_ARBEIDSFORHOLD, - UPDATE_ARBEIDSFORHOLD - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(PersonalActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_FASTLONN, + GET_ALL_FASTLONN, + UPDATE_FASTLONN, + GET_FASTTILLEGG, + GET_ALL_FASTTILLEGG, + UPDATE_FASTTILLEGG, + GET_FRAVAR, + GET_ALL_FRAVAR, + UPDATE_FRAVAR, + GET_VARIABELLONN, + GET_ALL_VARIABELLONN, + UPDATE_VARIABELLONN, + GET_PERSONALRESSURS, + GET_ALL_PERSONALRESSURS, + UPDATE_PERSONALRESSURS, + GET_ARBEIDSFORHOLD, + GET_ALL_ARBEIDSFORHOLD, + UPDATE_ARBEIDSFORHOLD; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(PersonalActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 c74474a6..770a3a06 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 @@ -1,94 +1,120 @@ package no.novari.fint.model.administrasjon.personal; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Personalressurs implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Personalressurs implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + PERSONALRESSURSKATEGORI( + "personalressurskategori", + "no.novari.fint.model.administrasjon.kodeverk.Personalressurskategori", + ONE_TO_ONE, + null), + ARBEIDSFORHOLD( + "arbeidsforhold", + "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", + NONE_TO_MANY, + "personalressurs"), + PERSON("person", "no.novari.fint.model.felles.Person", ONE_TO_ONE, "personalressurs"), + STEDFORTREDER( + "stedfortreder", + "no.novari.fint.model.administrasjon.fullmakt.Fullmakt", + NONE_TO_MANY, + "stedfortreder"), + FULLMAKT( + "fullmakt", + "no.novari.fint.model.administrasjon.fullmakt.Fullmakt", + NONE_TO_MANY, + "fullmektig"), + LEDER( + "leder", + "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", + NONE_TO_MANY, + "leder"), + PERSONALANSVAR( + "personalansvar", + "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", + NONE_TO_MANY, + "personalleder"), + SKOLERESSURS( + "skoleressurs", + "no.novari.fint.model.utdanning.elev.Skoleressurs", + NONE_TO_ONE, + "personalressurs"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("ansattnummer", this.ansattnummer); - identifikators.put("brukernavn", this.brukernavn); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("ansattnummer", this.ansattnummer); + identifikators.put("brukernavn", this.brukernavn); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Identifikator ansattnummer; - @NotNull - private @Valid Periode ansettelsesperiode; - private Date ansiennitet; - private @Valid Identifikator brukernavn; - private String jobbtittel; - private @Valid Kontaktinformasjon kontaktinformasjon; - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Identifikator ansattnummer; + @NotNull private @Valid Periode ansettelsesperiode; + private Date ansiennitet; + private @Valid Identifikator brukernavn; + private String jobbtittel; + private @Valid Kontaktinformasjon kontaktinformasjon; + private @Valid Identifikator systemId; } 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 98548f29..00c6ace3 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 @@ -1,76 +1,77 @@ package no.novari.fint.model.administrasjon.personal; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Variabellonn extends Lonn implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Variabellonn extends Lonn implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + LONNSART("lonnsart", "no.novari.fint.model.administrasjon.kodeverk.Lonnsart", ONE_TO_ONE, null), + ARBEIDSFORHOLD( + "arbeidsforhold", + "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", + ONE_TO_ONE, + "variabellonn"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); + relations.addAll(super.getRelations()); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private Long antall; - private Long belop; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + @NotNull private Long antall; + private Long belop; } diff --git a/fint-administrasjon-resource-model-java-tests/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 index 231de0e6..bc1199b4 100644 --- a/fint-administrasjon-resource-model-java-tests/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 @@ -5,5 +5,4 @@ @EnableHypermediaSupport(type = EnableHypermediaSupport.HypermediaType.HAL) @SpringBootApplication -public class TestApplication { -} +public class TestApplication {} diff --git a/fint-administrasjon-resource-model-java-tests/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 index f318f21b..e7aaabd5 100644 --- a/fint-administrasjon-resource-model-java-tests/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 @@ -10,11 +10,9 @@ @Configuration public class TestConfiguration { - @Bean - @Primary - public ObjectMapper objectMapper() { - return Jackson2ObjectMapperBuilder.json() - .modules(new Jackson2HalModule()) - .build(); - } + @Bean + @Primary + public ObjectMapper objectMapper() { + return Jackson2ObjectMapperBuilder.json().modules(new Jackson2HalModule()).build(); + } } 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 ec4b9a91..c430d585 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 @@ -1,168 +1,184 @@ package no.novari.fint.model.resource.administrasjon.fullmakt; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; 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 @NoArgsConstructor @EqualsAndHashCode @ToString public class FullmaktResource implements FintResource { - // Attributes - @NotNull - private @Valid Periode gyldighetsperiode; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @Deprecated - @JsonIgnore - public List getMyndighet() { - return getLinks().getOrDefault("myndighet", Collections.emptyList()); - } - @Deprecated - public void addMyndighet(Link link) { - addLink("myndighet", link); - } - @JsonIgnore - public List getRamme() { - return getLinks().getOrDefault("ramme", Collections.emptyList()); - } - public void addRamme(Link link) { - addLink("ramme", link); - } - @JsonIgnore - public List getFunksjon() { - return getLinks().getOrDefault("funksjon", Collections.emptyList()); - } - public void addFunksjon(Link link) { - addLink("funksjon", link); - } - @JsonIgnore - public List getObjekt() { - return getLinks().getOrDefault("objekt", Collections.emptyList()); - } - public void addObjekt(Link link) { - addLink("objekt", link); - } - @JsonIgnore - public List getOrganisasjonselement() { - return getLinks().getOrDefault("organisasjonselement", Collections.emptyList()); - } - public void addOrganisasjonselement(Link link) { - addLink("organisasjonselement", link); - } - @JsonIgnore - public List getArt() { - return getLinks().getOrDefault("art", Collections.emptyList()); - } - public void addArt(Link link) { - addLink("art", link); - } - @JsonIgnore - public List getAnlegg() { - return getLinks().getOrDefault("anlegg", Collections.emptyList()); - } - public void addAnlegg(Link link) { - addLink("anlegg", link); - } - @JsonIgnore - public List getDiverse() { - return getLinks().getOrDefault("diverse", Collections.emptyList()); - } - public void addDiverse(Link link) { - addLink("diverse", link); - } - @JsonIgnore - public List getAktivitet() { - return getLinks().getOrDefault("aktivitet", Collections.emptyList()); - } - public void addAktivitet(Link link) { - addLink("aktivitet", link); - } - @JsonIgnore - public List getAnsvar() { - return getLinks().getOrDefault("ansvar", Collections.emptyList()); - } - public void addAnsvar(Link link) { - addLink("ansvar", link); - } - @JsonIgnore - public List getStedfortreder() { - return getLinks().getOrDefault("stedfortreder", Collections.emptyList()); - } - public void addStedfortreder(Link link) { - addLink("stedfortreder", link); - } - @JsonIgnore - public List getKontrakt() { - return getLinks().getOrDefault("kontrakt", Collections.emptyList()); - } - public void addKontrakt(Link link) { - addLink("kontrakt", link); - } - @JsonIgnore - public List getFullmektig() { - return getLinks().getOrDefault("fullmektig", Collections.emptyList()); - } - public void addFullmektig(Link link) { - addLink("fullmektig", link); - } - @JsonIgnore - public List getProsjekt() { - return getLinks().getOrDefault("prosjekt", Collections.emptyList()); - } - public void addProsjekt(Link link) { - addLink("prosjekt", link); - } - @JsonIgnore - public List getFormal() { - return getLinks().getOrDefault("formal", Collections.emptyList()); - } - public void addFormal(Link link) { - addLink("formal", link); - } - @JsonIgnore - public List getRolle() { - return getLinks().getOrDefault("rolle", Collections.emptyList()); - } - public void addRolle(Link link) { - addLink("rolle", link); - } - @JsonIgnore - public List getLopenummer() { - return getLinks().getOrDefault("lopenummer", Collections.emptyList()); - } - public void addLopenummer(Link link) { - addLink("lopenummer", link); - } + // Attributes + @NotNull private @Valid Periode gyldighetsperiode; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getRamme() { + return getLinks().getOrDefault("ramme", Collections.emptyList()); + } + + public void addRamme(Link link) { + addLink("ramme", link); + } + + @JsonIgnore + public List getFunksjon() { + return getLinks().getOrDefault("funksjon", Collections.emptyList()); + } + + public void addFunksjon(Link link) { + addLink("funksjon", link); + } + + @JsonIgnore + public List getObjekt() { + return getLinks().getOrDefault("objekt", Collections.emptyList()); + } + + public void addObjekt(Link link) { + addLink("objekt", link); + } + + @JsonIgnore + public List getOrganisasjonselement() { + return getLinks().getOrDefault("organisasjonselement", Collections.emptyList()); + } + + public void addOrganisasjonselement(Link link) { + addLink("organisasjonselement", link); + } + + @JsonIgnore + public List getArt() { + return getLinks().getOrDefault("art", Collections.emptyList()); + } + + public void addArt(Link link) { + addLink("art", link); + } + + @JsonIgnore + public List getAnlegg() { + return getLinks().getOrDefault("anlegg", Collections.emptyList()); + } + + public void addAnlegg(Link link) { + addLink("anlegg", link); + } + + @JsonIgnore + public List getDiverse() { + return getLinks().getOrDefault("diverse", Collections.emptyList()); + } + + public void addDiverse(Link link) { + addLink("diverse", link); + } + + @JsonIgnore + public List getAktivitet() { + return getLinks().getOrDefault("aktivitet", Collections.emptyList()); + } + + public void addAktivitet(Link link) { + addLink("aktivitet", link); + } + + @JsonIgnore + public List getAnsvar() { + return getLinks().getOrDefault("ansvar", Collections.emptyList()); + } + + public void addAnsvar(Link link) { + addLink("ansvar", link); + } + + @JsonIgnore + public List getStedfortreder() { + return getLinks().getOrDefault("stedfortreder", Collections.emptyList()); + } + + public void addStedfortreder(Link link) { + addLink("stedfortreder", link); + } + + @JsonIgnore + public List getKontrakt() { + return getLinks().getOrDefault("kontrakt", Collections.emptyList()); + } + + public void addKontrakt(Link link) { + addLink("kontrakt", link); + } + + @JsonIgnore + public List getFullmektig() { + return getLinks().getOrDefault("fullmektig", Collections.emptyList()); + } + + public void addFullmektig(Link link) { + addLink("fullmektig", link); + } + + @JsonIgnore + public List getProsjekt() { + return getLinks().getOrDefault("prosjekt", Collections.emptyList()); + } + + public void addProsjekt(Link link) { + addLink("prosjekt", link); + } + + @JsonIgnore + public List getFormal() { + return getLinks().getOrDefault("formal", Collections.emptyList()); + } + + public void addFormal(Link link) { + addLink("formal", link); + } + + @JsonIgnore + public List getRolle() { + return getLinks().getOrDefault("rolle", Collections.emptyList()); + } + + public void addRolle(Link link) { + addLink("rolle", link); + } + + @JsonIgnore + public List getLopenummer() { + return getLinks().getOrDefault("lopenummer", Collections.emptyList()); + } + + public void addLopenummer(Link link) { + addLink("lopenummer", link); + } } 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 273e0be7..538ab613 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FullmaktResources extends AbstractCollectionResources { - public FullmaktResources(Collection input) { - super(input); - } + public FullmaktResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 f286d98b..007bdea6 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 @@ -1,53 +1,48 @@ package no.novari.fint.model.resource.administrasjon.fullmakt; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class RolleResource implements FintResource { - // Attributes - @NotBlank - private String beskrivelse; - @NotNull - private @Valid Identifikator navn; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("navn", this.navn); + // Attributes + @NotBlank private String beskrivelse; + @NotNull private @Valid Identifikator navn; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("navn", this.navn); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getFullmakt() { + return getLinks().getOrDefault("fullmakt", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getFullmakt() { - return getLinks().getOrDefault("fullmakt", Collections.emptyList()); - } - public void addFullmakt(Link link) { - addLink("fullmakt", link); - } + public void addFullmakt(Link link) { + addLink("fullmakt", link); + } } 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 ee10d50e..40bcc7fa 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class RolleResources extends AbstractCollectionResources { - public RolleResources(Collection input) { - super(input); - } + public RolleResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 6a27f66c..7e8b09ab 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 @@ -1,37 +1,34 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.administrasjon.kodeverk.Kontodimensjon; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class AktivitetResource extends KontodimensjonResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class AktivitetResource extends Kontodimensjon implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 4180e6b1..5d8bbc41 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AktivitetResources extends AbstractCollectionResources { - public AktivitetResources(Collection input) { - super(input); - } + public AktivitetResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 d8f9c263..2a6ae874 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 @@ -1,37 +1,34 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.administrasjon.kodeverk.Kontodimensjon; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class AnleggResource extends KontodimensjonResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class AnleggResource extends Kontodimensjon implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 219d437f..c3a61a35 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AnleggResources extends AbstractCollectionResources { - public AnleggResources(Collection input) { - super(input); - } + public AnleggResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 4cee66a1..5786ac9a 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 @@ -1,59 +1,61 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.administrasjon.kodeverk.Kontodimensjon; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class AnsvarResource extends KontodimensjonResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getOverordnet() { - return getLinks().getOrDefault("overordnet", Collections.emptyList()); - } - public void addOverordnet(Link link) { - addLink("overordnet", link); - } - @JsonIgnore - public List getUnderordnet() { - return getLinks().getOrDefault("underordnet", Collections.emptyList()); - } - public void addUnderordnet(Link link) { - addLink("underordnet", link); - } - @JsonIgnore - public List getOrganisasjonselement() { - return getLinks().getOrDefault("organisasjonselement", Collections.emptyList()); - } - public void addOrganisasjonselement(Link link) { - addLink("organisasjonselement", link); - } +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class AnsvarResource extends Kontodimensjon implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getOverordnet() { + return getLinks().getOrDefault("overordnet", Collections.emptyList()); + } + + public void addOverordnet(Link link) { + addLink("overordnet", link); + } + + @JsonIgnore + public List getUnderordnet() { + return getLinks().getOrDefault("underordnet", Collections.emptyList()); + } + + public void addUnderordnet(Link link) { + addLink("underordnet", link); + } + + @JsonIgnore + public List getOrganisasjonselement() { + return getLinks().getOrDefault("organisasjonselement", Collections.emptyList()); + } + + public void addOrganisasjonselement(Link link) { + addLink("organisasjonselement", link); + } } 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 0fd152a8..cdbce4b4 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AnsvarResources extends AbstractCollectionResources { - public AnsvarResources(Collection input) { - super(input); - } + public AnsvarResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 e9654fe2..6a019e7d 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 @@ -1,46 +1,43 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class ArbeidsforholdstypeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getForelder() { + return getLinks().getOrDefault("forelder", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getForelder() { - return getLinks().getOrDefault("forelder", Collections.emptyList()); - } - public void addForelder(Link link) { - addLink("forelder", link); - } + public void addForelder(Link link) { + addLink("forelder", link); + } } 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 36f3d2c0..1e3ad944 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class ArbeidsforholdstypeResources extends AbstractCollectionResources { +public class ArbeidsforholdstypeResources + extends AbstractCollectionResources { - public ArbeidsforholdstypeResources(Collection input) { - super(input); - } + public ArbeidsforholdstypeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 ceb95822..dade626c 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 @@ -1,37 +1,34 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.administrasjon.kodeverk.Kontodimensjon; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class ArtResource extends KontodimensjonResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ArtResource extends Kontodimensjon implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 54c91b04..e5f29004 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ArtResources extends AbstractCollectionResources { - public ArtResources(Collection input) { - super(input); - } + public ArtResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 a592d633..daad8232 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 @@ -1,37 +1,34 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.administrasjon.kodeverk.Kontodimensjon; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class DiverseResource extends KontodimensjonResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class DiverseResource extends Kontodimensjon implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 9c996f46..d1e7613a 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class DiverseResources extends AbstractCollectionResources { - public DiverseResources(Collection input) { - super(input); - } + public DiverseResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 a8752e8a..65c8cafe 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 @@ -1,37 +1,34 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.administrasjon.kodeverk.Kontodimensjon; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class FormalResource extends KontodimensjonResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class FormalResource extends Kontodimensjon implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 4ec0245b..6bbdf600 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FormalResources extends AbstractCollectionResources { - public FormalResources(Collection input) { - super(input); - } + public FormalResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 c368daa5..d09ce5d7 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class FravarsgrunnResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 08fd0e3c..13617a9e 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FravarsgrunnResources extends AbstractCollectionResources { - public FravarsgrunnResources(Collection input) { - super(input); - } + public FravarsgrunnResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 6cfc5685..ff0db06f 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 @@ -1,48 +1,46 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class FravarstypeResource extends Begrep implements FintResource { - // Attributes - private Boolean overfores; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + // Attributes + private Boolean overfores; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getLonnsart() { + return getLinks().getOrDefault("lonnsart", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getLonnsart() { - return getLinks().getOrDefault("lonnsart", Collections.emptyList()); - } - public void addLonnsart(Link link) { - addLink("lonnsart", link); - } + public void addLonnsart(Link link) { + addLink("lonnsart", link); + } } 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 9efd1240..07a8dc3a 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FravarstypeResources extends AbstractCollectionResources { - public FravarstypeResources(Collection input) { - super(input); - } + public FravarstypeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 292372f5..f4379143 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 @@ -1,52 +1,52 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.administrasjon.kodeverk.Kontodimensjon; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class FunksjonResource extends KontodimensjonResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getOverordnet() { - return getLinks().getOrDefault("overordnet", Collections.emptyList()); - } - public void addOverordnet(Link link) { - addLink("overordnet", link); - } - @JsonIgnore - public List getUnderordnet() { - return getLinks().getOrDefault("underordnet", Collections.emptyList()); - } - public void addUnderordnet(Link link) { - addLink("underordnet", link); - } +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class FunksjonResource extends Kontodimensjon implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getOverordnet() { + return getLinks().getOrDefault("overordnet", Collections.emptyList()); + } + + public void addOverordnet(Link link) { + addLink("overordnet", link); + } + + @JsonIgnore + public List getUnderordnet() { + return getLinks().getOrDefault("underordnet", Collections.emptyList()); + } + + public void addUnderordnet(Link link) { + addLink("underordnet", link); + } } 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 cde5220e..94f9a9dc 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FunksjonResources extends AbstractCollectionResources { - public FunksjonResources(Collection input) { - super(input); - } + public FunksjonResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 7140c9cd..9d4adbac 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 @@ -1,48 +1,36 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public abstract class KontodimensjonResource extends Begrep implements FintAbstractObject, FintLinks { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public abstract class KontodimensjonResource extends Begrep + implements FintAbstractObject, FintLinks { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @Deprecated - @JsonIgnore - public List getFullmakt() { - return getLinks().getOrDefault("fullmakt", Collections.emptyList()); - } - @Deprecated - public void addFullmakt(Link link) { - addLink("fullmakt", link); - } + // Relations + @Getter private final Map> links = createLinks(); } 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 f409e00d..72153cdb 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KontodimensjonResources extends AbstractCollectionResources { - public KontodimensjonResources(Collection input) { - super(input); - } + public KontodimensjonResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 1fe8dfbc..4719626f 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 @@ -1,37 +1,34 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.administrasjon.kodeverk.Kontodimensjon; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class KontraktResource extends KontodimensjonResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class KontraktResource extends Kontodimensjon implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 b901d570..51ce2827 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KontraktResources extends AbstractCollectionResources { - public KontraktResources(Collection input) { - super(input); - } + public KontraktResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 7407d0d3..be60b045 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 @@ -1,48 +1,46 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class LonnsartResource extends Begrep implements FintResource { - // Attributes - private String kategori; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + // Attributes + private String kategori; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getArt() { + return getLinks().getOrDefault("art", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getArt() { - return getLinks().getOrDefault("art", Collections.emptyList()); - } - public void addArt(Link link) { - addLink("art", link); - } + public void addArt(Link link) { + addLink("art", link); + } } 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 a6416713..a9f397c4 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class LonnsartResources extends AbstractCollectionResources { - public LonnsartResources(Collection input) { - super(input); - } + public LonnsartResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 6390a165..5916cfc2 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 @@ -1,37 +1,34 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.administrasjon.kodeverk.Kontodimensjon; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class LopenummerResource extends KontodimensjonResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class LopenummerResource extends Kontodimensjon implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 3ede8ac1..d4998d21 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class LopenummerResources extends AbstractCollectionResources { - public LopenummerResources(Collection input) { - super(input); - } + public LopenummerResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 9a708990..fe0a1300 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 @@ -1,37 +1,34 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.administrasjon.kodeverk.Kontodimensjon; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class ObjektResource extends KontodimensjonResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ObjektResource extends Kontodimensjon implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 ae82158f..ebb6ae55 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ObjektResources extends AbstractCollectionResources { - public ObjektResources(Collection input) { - super(input); - } + public ObjektResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/OrganisasjonstypeResource.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/OrganisasjonstypeResource.java index aaf2cb13..b1cb6710 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/OrganisasjonstypeResource.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/OrganisasjonstypeResource.java @@ -1,41 +1,34 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; 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.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class OrganisasjonstypeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } diff --git a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/OrganisasjonstypeResources.java b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/OrganisasjonstypeResources.java index 641ad494..f6b32e4f 100644 --- a/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/OrganisasjonstypeResources.java +++ b/fint-administrasjon-resource-model-java/src/main/java/no/novari/fint/model/resource/administrasjon/kodeverk/OrganisasjonstypeResources.java @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class OrganisasjonstypeResources extends AbstractCollectionResources { +public class OrganisasjonstypeResources + extends AbstractCollectionResources { - public OrganisasjonstypeResources(Collection input) { - super(input); - } + public OrganisasjonstypeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 fdf247e5..899c8e12 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class PersonalressurskategoriResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 3b3e9818..6149c0dd 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class PersonalressurskategoriResources extends AbstractCollectionResources { +public class PersonalressurskategoriResources + extends AbstractCollectionResources { - public PersonalressurskategoriResources(Collection input) { - super(input); - } + public PersonalressurskategoriResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 86d66a47..5f7fd782 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 @@ -1,45 +1,43 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.administrasjon.kodeverk.Kontodimensjon; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class ProsjektResource extends KontodimensjonResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ProsjektResource extends Kontodimensjon implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getProsjektart() { + return getLinks().getOrDefault("prosjektart", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getProsjektart() { - return getLinks().getOrDefault("prosjektart", Collections.emptyList()); - } - public void addProsjektart(Link link) { - addLink("prosjektart", link); - } + public void addProsjektart(Link link) { + addLink("prosjektart", link); + } } 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 45a3d51a..c975e6dd 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ProsjektResources extends AbstractCollectionResources { - public ProsjektResources(Collection input) { - super(input); - } + public ProsjektResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 523e0664..40c40111 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 @@ -1,59 +1,61 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.administrasjon.kodeverk.Kontodimensjon; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class ProsjektartResource extends KontodimensjonResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getUnderordnet() { - return getLinks().getOrDefault("underordnet", Collections.emptyList()); - } - public void addUnderordnet(Link link) { - addLink("underordnet", link); - } - @JsonIgnore - public List getProsjekt() { - return getLinks().getOrDefault("prosjekt", Collections.emptyList()); - } - public void addProsjekt(Link link) { - addLink("prosjekt", link); - } - @JsonIgnore - public List getOverordnet() { - return getLinks().getOrDefault("overordnet", Collections.emptyList()); - } - public void addOverordnet(Link link) { - addLink("overordnet", link); - } +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ProsjektartResource extends Kontodimensjon implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getUnderordnet() { + return getLinks().getOrDefault("underordnet", Collections.emptyList()); + } + + public void addUnderordnet(Link link) { + addLink("underordnet", link); + } + + @JsonIgnore + public List getProsjekt() { + return getLinks().getOrDefault("prosjekt", Collections.emptyList()); + } + + public void addProsjekt(Link link) { + addLink("prosjekt", link); + } + + @JsonIgnore + public List getOverordnet() { + return getLinks().getOrDefault("overordnet", Collections.emptyList()); + } + + public void addOverordnet(Link link) { + addLink("overordnet", link); + } } 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 652acf12..45f36867 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ProsjektartResources extends AbstractCollectionResources { - public ProsjektartResources(Collection input) { - super(input); - } + public ProsjektartResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 af82f5fd..3009a84f 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 @@ -1,37 +1,34 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.administrasjon.kodeverk.Kontodimensjon; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class RammeResource extends KontodimensjonResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class RammeResource extends Kontodimensjon implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 bf3c5cab..d6daaad4 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class RammeResources extends AbstractCollectionResources { - public RammeResources(Collection input) { - super(input); - } + public RammeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 8bd0c1cb..4cd77bb6 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 @@ -1,46 +1,43 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class StillingskodeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getForelder() { + return getLinks().getOrDefault("forelder", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getForelder() { - return getLinks().getOrDefault("forelder", Collections.emptyList()); - } - public void addForelder(Link link) { - addLink("forelder", link); - } + public void addForelder(Link link) { + addLink("forelder", link); + } } 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 6e594b99..c4aa87bb 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class StillingskodeResources extends AbstractCollectionResources { - public StillingskodeResources(Collection input) { - super(input); - } + public StillingskodeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 c6201268..a9a87021 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.administrasjon.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class UketimetallResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 a845f921..e0e79edf 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class UketimetallResources extends AbstractCollectionResources { - public UketimetallResources(Collection input) { - super(input); - } + public UketimetallResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 2eef6f97..926b67c7 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 @@ -1,21 +1,18 @@ package no.novari.fint.model.resource.administrasjon.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; - -import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor @@ -23,99 +20,123 @@ @ToString public class KontostrengResource implements FintComplexDatatypeObject, FintLinks { - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getAktivitet() { - return getLinks().getOrDefault("aktivitet", Collections.emptyList()); - } - public void addAktivitet(Link link) { - addLink("aktivitet", link); - } - @JsonIgnore - public List getAnlegg() { - return getLinks().getOrDefault("anlegg", Collections.emptyList()); - } - public void addAnlegg(Link link) { - addLink("anlegg", link); - } - @JsonIgnore - public List getAnsvar() { - return getLinks().getOrDefault("ansvar", Collections.emptyList()); - } - public void addAnsvar(Link link) { - addLink("ansvar", link); - } - @JsonIgnore - public List getArt() { - return getLinks().getOrDefault("art", Collections.emptyList()); - } - public void addArt(Link link) { - addLink("art", link); - } - @JsonIgnore - public List getDiverse() { - return getLinks().getOrDefault("diverse", Collections.emptyList()); - } - public void addDiverse(Link link) { - addLink("diverse", link); - } - @JsonIgnore - public List getFormal() { - return getLinks().getOrDefault("formal", Collections.emptyList()); - } - public void addFormal(Link link) { - addLink("formal", link); - } - @JsonIgnore - public List getFunksjon() { - return getLinks().getOrDefault("funksjon", Collections.emptyList()); - } - public void addFunksjon(Link link) { - addLink("funksjon", link); - } - @JsonIgnore - public List getKontrakt() { - return getLinks().getOrDefault("kontrakt", Collections.emptyList()); - } - public void addKontrakt(Link link) { - addLink("kontrakt", link); - } - @JsonIgnore - public List getLopenummer() { - return getLinks().getOrDefault("lopenummer", Collections.emptyList()); - } - public void addLopenummer(Link link) { - addLink("lopenummer", link); - } - @JsonIgnore - public List getObjekt() { - return getLinks().getOrDefault("objekt", Collections.emptyList()); - } - public void addObjekt(Link link) { - addLink("objekt", link); - } - @JsonIgnore - public List getProsjekt() { - return getLinks().getOrDefault("prosjekt", Collections.emptyList()); - } - public void addProsjekt(Link link) { - addLink("prosjekt", link); - } - @JsonIgnore - public List getProsjektart() { - return getLinks().getOrDefault("prosjektart", Collections.emptyList()); - } - public void addProsjektart(Link link) { - addLink("prosjektart", link); - } - @JsonIgnore - public List getRamme() { - return getLinks().getOrDefault("ramme", Collections.emptyList()); - } - public void addRamme(Link link) { - addLink("ramme", link); - } + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getAktivitet() { + return getLinks().getOrDefault("aktivitet", Collections.emptyList()); + } + + public void addAktivitet(Link link) { + addLink("aktivitet", link); + } + + @JsonIgnore + public List getAnlegg() { + return getLinks().getOrDefault("anlegg", Collections.emptyList()); + } + + public void addAnlegg(Link link) { + addLink("anlegg", link); + } + + @JsonIgnore + public List getAnsvar() { + return getLinks().getOrDefault("ansvar", Collections.emptyList()); + } + + public void addAnsvar(Link link) { + addLink("ansvar", link); + } + + @JsonIgnore + public List getArt() { + return getLinks().getOrDefault("art", Collections.emptyList()); + } + + public void addArt(Link link) { + addLink("art", link); + } + + @JsonIgnore + public List getDiverse() { + return getLinks().getOrDefault("diverse", Collections.emptyList()); + } + + public void addDiverse(Link link) { + addLink("diverse", link); + } + + @JsonIgnore + public List getFormal() { + return getLinks().getOrDefault("formal", Collections.emptyList()); + } + + public void addFormal(Link link) { + addLink("formal", link); + } + + @JsonIgnore + public List getFunksjon() { + return getLinks().getOrDefault("funksjon", Collections.emptyList()); + } + + public void addFunksjon(Link link) { + addLink("funksjon", link); + } + + @JsonIgnore + public List getKontrakt() { + return getLinks().getOrDefault("kontrakt", Collections.emptyList()); + } + + public void addKontrakt(Link link) { + addLink("kontrakt", link); + } + + @JsonIgnore + public List getLopenummer() { + return getLinks().getOrDefault("lopenummer", Collections.emptyList()); + } + + public void addLopenummer(Link link) { + addLink("lopenummer", link); + } + + @JsonIgnore + public List getObjekt() { + return getLinks().getOrDefault("objekt", Collections.emptyList()); + } + + public void addObjekt(Link link) { + addLink("objekt", link); + } + + @JsonIgnore + public List getProsjekt() { + return getLinks().getOrDefault("prosjekt", Collections.emptyList()); + } + + public void addProsjekt(Link link) { + addLink("prosjekt", link); + } + + @JsonIgnore + public List getProsjektart() { + return getLinks().getOrDefault("prosjektart", Collections.emptyList()); + } + + public void addProsjektart(Link link) { + addLink("prosjektart", link); + } + + @JsonIgnore + public List getRamme() { + return getLinks().getOrDefault("ramme", Collections.emptyList()); + } + + public void addRamme(Link link) { + addLink("ramme", link); + } } 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 d945ef00..7ef4abf1 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KontostrengResources extends AbstractCollectionResources { - public KontostrengResources(Collection input) { - super(input); - } + public KontostrengResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 27fc905f..50415b3f 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 @@ -1,54 +1,50 @@ package no.novari.fint.model.resource.administrasjon.organisasjon; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class ArbeidslokasjonResource extends EnhetResource implements FintResource { - // Attributes - @NotNull - private @Valid Identifikator lokasjonskode; - private String lokasjonsnavn; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - identifikators.put("lokasjonskode", this.lokasjonskode); + // Attributes + @NotNull private @Valid Identifikator lokasjonskode; + private String lokasjonsnavn; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + identifikators.put("lokasjonskode", this.lokasjonskode); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getArbeidsforhold() { + return getLinks().getOrDefault("arbeidsforhold", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getArbeidsforhold() { - return getLinks().getOrDefault("arbeidsforhold", Collections.emptyList()); - } - public void addArbeidsforhold(Link link) { - addLink("arbeidsforhold", link); - } + public void addArbeidsforhold(Link link) { + addLink("arbeidsforhold", link); + } } 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 e346ed5b..a9bf2d3e 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ArbeidslokasjonResources extends AbstractCollectionResources { - public ArbeidslokasjonResources(Collection input) { - super(input); - } + public ArbeidslokasjonResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 4cff4cca..02c35368 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 @@ -1,102 +1,109 @@ package no.novari.fint.model.resource.administrasjon.organisasjon; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; 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; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class OrganisasjonselementResource extends EnhetResource implements FintResource { - // Attributes - private @Valid Periode gyldighetsperiode; - private String kortnavn; - private String navn; - @NotNull - private @Valid Identifikator organisasjonsId; - @NotNull - private @Valid Identifikator organisasjonsKode; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - identifikators.put("organisasjonsId", this.organisasjonsId); - identifikators.put("organisasjonsKode", this.organisasjonsKode); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getAnsvar() { - return getLinks().getOrDefault("ansvar", Collections.emptyList()); - } - public void addAnsvar(Link link) { - addLink("ansvar", link); - } - @JsonIgnore - public List getOrganisasjonstype() { - return getLinks().getOrDefault("organisasjonstype", Collections.emptyList()); - } - public void addOrganisasjonstype(Link link) { - addLink("organisasjonstype", link); - } - @JsonIgnore - public List getLeder() { - return getLinks().getOrDefault("leder", Collections.emptyList()); - } - public void addLeder(Link link) { - addLink("leder", link); - } - @JsonIgnore - public List getOverordnet() { - return getLinks().getOrDefault("overordnet", Collections.emptyList()); - } - public void addOverordnet(Link link) { - addLink("overordnet", link); - } - @JsonIgnore - public List getUnderordnet() { - return getLinks().getOrDefault("underordnet", Collections.emptyList()); - } - public void addUnderordnet(Link link) { - addLink("underordnet", link); - } - @JsonIgnore - public List getSkole() { - return getLinks().getOrDefault("skole", Collections.emptyList()); - } - public void addSkole(Link link) { - addLink("skole", link); - } - @JsonIgnore - public List getArbeidsforhold() { - return getLinks().getOrDefault("arbeidsforhold", Collections.emptyList()); - } - public void addArbeidsforhold(Link link) { - addLink("arbeidsforhold", link); - } + // Attributes + private @Valid Periode gyldighetsperiode; + private String kortnavn; + private String navn; + @NotNull private @Valid Identifikator organisasjonsId; + @NotNull private @Valid Identifikator organisasjonsKode; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + identifikators.put("organisasjonsId", this.organisasjonsId); + identifikators.put("organisasjonsKode", this.organisasjonsKode); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getAnsvar() { + return getLinks().getOrDefault("ansvar", Collections.emptyList()); + } + + public void addAnsvar(Link link) { + addLink("ansvar", link); + } + + @JsonIgnore + public List getOrganisasjonstype() { + return getLinks().getOrDefault("organisasjonstype", Collections.emptyList()); + } + + public void addOrganisasjonstype(Link link) { + addLink("organisasjonstype", link); + } + + @JsonIgnore + public List getLeder() { + return getLinks().getOrDefault("leder", Collections.emptyList()); + } + + public void addLeder(Link link) { + addLink("leder", link); + } + + @JsonIgnore + public List getOverordnet() { + return getLinks().getOrDefault("overordnet", Collections.emptyList()); + } + + public void addOverordnet(Link link) { + addLink("overordnet", link); + } + + @JsonIgnore + public List getUnderordnet() { + return getLinks().getOrDefault("underordnet", Collections.emptyList()); + } + + public void addUnderordnet(Link link) { + addLink("underordnet", link); + } + + @JsonIgnore + public List getSkole() { + return getLinks().getOrDefault("skole", Collections.emptyList()); + } + + public void addSkole(Link link) { + addLink("skole", link); + } + + @JsonIgnore + public List getArbeidsforhold() { + return getLinks().getOrDefault("arbeidsforhold", Collections.emptyList()); + } + + public void addArbeidsforhold(Link link) { + addLink("arbeidsforhold", link); + } } 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 ae73f6c7..d4e9899f 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class OrganisasjonselementResources extends AbstractCollectionResources { +public class OrganisasjonselementResources + extends AbstractCollectionResources { - public OrganisasjonselementResources(Collection input) { - super(input); - } + public OrganisasjonselementResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 6daaa135..1e63040c 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 @@ -1,238 +1,264 @@ package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; 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 @NoArgsConstructor @EqualsAndHashCode @ToString public class ArbeidsforholdResource implements FintResource { - // Attributes - @NotNull - private Long ansettelsesprosent; - private @Valid Periode arbeidsforholdsperiode; - @NotNull - private Long arslonn; - @NotNull - private @Valid Periode gyldighetsperiode; - @NotNull - private Boolean hovedstilling; - @NotNull - private Long lonnsprosent; - @NotBlank - private String stillingsnummer; - private String stillingstittel; - @NotNull - private @Valid Identifikator systemId; - @NotNull - private Long tilstedeprosent; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getAktivitet() { - return getLinks().getOrDefault("aktivitet", Collections.emptyList()); - } - public void addAktivitet(Link link) { - addLink("aktivitet", link); - } - @JsonIgnore - public List getAnlegg() { - return getLinks().getOrDefault("anlegg", Collections.emptyList()); - } - public void addAnlegg(Link link) { - addLink("anlegg", link); - } - @JsonIgnore - public List getAnsvar() { - return getLinks().getOrDefault("ansvar", Collections.emptyList()); - } - public void addAnsvar(Link link) { - addLink("ansvar", link); - } - @JsonIgnore - public List getArbeidsforholdstype() { - return getLinks().getOrDefault("arbeidsforholdstype", Collections.emptyList()); - } - public void addArbeidsforholdstype(Link link) { - addLink("arbeidsforholdstype", link); - } - @JsonIgnore - public List getArt() { - return getLinks().getOrDefault("art", Collections.emptyList()); - } - public void addArt(Link link) { - addLink("art", link); - } - @JsonIgnore - public List getDiverse() { - return getLinks().getOrDefault("diverse", Collections.emptyList()); - } - public void addDiverse(Link link) { - addLink("diverse", link); - } - @JsonIgnore - public List getFormal() { - return getLinks().getOrDefault("formal", Collections.emptyList()); - } - public void addFormal(Link link) { - addLink("formal", link); - } - @JsonIgnore - public List getFunksjon() { - return getLinks().getOrDefault("funksjon", Collections.emptyList()); - } - public void addFunksjon(Link link) { - addLink("funksjon", link); - } - @JsonIgnore - public List getKontrakt() { - return getLinks().getOrDefault("kontrakt", Collections.emptyList()); - } - public void addKontrakt(Link link) { - addLink("kontrakt", link); - } - @JsonIgnore - public List getLopenummer() { - return getLinks().getOrDefault("lopenummer", Collections.emptyList()); - } - public void addLopenummer(Link link) { - addLink("lopenummer", link); - } - @JsonIgnore - public List getObjekt() { - return getLinks().getOrDefault("objekt", Collections.emptyList()); - } - public void addObjekt(Link link) { - addLink("objekt", link); - } - @JsonIgnore - public List getProsjekt() { - return getLinks().getOrDefault("prosjekt", Collections.emptyList()); - } - public void addProsjekt(Link link) { - addLink("prosjekt", link); - } - @JsonIgnore - public List getRamme() { - return getLinks().getOrDefault("ramme", Collections.emptyList()); - } - public void addRamme(Link link) { - addLink("ramme", link); - } - @JsonIgnore - public List getStillingskode() { - return getLinks().getOrDefault("stillingskode", Collections.emptyList()); - } - public void addStillingskode(Link link) { - addLink("stillingskode", link); - } - @JsonIgnore - public List getTimerPerUke() { - return getLinks().getOrDefault("timerPerUke", Collections.emptyList()); - } - public void addTimerPerUke(Link link) { - addLink("timerPerUke", link); - } - @JsonIgnore - public List getArbeidslokasjon() { - return getLinks().getOrDefault("arbeidslokasjon", Collections.emptyList()); - } - public void addArbeidslokasjon(Link link) { - addLink("arbeidslokasjon", link); - } - @JsonIgnore - public List getArbeidssted() { - return getLinks().getOrDefault("arbeidssted", Collections.emptyList()); - } - public void addArbeidssted(Link link) { - addLink("arbeidssted", link); - } - @JsonIgnore - public List getPersonalleder() { - return getLinks().getOrDefault("personalleder", Collections.emptyList()); - } - public void addPersonalleder(Link link) { - addLink("personalleder", link); - } - @JsonIgnore - public List getFastlonn() { - return getLinks().getOrDefault("fastlonn", Collections.emptyList()); - } - public void addFastlonn(Link link) { - addLink("fastlonn", link); - } - @JsonIgnore - public List getFasttillegg() { - return getLinks().getOrDefault("fasttillegg", Collections.emptyList()); - } - public void addFasttillegg(Link link) { - addLink("fasttillegg", link); - } - @JsonIgnore - public List getFravar() { - return getLinks().getOrDefault("fravar", Collections.emptyList()); - } - public void addFravar(Link link) { - addLink("fravar", link); - } - @Deprecated - @JsonIgnore - public List getLonn() { - return getLinks().getOrDefault("lonn", Collections.emptyList()); - } - @Deprecated - public void addLonn(Link link) { - addLink("lonn", link); - } - @JsonIgnore - public List getVariabellonn() { - return getLinks().getOrDefault("variabellonn", Collections.emptyList()); - } - public void addVariabellonn(Link link) { - addLink("variabellonn", link); - } - @JsonIgnore - public List getPersonalressurs() { - return getLinks().getOrDefault("personalressurs", Collections.emptyList()); - } - public void addPersonalressurs(Link link) { - addLink("personalressurs", link); - } - @JsonIgnore - public List getUndervisningsforhold() { - return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); - } - public void addUndervisningsforhold(Link link) { - addLink("undervisningsforhold", link); - } + // Attributes + @NotNull private Long ansettelsesprosent; + private @Valid Periode arbeidsforholdsperiode; + @NotNull private Long arslonn; + @NotNull private @Valid Periode gyldighetsperiode; + @NotNull private Boolean hovedstilling; + @NotNull private Long lonnsprosent; + @NotBlank private String stillingsnummer; + private String stillingstittel; + @NotNull private @Valid Identifikator systemId; + @NotNull private Long tilstedeprosent; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getAktivitet() { + return getLinks().getOrDefault("aktivitet", Collections.emptyList()); + } + + public void addAktivitet(Link link) { + addLink("aktivitet", link); + } + + @JsonIgnore + public List getAnlegg() { + return getLinks().getOrDefault("anlegg", Collections.emptyList()); + } + + public void addAnlegg(Link link) { + addLink("anlegg", link); + } + + @JsonIgnore + public List getAnsvar() { + return getLinks().getOrDefault("ansvar", Collections.emptyList()); + } + + public void addAnsvar(Link link) { + addLink("ansvar", link); + } + + @JsonIgnore + public List getArbeidsforholdstype() { + return getLinks().getOrDefault("arbeidsforholdstype", Collections.emptyList()); + } + + public void addArbeidsforholdstype(Link link) { + addLink("arbeidsforholdstype", link); + } + + @JsonIgnore + public List getArt() { + return getLinks().getOrDefault("art", Collections.emptyList()); + } + + public void addArt(Link link) { + addLink("art", link); + } + + @JsonIgnore + public List getDiverse() { + return getLinks().getOrDefault("diverse", Collections.emptyList()); + } + + public void addDiverse(Link link) { + addLink("diverse", link); + } + + @JsonIgnore + public List getFormal() { + return getLinks().getOrDefault("formal", Collections.emptyList()); + } + + public void addFormal(Link link) { + addLink("formal", link); + } + + @JsonIgnore + public List getFunksjon() { + return getLinks().getOrDefault("funksjon", Collections.emptyList()); + } + + public void addFunksjon(Link link) { + addLink("funksjon", link); + } + + @JsonIgnore + public List getKontrakt() { + return getLinks().getOrDefault("kontrakt", Collections.emptyList()); + } + + public void addKontrakt(Link link) { + addLink("kontrakt", link); + } + + @JsonIgnore + public List getLopenummer() { + return getLinks().getOrDefault("lopenummer", Collections.emptyList()); + } + + public void addLopenummer(Link link) { + addLink("lopenummer", link); + } + + @JsonIgnore + public List getObjekt() { + return getLinks().getOrDefault("objekt", Collections.emptyList()); + } + + public void addObjekt(Link link) { + addLink("objekt", link); + } + + @JsonIgnore + public List getProsjekt() { + return getLinks().getOrDefault("prosjekt", Collections.emptyList()); + } + + public void addProsjekt(Link link) { + addLink("prosjekt", link); + } + + @JsonIgnore + public List getRamme() { + return getLinks().getOrDefault("ramme", Collections.emptyList()); + } + + public void addRamme(Link link) { + addLink("ramme", link); + } + + @JsonIgnore + public List getStillingskode() { + return getLinks().getOrDefault("stillingskode", Collections.emptyList()); + } + + public void addStillingskode(Link link) { + addLink("stillingskode", link); + } + + @JsonIgnore + public List getTimerPerUke() { + return getLinks().getOrDefault("timerPerUke", Collections.emptyList()); + } + + public void addTimerPerUke(Link link) { + addLink("timerPerUke", link); + } + + @JsonIgnore + public List getArbeidslokasjon() { + return getLinks().getOrDefault("arbeidslokasjon", Collections.emptyList()); + } + + public void addArbeidslokasjon(Link link) { + addLink("arbeidslokasjon", link); + } + + @JsonIgnore + public List getArbeidssted() { + return getLinks().getOrDefault("arbeidssted", Collections.emptyList()); + } + + public void addArbeidssted(Link link) { + addLink("arbeidssted", link); + } + + @JsonIgnore + public List getPersonalleder() { + return getLinks().getOrDefault("personalleder", Collections.emptyList()); + } + + public void addPersonalleder(Link link) { + addLink("personalleder", link); + } + + @JsonIgnore + public List getFastlonn() { + return getLinks().getOrDefault("fastlonn", Collections.emptyList()); + } + + public void addFastlonn(Link link) { + addLink("fastlonn", link); + } + + @JsonIgnore + public List getFasttillegg() { + return getLinks().getOrDefault("fasttillegg", Collections.emptyList()); + } + + public void addFasttillegg(Link link) { + addLink("fasttillegg", link); + } + + @JsonIgnore + public List getFravar() { + return getLinks().getOrDefault("fravar", Collections.emptyList()); + } + + public void addFravar(Link link) { + addLink("fravar", link); + } + + @JsonIgnore + public List getVariabellonn() { + return getLinks().getOrDefault("variabellonn", Collections.emptyList()); + } + + public void addVariabellonn(Link link) { + addLink("variabellonn", link); + } + + @JsonIgnore + public List getPersonalressurs() { + return getLinks().getOrDefault("personalressurs", Collections.emptyList()); + } + + public void addPersonalressurs(Link link) { + addLink("personalressurs", link); + } + + @JsonIgnore + public List getUndervisningsforhold() { + return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); + } + + public void addUndervisningsforhold(Link link) { + addLink("undervisningsforhold", link); + } } 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 6bb9ef4c..358f97c7 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ArbeidsforholdResources extends AbstractCollectionResources { - public ArbeidsforholdResources(Collection input) { - super(input); - } + public ArbeidsforholdResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 2e0f3d4b..7046e9a9 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 @@ -1,56 +1,54 @@ package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; 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.constraints.*; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class FastlonnResource extends LonnResource implements FintResource { - // Attributes - @NotNull - private Long prosent; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getLonnsart() { - return getLinks().getOrDefault("lonnsart", Collections.emptyList()); - } - public void addLonnsart(Link link) { - addLink("lonnsart", link); - } - @JsonIgnore - public List getArbeidsforhold() { - return getLinks().getOrDefault("arbeidsforhold", Collections.emptyList()); - } - public void addArbeidsforhold(Link link) { - addLink("arbeidsforhold", link); - } + // Attributes + @NotNull private Long prosent; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getLonnsart() { + return getLinks().getOrDefault("lonnsart", Collections.emptyList()); + } + + public void addLonnsart(Link link) { + addLink("lonnsart", link); + } + + @JsonIgnore + public List getArbeidsforhold() { + return getLinks().getOrDefault("arbeidsforhold", Collections.emptyList()); + } + + public void addArbeidsforhold(Link link) { + addLink("arbeidsforhold", link); + } } 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 d2eed4a5..e48892b8 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FastlonnResources extends AbstractCollectionResources { - public FastlonnResources(Collection input) { - super(input); - } + public FastlonnResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 1df558e4..80a346d6 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 @@ -1,56 +1,54 @@ package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; 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.constraints.*; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class FasttilleggResource extends LonnResource implements FintResource { - // Attributes - @NotNull - private Long belop; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getLonnsart() { - return getLinks().getOrDefault("lonnsart", Collections.emptyList()); - } - public void addLonnsart(Link link) { - addLink("lonnsart", link); - } - @JsonIgnore - public List getArbeidsforhold() { - return getLinks().getOrDefault("arbeidsforhold", Collections.emptyList()); - } - public void addArbeidsforhold(Link link) { - addLink("arbeidsforhold", link); - } + // Attributes + @NotNull private Long belop; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getLonnsart() { + return getLinks().getOrDefault("lonnsart", Collections.emptyList()); + } + + public void addLonnsart(Link link) { + addLink("lonnsart", link); + } + + @JsonIgnore + public List getArbeidsforhold() { + return getLinks().getOrDefault("arbeidsforhold", Collections.emptyList()); + } + + public void addArbeidsforhold(Link link) { + addLink("arbeidsforhold", link); + } } 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 0eb460fc..d090b6e2 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FasttilleggResources extends AbstractCollectionResources { - public FasttilleggResources(Collection input) { - super(input); - } + public FasttilleggResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 ad0d8b82..c040c1e7 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 @@ -1,95 +1,99 @@ package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; 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; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class FravarResource implements FintResource { - // Attributes - private @Valid Date godkjent; - private @Valid Identifikator kildesystemId; - @NotNull - private @Valid Periode periode; - @NotNull - private Long prosent; - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("kildesystemId", this.kildesystemId); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getFravarsgrunn() { - return getLinks().getOrDefault("fravarsgrunn", Collections.emptyList()); - } - public void addFravarsgrunn(Link link) { - addLink("fravarsgrunn", link); - } - @JsonIgnore - public List getFravarstype() { - return getLinks().getOrDefault("fravarstype", Collections.emptyList()); - } - public void addFravarstype(Link link) { - addLink("fravarstype", link); - } - @JsonIgnore - public List getArbeidsforhold() { - return getLinks().getOrDefault("arbeidsforhold", Collections.emptyList()); - } - public void addArbeidsforhold(Link link) { - addLink("arbeidsforhold", link); - } - @JsonIgnore - public List getFortsettelse() { - return getLinks().getOrDefault("fortsettelse", Collections.emptyList()); - } - public void addFortsettelse(Link link) { - addLink("fortsettelse", link); - } - @JsonIgnore - public List getGodkjenner() { - return getLinks().getOrDefault("godkjenner", Collections.emptyList()); - } - public void addGodkjenner(Link link) { - addLink("godkjenner", link); - } - @JsonIgnore - public List getFortsetter() { - return getLinks().getOrDefault("fortsetter", Collections.emptyList()); - } - public void addFortsetter(Link link) { - addLink("fortsetter", link); - } + // Attributes + private @Valid Date godkjent; + private @Valid Identifikator kildesystemId; + @NotNull private @Valid Periode periode; + @NotNull private Long prosent; + private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("kildesystemId", this.kildesystemId); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getFravarsgrunn() { + return getLinks().getOrDefault("fravarsgrunn", Collections.emptyList()); + } + + public void addFravarsgrunn(Link link) { + addLink("fravarsgrunn", link); + } + + @JsonIgnore + public List getFravarstype() { + return getLinks().getOrDefault("fravarstype", Collections.emptyList()); + } + + public void addFravarstype(Link link) { + addLink("fravarstype", link); + } + + @JsonIgnore + public List getArbeidsforhold() { + return getLinks().getOrDefault("arbeidsforhold", Collections.emptyList()); + } + + public void addArbeidsforhold(Link link) { + addLink("arbeidsforhold", link); + } + + @JsonIgnore + public List getFortsettelse() { + return getLinks().getOrDefault("fortsettelse", Collections.emptyList()); + } + + public void addFortsettelse(Link link) { + addLink("fortsettelse", link); + } + + @JsonIgnore + public List getGodkjenner() { + return getLinks().getOrDefault("godkjenner", Collections.emptyList()); + } + + public void addGodkjenner(Link link) { + addLink("godkjenner", link); + } + + @JsonIgnore + public List getFortsetter() { + return getLinks().getOrDefault("fortsetter", Collections.emptyList()); + } + + public void addFortsetter(Link link) { + addLink("fortsetter", link); + } } 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 35e607cd..b6640d49 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FravarResources extends AbstractCollectionResources { - public FravarResources(Collection input) { - super(input); - } + public FravarResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 83608a51..a3145c99 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 @@ -1,89 +1,88 @@ package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; 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; -import no.novari.fint.model.felles.kompleksedatatyper.Periode; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public abstract class LonnResource implements FintAbstractObject, FintLinks { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = FintLinks.super.getNestedResources(); - if (kontostreng != null) { - result.add(kontostreng); - } - return result; + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = FintLinks.super.getNestedResources(); + if (kontostreng != null) { + result.add(kontostreng); } - private @Valid Date anvist; - private @Valid Date attestert; - @NotBlank - private String beskrivelse; - private @Valid Identifikator kildesystemId; - private @Valid Date kontert; - @NotNull - private @Valid KontostrengResource kontostreng; - private @Valid Periode opptjent; - @NotNull - private @Valid Periode periode; - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("kildesystemId", this.kildesystemId); - identifikators.put("systemId", this.systemId); + return result; + } - return Collections.unmodifiableMap(identifikators); - } + private @Valid Date anvist; + private @Valid Date attestert; + @NotBlank private String beskrivelse; + private @Valid Identifikator kildesystemId; + private @Valid Date kontert; + @NotNull private @Valid KontostrengResource kontostreng; + private @Valid Periode opptjent; + @NotNull private @Valid Periode periode; + private @Valid Identifikator systemId; - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getAnviser() { - return getLinks().getOrDefault("anviser", Collections.emptyList()); - } - public void addAnviser(Link link) { - addLink("anviser", link); - } - @JsonIgnore - public List getKonterer() { - return getLinks().getOrDefault("konterer", Collections.emptyList()); - } - public void addKonterer(Link link) { - addLink("konterer", link); - } - @JsonIgnore - public List getAttestant() { - return getLinks().getOrDefault("attestant", Collections.emptyList()); - } - public void addAttestant(Link link) { - addLink("attestant", link); - } + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("kildesystemId", this.kildesystemId); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getAnviser() { + return getLinks().getOrDefault("anviser", Collections.emptyList()); + } + + public void addAnviser(Link link) { + addLink("anviser", link); + } + + @JsonIgnore + public List getKonterer() { + return getLinks().getOrDefault("konterer", Collections.emptyList()); + } + + public void addKonterer(Link link) { + addLink("konterer", link); + } + + @JsonIgnore + public List getAttestant() { + return getLinks().getOrDefault("attestant", Collections.emptyList()); + } + + public void addAttestant(Link link) { + addLink("attestant", link); + } } 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 f52512d4..0db74ccb 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class LonnResources extends AbstractCollectionResources { - public LonnResources(Collection input) { - super(input); - } + public LonnResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 2d44765c..6c00fb59 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 @@ -1,112 +1,121 @@ package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; 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; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class PersonalressursResource implements FintResource { - // Attributes - @NotNull - private @Valid Identifikator ansattnummer; - @NotNull - private @Valid Periode ansettelsesperiode; - private Date ansiennitet; - private @Valid Identifikator brukernavn; - private String jobbtittel; - private @Valid Kontaktinformasjon kontaktinformasjon; - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("ansattnummer", this.ansattnummer); - identifikators.put("brukernavn", this.brukernavn); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getPersonalressurskategori() { - return getLinks().getOrDefault("personalressurskategori", Collections.emptyList()); - } - public void addPersonalressurskategori(Link link) { - addLink("personalressurskategori", link); - } - @JsonIgnore - public List getArbeidsforhold() { - return getLinks().getOrDefault("arbeidsforhold", Collections.emptyList()); - } - public void addArbeidsforhold(Link link) { - addLink("arbeidsforhold", link); - } - @JsonIgnore - public List getPerson() { - return getLinks().getOrDefault("person", Collections.emptyList()); - } - public void addPerson(Link link) { - addLink("person", link); - } - @JsonIgnore - public List getStedfortreder() { - return getLinks().getOrDefault("stedfortreder", Collections.emptyList()); - } - public void addStedfortreder(Link link) { - addLink("stedfortreder", link); - } - @JsonIgnore - public List getFullmakt() { - return getLinks().getOrDefault("fullmakt", Collections.emptyList()); - } - public void addFullmakt(Link link) { - addLink("fullmakt", link); - } - @JsonIgnore - public List getLeder() { - return getLinks().getOrDefault("leder", Collections.emptyList()); - } - public void addLeder(Link link) { - addLink("leder", link); - } - @JsonIgnore - public List getPersonalansvar() { - return getLinks().getOrDefault("personalansvar", Collections.emptyList()); - } - public void addPersonalansvar(Link link) { - addLink("personalansvar", link); - } - @JsonIgnore - public List getSkoleressurs() { - return getLinks().getOrDefault("skoleressurs", Collections.emptyList()); - } - public void addSkoleressurs(Link link) { - addLink("skoleressurs", link); - } + // Attributes + @NotNull private @Valid Identifikator ansattnummer; + @NotNull private @Valid Periode ansettelsesperiode; + private Date ansiennitet; + private @Valid Identifikator brukernavn; + private String jobbtittel; + private @Valid Kontaktinformasjon kontaktinformasjon; + private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("ansattnummer", this.ansattnummer); + identifikators.put("brukernavn", this.brukernavn); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getPersonalressurskategori() { + return getLinks().getOrDefault("personalressurskategori", Collections.emptyList()); + } + + public void addPersonalressurskategori(Link link) { + addLink("personalressurskategori", link); + } + + @JsonIgnore + public List getArbeidsforhold() { + return getLinks().getOrDefault("arbeidsforhold", Collections.emptyList()); + } + + public void addArbeidsforhold(Link link) { + addLink("arbeidsforhold", link); + } + + @JsonIgnore + public List getPerson() { + return getLinks().getOrDefault("person", Collections.emptyList()); + } + + public void addPerson(Link link) { + addLink("person", link); + } + + @JsonIgnore + public List getStedfortreder() { + return getLinks().getOrDefault("stedfortreder", Collections.emptyList()); + } + + public void addStedfortreder(Link link) { + addLink("stedfortreder", link); + } + + @JsonIgnore + public List getFullmakt() { + return getLinks().getOrDefault("fullmakt", Collections.emptyList()); + } + + public void addFullmakt(Link link) { + addLink("fullmakt", link); + } + + @JsonIgnore + public List getLeder() { + return getLinks().getOrDefault("leder", Collections.emptyList()); + } + + public void addLeder(Link link) { + addLink("leder", link); + } + + @JsonIgnore + public List getPersonalansvar() { + return getLinks().getOrDefault("personalansvar", Collections.emptyList()); + } + + public void addPersonalansvar(Link link) { + addLink("personalansvar", link); + } + + @JsonIgnore + public List getSkoleressurs() { + return getLinks().getOrDefault("skoleressurs", Collections.emptyList()); + } + + public void addSkoleressurs(Link link) { + addLink("skoleressurs", link); + } } 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 bd757b7e..8396d6f7 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PersonalressursResources extends AbstractCollectionResources { - public PersonalressursResources(Collection input) { - super(input); - } + public PersonalressursResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 44ff0833..e89cd01f 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 @@ -1,57 +1,55 @@ package no.novari.fint.model.resource.administrasjon.personal; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; 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.constraints.*; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class VariabellonnResource extends LonnResource implements FintResource { - // Attributes - @NotNull - private Long antall; - private Long belop; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getLonnsart() { - return getLinks().getOrDefault("lonnsart", Collections.emptyList()); - } - public void addLonnsart(Link link) { - addLink("lonnsart", link); - } - @JsonIgnore - public List getArbeidsforhold() { - return getLinks().getOrDefault("arbeidsforhold", Collections.emptyList()); - } - public void addArbeidsforhold(Link link) { - addLink("arbeidsforhold", link); - } + // Attributes + @NotNull private Long antall; + private Long belop; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getLonnsart() { + return getLinks().getOrDefault("lonnsart", Collections.emptyList()); + } + + public void addLonnsart(Link link) { + addLink("lonnsart", link); + } + + @JsonIgnore + public List getArbeidsforhold() { + return getLinks().getOrDefault("arbeidsforhold", Collections.emptyList()); + } + + public void addArbeidsforhold(Link link) { + addLink("arbeidsforhold", link); + } } 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 3ddec865..94313e88 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class VariabellonnResources extends AbstractCollectionResources { - public VariabellonnResources(Collection input) { - super(input); - } + public VariabellonnResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 a9541c5a..eef865fe 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class DokumentStatus extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class DokumentStatus extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 880a48c9..3d878523 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class DokumentType extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class DokumentType extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 b765f8ab..352f41ab 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Format extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Format extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 d8199545..7f2f99be 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class JournalStatus extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class JournalStatus extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 74f808a1..c0cc21d5 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class JournalpostType extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class JournalpostType extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 3839f3dd..d0ea15d5 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Klassifikasjonstype extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Klassifikasjonstype extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/KodeverkActions.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/KodeverkActions.java index 14ff0dd2..05c87096 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/KodeverkActions.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kodeverk/KodeverkActions.java @@ -4,71 +4,67 @@ import java.util.List; public enum KodeverkActions { - - GET_DOKUMENTSTATUS, - GET_ALL_DOKUMENTSTATUS, - UPDATE_DOKUMENTSTATUS, - GET_DOKUMENTTYPE, - GET_ALL_DOKUMENTTYPE, - UPDATE_DOKUMENTTYPE, - GET_FORMAT, - GET_ALL_FORMAT, - UPDATE_FORMAT, - GET_JOURNALPOSTTYPE, - GET_ALL_JOURNALPOSTTYPE, - UPDATE_JOURNALPOSTTYPE, - GET_JOURNALSTATUS, - GET_ALL_JOURNALSTATUS, - UPDATE_JOURNALSTATUS, - GET_KLASSIFIKASJONSTYPE, - GET_ALL_KLASSIFIKASJONSTYPE, - UPDATE_KLASSIFIKASJONSTYPE, - GET_KORRESPONDANSEPARTTYPE, - GET_ALL_KORRESPONDANSEPARTTYPE, - UPDATE_KORRESPONDANSEPARTTYPE, - GET_MERKNADSTYPE, - GET_ALL_MERKNADSTYPE, - UPDATE_MERKNADSTYPE, - GET_PARTROLLE, - GET_ALL_PARTROLLE, - UPDATE_PARTROLLE, - GET_ROLLE, - GET_ALL_ROLLE, - UPDATE_ROLLE, - GET_SAKSMAPPETYPE, - GET_ALL_SAKSMAPPETYPE, - UPDATE_SAKSMAPPETYPE, - GET_SAKSSTATUS, - GET_ALL_SAKSSTATUS, - UPDATE_SAKSSTATUS, - GET_SKJERMINGSHJEMMEL, - GET_ALL_SKJERMINGSHJEMMEL, - UPDATE_SKJERMINGSHJEMMEL, - GET_TILGANGSGRUPPE, - GET_ALL_TILGANGSGRUPPE, - UPDATE_TILGANGSGRUPPE, - GET_TILGANGSRESTRIKSJON, - GET_ALL_TILGANGSRESTRIKSJON, - UPDATE_TILGANGSRESTRIKSJON, - GET_TILKNYTTETREGISTRERINGSOM, - GET_ALL_TILKNYTTETREGISTRERINGSOM, - UPDATE_TILKNYTTETREGISTRERINGSOM, - GET_VARIANTFORMAT, - GET_ALL_VARIANTFORMAT, - UPDATE_VARIANTFORMAT - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(KodeverkActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_DOKUMENTSTATUS, + GET_ALL_DOKUMENTSTATUS, + UPDATE_DOKUMENTSTATUS, + GET_DOKUMENTTYPE, + GET_ALL_DOKUMENTTYPE, + UPDATE_DOKUMENTTYPE, + GET_FORMAT, + GET_ALL_FORMAT, + UPDATE_FORMAT, + GET_JOURNALPOSTTYPE, + GET_ALL_JOURNALPOSTTYPE, + UPDATE_JOURNALPOSTTYPE, + GET_JOURNALSTATUS, + GET_ALL_JOURNALSTATUS, + UPDATE_JOURNALSTATUS, + GET_KLASSIFIKASJONSTYPE, + GET_ALL_KLASSIFIKASJONSTYPE, + UPDATE_KLASSIFIKASJONSTYPE, + GET_KORRESPONDANSEPARTTYPE, + GET_ALL_KORRESPONDANSEPARTTYPE, + UPDATE_KORRESPONDANSEPARTTYPE, + GET_MERKNADSTYPE, + GET_ALL_MERKNADSTYPE, + UPDATE_MERKNADSTYPE, + GET_PARTROLLE, + GET_ALL_PARTROLLE, + UPDATE_PARTROLLE, + GET_ROLLE, + GET_ALL_ROLLE, + UPDATE_ROLLE, + GET_SAKSMAPPETYPE, + GET_ALL_SAKSMAPPETYPE, + UPDATE_SAKSMAPPETYPE, + GET_SAKSSTATUS, + GET_ALL_SAKSSTATUS, + UPDATE_SAKSSTATUS, + GET_SKJERMINGSHJEMMEL, + GET_ALL_SKJERMINGSHJEMMEL, + UPDATE_SKJERMINGSHJEMMEL, + GET_TILGANGSGRUPPE, + GET_ALL_TILGANGSGRUPPE, + UPDATE_TILGANGSGRUPPE, + GET_TILGANGSRESTRIKSJON, + GET_ALL_TILGANGSRESTRIKSJON, + UPDATE_TILGANGSRESTRIKSJON, + GET_TILKNYTTETREGISTRERINGSOM, + GET_ALL_TILKNYTTETREGISTRERINGSOM, + UPDATE_TILKNYTTETREGISTRERINGSOM, + GET_VARIANTFORMAT, + GET_ALL_VARIANTFORMAT, + UPDATE_VARIANTFORMAT; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(KodeverkActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 711151b6..3da6f3d7 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class KorrespondansepartType extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class KorrespondansepartType extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 07702ed9..1284c884 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Merknadstype extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Merknadstype extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 817d62cd..b5d965a0 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class PartRolle extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PartRolle extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 492a6bd3..1f559655 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Rolle extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Rolle extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 ad47383b..40678593 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Saksmappetype extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Saksmappetype extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 794aa4fc..748dd459 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Saksstatus extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Saksstatus extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 0fbb032e..d8b65bb2 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Skjermingshjemmel extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Skjermingshjemmel extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 2e223ccf..09ea481d 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Tilgangsgruppe extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Tilgangsgruppe extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 f1f76d04..ba15fa0c 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Tilgangsrestriksjon extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Tilgangsrestriksjon extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 ce75092c..34953abe 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class TilknyttetRegistreringSom extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class TilknyttetRegistreringSom extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 1f28faf5..89e836ef 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Variantformat extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Variantformat extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 da498c21..efc28d50 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 @@ -1,55 +1,42 @@ package no.novari.fint.model.arkiv.kulturminnevern; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; - import java.util.Collections; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; 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.FintModelObject; import no.novari.fint.model.arkiv.noark.Saksmappe; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Matrikkelnummer; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class DispensasjonAutomatiskFredaKulturminne extends Saksmappe implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - identifikators.put("soknadsnummer", this.soknadsnummer); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = true; - @NotBlank - private String kulturminneId; - @NotNull - private @Valid Matrikkelnummer matrikkelnummer; - @NotNull - private @Valid Identifikator soknadsnummer; - private String tiltak; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class DispensasjonAutomatiskFredaKulturminne extends Saksmappe implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + identifikators.put("soknadsnummer", this.soknadsnummer); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = true; + @NotBlank private String kulturminneId; + @NotNull private @Valid Matrikkelnummer matrikkelnummer; + @NotNull private @Valid Identifikator soknadsnummer; + private String tiltak; } diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/KulturminnevernActions.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/KulturminnevernActions.java index e2546319..c9c1b9a9 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/KulturminnevernActions.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/kulturminnevern/KulturminnevernActions.java @@ -4,29 +4,25 @@ import java.util.List; public enum KulturminnevernActions { - - GET_DISPENSASJONAUTOMATISKFREDAKULTURMINNE, - GET_ALL_DISPENSASJONAUTOMATISKFREDAKULTURMINNE, - UPDATE_DISPENSASJONAUTOMATISKFREDAKULTURMINNE, - GET_TILSKUDDFARTOY, - GET_ALL_TILSKUDDFARTOY, - UPDATE_TILSKUDDFARTOY, - GET_TILSKUDDFREDABYGNINGPRIVATEIE, - GET_ALL_TILSKUDDFREDABYGNINGPRIVATEIE, - UPDATE_TILSKUDDFREDABYGNINGPRIVATEIE - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(KulturminnevernActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_DISPENSASJONAUTOMATISKFREDAKULTURMINNE, + GET_ALL_DISPENSASJONAUTOMATISKFREDAKULTURMINNE, + UPDATE_DISPENSASJONAUTOMATISKFREDAKULTURMINNE, + GET_TILSKUDDFARTOY, + GET_ALL_TILSKUDDFARTOY, + UPDATE_TILSKUDDFARTOY, + GET_TILSKUDDFREDABYGNINGPRIVATEIE, + GET_ALL_TILSKUDDFREDABYGNINGPRIVATEIE, + UPDATE_TILSKUDDFREDABYGNINGPRIVATEIE; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(KulturminnevernActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 3631d7f3..42c13642 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 @@ -1,55 +1,41 @@ package no.novari.fint.model.arkiv.kulturminnevern; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; - import java.util.Collections; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; -import no.novari.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; import no.novari.fint.model.arkiv.noark.Saksmappe; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class TilskuddFartoy extends Saksmappe implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - identifikators.put("soknadsnummer", this.soknadsnummer); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = true; - @NotBlank - private String fartoyNavn; - @NotBlank - private String kallesignal; - @NotBlank - private String kulturminneId; - @NotNull - private @Valid Identifikator soknadsnummer; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class TilskuddFartoy extends Saksmappe implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + identifikators.put("soknadsnummer", this.soknadsnummer); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = true; + @NotBlank private String fartoyNavn; + @NotBlank private String kallesignal; + @NotBlank private String kulturminneId; + @NotNull private @Valid Identifikator soknadsnummer; } 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 e12a5a55..ced51878 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 @@ -1,53 +1,42 @@ package no.novari.fint.model.arkiv.kulturminnevern; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; - import java.util.Collections; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; 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.FintModelObject; import no.novari.fint.model.arkiv.noark.Saksmappe; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Matrikkelnummer; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class TilskuddFredaBygningPrivatEie extends Saksmappe implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - identifikators.put("soknadsnummer", this.soknadsnummer); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = true; - private String bygningsnavn; - @NotBlank - private String kulturminneId; - private @Valid Matrikkelnummer matrikkelnummer; - private @Valid Identifikator soknadsnummer; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class TilskuddFredaBygningPrivatEie extends Saksmappe implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + identifikators.put("soknadsnummer", this.soknadsnummer); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = true; + private String bygningsnavn; + @NotBlank private String kulturminneId; + private @Valid Matrikkelnummer matrikkelnummer; + private @Valid Identifikator soknadsnummer; } 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 4f27a4be..054b3c7f 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 @@ -1,79 +1,79 @@ package no.novari.fint.model.arkiv.noark; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -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 @EqualsAndHashCode @ToString -public class AdministrativEnhet implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - ORGANISASJONSELEMENT("organisasjonselement", "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +public class AdministrativEnhet implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ORGANISASJONSELEMENT( + "organisasjonselement", + "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", + NONE_TO_ONE, + null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private @Valid Periode gyldighetsperiode; - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private @Valid Periode gyldighetsperiode; + @NotBlank private String navn; + @NotNull private @Valid Identifikator systemId; } 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 742d4ab0..17631bd6 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 @@ -1,79 +1,77 @@ package no.novari.fint.model.arkiv.noark; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Arkivdel implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Arkivdel implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + KLASSIFIKASJONSSYSTEM( + "klassifikasjonssystem", + "no.novari.fint.model.arkiv.noark.Klassifikasjonssystem", + NONE_TO_MANY, + "arkivdel"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Identifikator systemId; - @NotBlank - private String tittel; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Identifikator systemId; + @NotBlank private String tittel; } 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 e6522d74..54276d15 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 @@ -1,78 +1,85 @@ package no.novari.fint.model.arkiv.noark; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Arkivressurs implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Arkivressurs implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + PERSONALRESSURS( + "personalressurs", + "no.novari.fint.model.administrasjon.personal.Personalressurs", + ONE_TO_ONE, + null), + AUTORISASJON( + "autorisasjon", + "no.novari.fint.model.arkiv.noark.Autorisasjon", + NONE_TO_MANY, + "arkivressurs"), + TILGANG("tilgang", "no.novari.fint.model.arkiv.noark.Tilgang", NONE_TO_MANY, "arkivressurs"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("kildesystemId", this.kildesystemId); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("kildesystemId", this.kildesystemId); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private @Valid Identifikator kildesystemId; - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private @Valid Identifikator kildesystemId; + private @Valid Identifikator systemId; } 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 6fb2b56a..87bfbd9a 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 @@ -1,77 +1,87 @@ package no.novari.fint.model.arkiv.noark; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Autorisasjon implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Autorisasjon implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + TILGANGSRESTRIKSJON( + "tilgangsrestriksjon", + "no.novari.fint.model.arkiv.kodeverk.Tilgangsrestriksjon", + ONE_TO_MANY, + null), + ADMINISTRATIVENHET( + "administrativenhet", + "no.novari.fint.model.arkiv.noark.AdministrativEnhet", + NONE_TO_MANY, + null), + ARKIVRESSURS( + "arkivressurs", + "no.novari.fint.model.arkiv.noark.Arkivressurs", + NONE_TO_MANY, + "autorisasjon"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Identifikator systemId; } 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 2d0fa965..cb14f38a 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 @@ -1,41 +1,27 @@ package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Date; +import javax.validation.Valid; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import javax.validation.Valid; -import javax.validation.constraints.*; -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.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 @EqualsAndHashCode @ToString -public class Avskrivning implements FintComplexDatatypeObject { +public class Avskrivning implements FintComplexDatatypeObject { - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @NotBlank - private String avskrevetAv; - @NotNull - private @Valid Date avskrivningsdato; - @NotBlank - private String avskrivningsmate; + @JsonIgnore private final boolean writeable = true; + @NotBlank private String avskrevetAv; + @NotNull private @Valid Date avskrivningsdato; + @NotBlank private String avskrivningsmate; } 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 84281cee..eef1e76a 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 @@ -1,80 +1,81 @@ package no.novari.fint.model.arkiv.noark; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; import java.util.List; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintComplexDatatypeObject; -import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; -import java.util.Date; - -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 @EqualsAndHashCode @ToString -public class Dokumentbeskrivelse implements FintComplexDatatypeObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Dokumentbeskrivelse implements FintComplexDatatypeObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + DOKUMENTSTATUS( + "dokumentstatus", "no.novari.fint.model.arkiv.kodeverk.DokumentStatus", ONE_TO_ONE, null), + DOKUMENTTYPE( + "dokumentType", "no.novari.fint.model.arkiv.kodeverk.DokumentType", ONE_TO_ONE, null), + TILKNYTTETREGISTRERINGSOM( + "tilknyttetRegistreringSom", + "no.novari.fint.model.arkiv.kodeverk.TilknyttetRegistreringSom", + ONE_TO_MANY, + null), + TILKNYTTETAV("tilknyttetAv", "no.novari.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE, null), + OPPRETTETAV("opprettetAv", "no.novari.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE, null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - return Collections.unmodifiableList(relations); - } + return Collections.unmodifiableList(relations); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private String beskrivelse; - private Long dokumentnummer; - private List<@Valid Dokumentobjekt> dokumentobjekt; - private List forfatter; - private @Valid Date opprettetDato; - private List<@Valid Part> part; - private List referanseArkivdel; - private @Valid Skjerming skjerming; - private @Valid Date tilknyttetDato; - @NotBlank - private String tittel; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private String beskrivelse; + private Long dokumentnummer; + private List<@Valid Dokumentobjekt> dokumentobjekt; + private List forfatter; + private @Valid Date opprettetDato; + private List<@Valid Part> part; + private List referanseArkivdel; + private @Valid Skjerming skjerming; + private @Valid Date tilknyttetDato; + @NotBlank private String tittel; } 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 1bcfcae1..677f549e 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 @@ -1,52 +1,39 @@ package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; - import java.util.Collections; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; 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; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Dokumentfil implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = true; - @NotBlank - private String data; - private String filnavn; - @NotBlank - private String format; - @NotNull - private @Valid Identifikator systemId; +public class Dokumentfil implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = true; + @NotBlank private String data; + private String filnavn; + @NotBlank private String format; + @NotNull private @Valid Identifikator systemId; } 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 8012516f..258e4e63 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 @@ -1,72 +1,69 @@ package no.novari.fint.model.arkiv.noark; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; import java.util.List; - -import no.novari.fint.model.FintMultiplicity; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintComplexDatatypeObject; -import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; 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 @EqualsAndHashCode @ToString -public class Dokumentobjekt implements FintComplexDatatypeObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Dokumentobjekt implements FintComplexDatatypeObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + FILFORMAT("filformat", "no.novari.fint.model.arkiv.kodeverk.Format", NONE_TO_ONE, null), + VARIANTFORMAT( + "variantFormat", "no.novari.fint.model.arkiv.kodeverk.Variantformat", ONE_TO_ONE, null), + OPPRETTETAV("opprettetAv", "no.novari.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE, null), + REFERANSEDOKUMENTFIL( + "referanseDokumentfil", "no.novari.fint.model.arkiv.noark.Dokumentfil", NONE_TO_ONE, null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - return Collections.unmodifiableList(relations); - } + return Collections.unmodifiableList(relations); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private String filstorrelse; - @Deprecated - private String format; - private String formatDetaljer; - private String sjekksum; - private String sjekksumAlgoritme; - private Long versjonsnummer; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private String filstorrelse; + private String formatDetaljer; + private String sjekksum; + private String sjekksumAlgoritme; + private Long versjonsnummer; } 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 b66509f3..4631882a 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 @@ -1,79 +1,78 @@ package no.novari.fint.model.arkiv.noark; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; import java.util.List; import javax.validation.Valid; - -import no.novari.fint.model.FintMultiplicity; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintComplexDatatypeObject; -import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; -import java.util.Date; - -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Journalpost extends Registrering implements FintComplexDatatypeObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Journalpost extends Registrering implements FintComplexDatatypeObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + JOURNALPOSTTYPE( + "journalposttype", "no.novari.fint.model.arkiv.kodeverk.JournalpostType", ONE_TO_ONE, null), + JOURNALSTATUS( + "journalstatus", "no.novari.fint.model.arkiv.kodeverk.JournalStatus", ONE_TO_ONE, null), + JOURNALENHET( + "journalenhet", "no.novari.fint.model.arkiv.noark.AdministrativEnhet", NONE_TO_ONE, null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); + relations.addAll(super.getRelations()); - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - return Collections.unmodifiableList(relations); - } + return Collections.unmodifiableList(relations); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private Long antallVedlegg; - private @Valid Avskrivning avskrivning; - private @Valid Date dokumentetsDato; - private @Valid Date forfallsDato; - private String journalAr; - private @Valid Date journalDato; - private Long journalPostnummer; - private Long journalSekvensnummer; - private @Valid Date mottattDato; - private @Valid Date offentlighetsvurdertDato; - private @Valid Date sendtDato; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private Long antallVedlegg; + private @Valid Avskrivning avskrivning; + private @Valid Date dokumentetsDato; + private @Valid Date forfallsDato; + private String journalAr; + private @Valid Date journalDato; + private Long journalPostnummer; + private Long journalSekvensnummer; + private @Valid Date mottattDato; + private @Valid Date offentlighetsvurdertDato; + private @Valid Date sendtDato; } 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 ecd1b805..c27b9968 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 @@ -1,69 +1,67 @@ package no.novari.fint.model.arkiv.noark; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; import java.util.List; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintComplexDatatypeObject; -import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; 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 @EqualsAndHashCode @ToString -public class Klasse implements FintComplexDatatypeObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - KLASSIFIKASJONSSYSTEM("klassifikasjonssystem", "no.novari.fint.model.arkiv.noark.Klassifikasjonssystem", ONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +public class Klasse implements FintComplexDatatypeObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + KLASSIFIKASJONSSYSTEM( + "klassifikasjonssystem", + "no.novari.fint.model.arkiv.noark.Klassifikasjonssystem", + ONE_TO_ONE, + null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - return Collections.unmodifiableList(relations); - } + return Collections.unmodifiableList(relations); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - @NotBlank - private String klasseId; - private Integer rekkefolge; - private @Valid Skjerming skjerming; - @NotBlank - private String tittel; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + @NotBlank private String klasseId; + private Integer rekkefolge; + private @Valid Skjerming skjerming; + @NotBlank private String tittel; } 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 307fb44a..d7d84ec5 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 @@ -1,88 +1,90 @@ package no.novari.fint.model.arkiv.noark; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; -import java.util.Date; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Klassifikasjonssystem implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Klassifikasjonssystem implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + KLASSIFIKASJONSTYPE( + "klassifikasjonstype", + "no.novari.fint.model.arkiv.kodeverk.Klassifikasjonstype", + NONE_TO_ONE, + null), + ARKIVDEL( + "arkivdel", + "no.novari.fint.model.arkiv.noark.Arkivdel", + ONE_TO_MANY, + "klassifikasjonssystem"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private String avsluttetAv; - private @Valid Date avsluttetDato; - private String beskrivelse; - @NotEmpty - private List<@Valid Klasse> klasse; - @NotBlank - private String opprettetAv; - @NotNull - private @Valid Date opprettetDato; - @NotNull - private @Valid Identifikator systemId; - @NotBlank - private String tittel; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private String avsluttetAv; + private @Valid Date avsluttetDato; + private String beskrivelse; + @NotEmpty private List<@Valid Klasse> klasse; + @NotBlank private String opprettetAv; + @NotNull private @Valid Date opprettetDato; + @NotNull private @Valid Identifikator systemId; + @NotBlank private String tittel; } 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 59d37ea3..95d3097c 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 @@ -1,72 +1,72 @@ package no.novari.fint.model.arkiv.noark; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; import java.util.List; import javax.validation.Valid; - -import no.novari.fint.model.FintMultiplicity; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintComplexDatatypeObject; -import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; 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.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 @EqualsAndHashCode @ToString -public class Korrespondansepart implements FintComplexDatatypeObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - KORRESPONDANSEPARTTYPE("korrespondanseparttype", "no.novari.fint.model.arkiv.kodeverk.KorrespondansepartType", ONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +public class Korrespondansepart implements FintComplexDatatypeObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + KORRESPONDANSEPARTTYPE( + "korrespondanseparttype", + "no.novari.fint.model.arkiv.kodeverk.KorrespondansepartType", + ONE_TO_ONE, + null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - return Collections.unmodifiableList(relations); - } + return Collections.unmodifiableList(relations); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private @Valid Adresse adresse; - private String fodselsnummer; - private @Valid Kontaktinformasjon kontaktinformasjon; - private String kontaktperson; - private String korrespondansepartNavn; - private String organisasjonsnummer; - private @Valid Skjerming skjerming; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private @Valid Adresse adresse; + private String fodselsnummer; + private @Valid Kontaktinformasjon kontaktinformasjon; + private String kontaktperson; + private String korrespondansepartNavn; + private String organisasjonsnummer; + private @Valid Skjerming skjerming; } 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 4a40edd6..bc8351ae 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 @@ -1,89 +1,88 @@ package no.novari.fint.model.arkiv.noark; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintAbstractObject; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; -import java.util.Date; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public abstract class Mappe implements FintAbstractObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public abstract class Mappe implements FintAbstractObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ARKIVDEL("arkivdel", "no.novari.fint.model.arkiv.noark.Arkivdel", NONE_TO_ONE, null), + AVSLUTTETAV("avsluttetAv", "no.novari.fint.model.arkiv.noark.Arkivressurs", NONE_TO_ONE, null), + OPPRETTETAV("opprettetAv", "no.novari.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE, null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("mappeId", this.mappeId); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("mappeId", this.mappeId); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private @Valid Date avsluttetDato; - private String beskrivelse; - private List<@Valid Klasse> klasse; - private @Valid Identifikator mappeId; - private List<@Valid Merknad> merknad; - private List noekkelord; - private String offentligTittel; - private @Valid Date opprettetDato; - private List<@Valid Part> part; - private @Valid Skjerming skjerming; - private @Valid Identifikator systemId; - private String tittel; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private @Valid Date avsluttetDato; + private String beskrivelse; + private List<@Valid Klasse> klasse; + private @Valid Identifikator mappeId; + private List<@Valid Merknad> merknad; + private List noekkelord; + private String offentligTittel; + private @Valid Date opprettetDato; + private List<@Valid Part> part; + private @Valid Skjerming skjerming; + private @Valid Identifikator systemId; + private String tittel; } 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 e84e8d41..291fe347 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 @@ -1,69 +1,65 @@ package no.novari.fint.model.arkiv.noark; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; import java.util.List; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintComplexDatatypeObject; -import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; -import java.util.Date; - -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 @EqualsAndHashCode @ToString -public class Merknad implements FintComplexDatatypeObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Merknad implements FintComplexDatatypeObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + MERKNADSTYPE( + "merknadstype", "no.novari.fint.model.arkiv.kodeverk.Merknadstype", ONE_TO_ONE, null), + MERKNADREGISTRERTAV( + "merknadRegistrertAv", "no.novari.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE, null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - return Collections.unmodifiableList(relations); - } + return Collections.unmodifiableList(relations); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Date merknadsdato; - @NotBlank - private String merknadstekst; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Date merknadsdato; + @NotBlank private String merknadstekst; } diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/NoarkActions.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/NoarkActions.java index 382fbb95..82f46f9c 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/NoarkActions.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/noark/NoarkActions.java @@ -4,44 +4,40 @@ import java.util.List; public enum NoarkActions { - - GET_ADMINISTRATIVENHET, - GET_ALL_ADMINISTRATIVENHET, - UPDATE_ADMINISTRATIVENHET, - GET_ARKIVDEL, - GET_ALL_ARKIVDEL, - UPDATE_ARKIVDEL, - GET_ARKIVRESSURS, - GET_ALL_ARKIVRESSURS, - UPDATE_ARKIVRESSURS, - GET_AUTORISASJON, - GET_ALL_AUTORISASJON, - UPDATE_AUTORISASJON, - GET_DOKUMENTFIL, - GET_ALL_DOKUMENTFIL, - UPDATE_DOKUMENTFIL, - GET_KLASSIFIKASJONSSYSTEM, - GET_ALL_KLASSIFIKASJONSSYSTEM, - UPDATE_KLASSIFIKASJONSSYSTEM, - GET_SAK, - GET_ALL_SAK, - UPDATE_SAK, - GET_TILGANG, - GET_ALL_TILGANG, - UPDATE_TILGANG - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(NoarkActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_ADMINISTRATIVENHET, + GET_ALL_ADMINISTRATIVENHET, + UPDATE_ADMINISTRATIVENHET, + GET_ARKIVDEL, + GET_ALL_ARKIVDEL, + UPDATE_ARKIVDEL, + GET_ARKIVRESSURS, + GET_ALL_ARKIVRESSURS, + UPDATE_ARKIVRESSURS, + GET_AUTORISASJON, + GET_ALL_AUTORISASJON, + UPDATE_AUTORISASJON, + GET_DOKUMENTFIL, + GET_ALL_DOKUMENTFIL, + UPDATE_DOKUMENTFIL, + GET_KLASSIFIKASJONSSYSTEM, + GET_ALL_KLASSIFIKASJONSSYSTEM, + UPDATE_KLASSIFIKASJONSSYSTEM, + GET_SAK, + GET_ALL_SAK, + UPDATE_SAK, + GET_TILGANG, + GET_ALL_TILGANG, + UPDATE_TILGANG; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(NoarkActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 5ac3eabc..731cda58 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 @@ -1,72 +1,67 @@ package no.novari.fint.model.arkiv.noark; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; import java.util.List; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintComplexDatatypeObject; -import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; 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.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 @EqualsAndHashCode @ToString -public class Part implements FintComplexDatatypeObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - PARTROLLE("partRolle", "no.novari.fint.model.arkiv.kodeverk.PartRolle", NONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +public class Part implements FintComplexDatatypeObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + PARTROLLE("partRolle", "no.novari.fint.model.arkiv.kodeverk.PartRolle", NONE_TO_ONE, null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - return Collections.unmodifiableList(relations); - } + return Collections.unmodifiableList(relations); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private @Valid Adresse adresse; - private String fodselsnummer; - private @Valid Kontaktinformasjon kontaktinformasjon; - private String kontaktperson; - private String organisasjonsnummer; - @NotBlank - private String partNavn; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private @Valid Adresse adresse; + private String fodselsnummer; + private @Valid Kontaktinformasjon kontaktinformasjon; + private String kontaktperson; + private String organisasjonsnummer; + @NotBlank private String partNavn; } 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 d536c7a7..beec57d9 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 @@ -1,85 +1,87 @@ package no.novari.fint.model.arkiv.noark; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; import java.util.List; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintAbstractObject; -import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; -import java.util.Date; - -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 @EqualsAndHashCode @ToString -public abstract class Registrering implements FintAbstractObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public abstract class Registrering implements FintAbstractObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + TILGANGSGRUPPE( + "tilgangsgruppe", "no.novari.fint.model.arkiv.kodeverk.Tilgangsgruppe", NONE_TO_ONE, null), + ADMINISTRATIVENHET( + "administrativEnhet", + "no.novari.fint.model.arkiv.noark.AdministrativEnhet", + NONE_TO_ONE, + null), + ARKIVDEL("arkivdel", "no.novari.fint.model.arkiv.noark.Arkivdel", NONE_TO_ONE, null), + SAKSBEHANDLER( + "saksbehandler", "no.novari.fint.model.arkiv.noark.Arkivressurs", NONE_TO_ONE, null), + ARKIVERTAV("arkivertAv", "no.novari.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE, null), + OPPRETTETAV("opprettetAv", "no.novari.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE, null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - return Collections.unmodifiableList(relations); - } + return Collections.unmodifiableList(relations); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private @Valid Date arkivertDato; - private String beskrivelse; - private List<@Valid Dokumentbeskrivelse> dokumentbeskrivelse; - private List forfatter; - private @Valid Klasse klasse; - private List<@Valid Korrespondansepart> korrespondansepart; - private List<@Valid Merknad> merknad; - private List nokkelord; - private String offentligTittel; - private @Valid Date opprettetDato; - private List<@Valid Part> part; - private List referanseArkivDel; - private String registreringsId; - private @Valid Skjerming skjerming; - @NotBlank - private String tittel; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private @Valid Date arkivertDato; + private String beskrivelse; + private List<@Valid Dokumentbeskrivelse> dokumentbeskrivelse; + private List forfatter; + private @Valid Klasse klasse; + private List<@Valid Korrespondansepart> korrespondansepart; + private List<@Valid Merknad> merknad; + private List nokkelord; + private String offentligTittel; + private @Valid Date opprettetDato; + private List<@Valid Part> part; + private List referanseArkivDel; + private String registreringsId; + private @Valid Skjerming skjerming; + @NotBlank private String tittel; } 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 c7bca33e..8e56ea8b 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 @@ -1,43 +1,33 @@ package no.novari.fint.model.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.FintModelObject; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Sak extends Saksmappe implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Sak extends Saksmappe implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 70497563..44ccdaf3 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 @@ -1,86 +1,91 @@ package no.novari.fint.model.arkiv.noark; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; - -import no.novari.fint.model.FintMultiplicity; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintAbstractObject; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; -import java.util.Date; - -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public abstract class Saksmappe extends Mappe implements FintAbstractObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public abstract class Saksmappe extends Mappe implements FintAbstractObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + SAKSMAPPETYPE( + "saksmappetype", "no.novari.fint.model.arkiv.kodeverk.Saksmappetype", NONE_TO_ONE, null), + SAKSSTATUS("saksstatus", "no.novari.fint.model.arkiv.kodeverk.Saksstatus", ONE_TO_ONE, null), + TILGANGSGRUPPE( + "tilgangsgruppe", "no.novari.fint.model.arkiv.kodeverk.Tilgangsgruppe", NONE_TO_ONE, null), + JOURNALENHET( + "journalenhet", "no.novari.fint.model.arkiv.noark.AdministrativEnhet", NONE_TO_ONE, null), + ADMINISTRATIVENHET( + "administrativEnhet", + "no.novari.fint.model.arkiv.noark.AdministrativEnhet", + ONE_TO_ONE, + null), + SAKSANSVARLIG( + "saksansvarlig", "no.novari.fint.model.arkiv.noark.Arkivressurs", ONE_TO_ONE, null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); + relations.addAll(super.getRelations()); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private List<@Valid Registrering> arkivnotat; - private List<@Valid Journalpost> journalpost; - private String saksaar; - private @Valid Date saksdato; - private String sakssekvensnummer; - private @Valid Date utlaantDato; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private List<@Valid Journalpost> journalpost; + private String saksaar; + private @Valid Date saksdato; + private String sakssekvensnummer; + private @Valid Date utlaantDato; } 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 4918a84e..2636ddfc 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 @@ -1,63 +1,67 @@ package no.novari.fint.model.arkiv.noark; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; import java.util.List; - -import no.novari.fint.model.FintMultiplicity; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintComplexDatatypeObject; -import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; 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 @EqualsAndHashCode @ToString -public class Skjerming implements FintComplexDatatypeObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; - - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } +public class Skjerming implements FintComplexDatatypeObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + SKJERMINGSHJEMMEL( + "skjermingshjemmel", + "no.novari.fint.model.arkiv.kodeverk.Skjermingshjemmel", + ONE_TO_ONE, + null), + TILGANGSRESTRIKSJON( + "tilgangsrestriksjon", + "no.novari.fint.model.arkiv.kodeverk.Tilgangsrestriksjon", + ONE_TO_ONE, + null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - return Collections.unmodifiableList(relations); - } + return Collections.unmodifiableList(relations); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 87dd5991..125a45d4 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 @@ -1,80 +1,83 @@ package no.novari.fint.model.arkiv.noark; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Tilgang implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Tilgang implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ROLLE("rolle", "no.novari.fint.model.arkiv.kodeverk.Rolle", ONE_TO_ONE, null), + ADMINISTRATIVENHET( + "administrativEnhet", + "no.novari.fint.model.arkiv.noark.AdministrativEnhet", + NONE_TO_ONE, + null), + ARKIVDEL("arkivdel", "no.novari.fint.model.arkiv.noark.Arkivdel", NONE_TO_ONE, null), + ARKIVRESSURS( + "arkivressurs", "no.novari.fint.model.arkiv.noark.Arkivressurs", NONE_TO_MANY, "tilgang"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Identifikator systemId; - @NotBlank - private String tittel; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Identifikator systemId; + @NotBlank private String tittel; } diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/personal/PersonalActions.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/personal/PersonalActions.java index 3a3765ae..29db9cfa 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/personal/PersonalActions.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/personal/PersonalActions.java @@ -4,23 +4,19 @@ import java.util.List; public enum PersonalActions { - - GET_PERSONALMAPPE, - GET_ALL_PERSONALMAPPE, - UPDATE_PERSONALMAPPE - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(PersonalActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_PERSONALMAPPE, + GET_ALL_PERSONALMAPPE, + UPDATE_PERSONALMAPPE; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(PersonalActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 945408ca..9d18fcbb 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 @@ -1,80 +1,86 @@ package no.novari.fint.model.arkiv.personal; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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.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; +import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Personalmappe extends Saksmappe implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Personalmappe extends Saksmappe implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + PERSON("person", "no.novari.fint.model.felles.Person", ONE_TO_ONE, null), + LEDER( + "leder", "no.novari.fint.model.administrasjon.personal.Personalressurs", ONE_TO_ONE, null), + ARBEIDSSTED( + "arbeidssted", + "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", + ONE_TO_ONE, + null), + PERSONALRESSURS( + "personalressurs", + "no.novari.fint.model.administrasjon.personal.Personalressurs", + ONE_TO_ONE, + null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); + relations.addAll(super.getRelations()); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Personnavn navn; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Personnavn navn; } diff --git a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/samferdsel/SamferdselActions.java b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/samferdsel/SamferdselActions.java index 29d220a9..f4498dfd 100644 --- a/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/samferdsel/SamferdselActions.java +++ b/fint-arkiv-model-java/src/main/java/no/novari/fint/model/arkiv/samferdsel/SamferdselActions.java @@ -4,23 +4,19 @@ import java.util.List; public enum SamferdselActions { - - GET_SOKNADDROSJELOYVE, - GET_ALL_SOKNADDROSJELOYVE, - UPDATE_SOKNADDROSJELOYVE - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(SamferdselActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_SOKNADDROSJELOYVE, + GET_ALL_SOKNADDROSJELOYVE, + UPDATE_SOKNADDROSJELOYVE; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(SamferdselActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 c8ed2cfb..753388c9 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 @@ -1,48 +1,36 @@ package no.novari.fint.model.arkiv.samferdsel; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; - import java.util.Collections; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; -import no.novari.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; import no.novari.fint.model.arkiv.noark.Saksmappe; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class SoknadDrosjeloyve extends Saksmappe implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = true; - @NotBlank - private String organisasjonsnavn; - @NotBlank - private String organisasjonsnummer; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class SoknadDrosjeloyve extends Saksmappe implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = true; + @NotBlank private String organisasjonsnavn; + @NotBlank private String organisasjonsnummer; } 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 a3d75959..17956f1c 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class DokumentStatusResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 55597d79..2d198045 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class DokumentStatusResources extends AbstractCollectionResources { - public DokumentStatusResources(Collection input) { - super(input); - } + public DokumentStatusResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 0a4b5cea..bff91a6b 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class DokumentTypeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 38c2b934..b4fb3eab 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class DokumentTypeResources extends AbstractCollectionResources { - public DokumentTypeResources(Collection input) { - super(input); - } + public DokumentTypeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 a80bb261..5423f4d1 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class FormatResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 62b63f04..4da41434 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FormatResources extends AbstractCollectionResources { - public FormatResources(Collection input) { - super(input); - } + public FormatResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 2f3f6f5e..775e35c1 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class JournalStatusResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 3980f062..b8c75d86 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class JournalStatusResources extends AbstractCollectionResources { - public JournalStatusResources(Collection input) { - super(input); - } + public JournalStatusResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 6668c774..da9e1940 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class JournalpostTypeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 4444d3b1..f100e978 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class JournalpostTypeResources extends AbstractCollectionResources { - public JournalpostTypeResources(Collection input) { - super(input); - } + public JournalpostTypeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 c1c0bc63..5d569225 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class KlassifikasjonstypeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 eaa420e7..d8e5f250 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class KlassifikasjonstypeResources extends AbstractCollectionResources { +public class KlassifikasjonstypeResources + extends AbstractCollectionResources { - public KlassifikasjonstypeResources(Collection input) { - super(input); - } + public KlassifikasjonstypeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 75d59067..91aea2b0 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class KorrespondansepartTypeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 74dffa78..5fbf1fe3 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class KorrespondansepartTypeResources extends AbstractCollectionResources { +public class KorrespondansepartTypeResources + extends AbstractCollectionResources { - public KorrespondansepartTypeResources(Collection input) { - super(input); - } + public KorrespondansepartTypeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 18ee049b..0215f45b 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class MerknadstypeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 94b9b963..03cf97a1 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class MerknadstypeResources extends AbstractCollectionResources { - public MerknadstypeResources(Collection input) { - super(input); - } + public MerknadstypeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 f0d3b25a..44f0acb2 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class PartRolleResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 13fb3135..4504e4f5 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PartRolleResources extends AbstractCollectionResources { - public PartRolleResources(Collection input) { - super(input); - } + public PartRolleResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 0e92c2aa..6c6c4155 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class RolleResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 6bbb129e..5b5d60f0 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class RolleResources extends AbstractCollectionResources { - public RolleResources(Collection input) { - super(input); - } + public RolleResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 c7f6e0eb..634f2c85 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class SaksmappetypeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 ce7a0c0a..42aaa175 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SaksmappetypeResources extends AbstractCollectionResources { - public SaksmappetypeResources(Collection input) { - super(input); - } + public SaksmappetypeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 b36fac68..90ac74f4 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class SaksstatusResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 976d99a6..cbdca88a 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SaksstatusResources extends AbstractCollectionResources { - public SaksstatusResources(Collection input) { - super(input); - } + public SaksstatusResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 fa56f6d3..f6adbda1 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class SkjermingshjemmelResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 49adb150..778df768 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class SkjermingshjemmelResources extends AbstractCollectionResources { +public class SkjermingshjemmelResources + extends AbstractCollectionResources { - public SkjermingshjemmelResources(Collection input) { - super(input); - } + public SkjermingshjemmelResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 294bcac7..a733e136 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class TilgangsgruppeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 626ec8ec..b32a6b14 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TilgangsgruppeResources extends AbstractCollectionResources { - public TilgangsgruppeResources(Collection input) { - super(input); - } + public TilgangsgruppeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 7b6095d7..a8ebf360 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class TilgangsrestriksjonResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 9cf0f21f..567c058b 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class TilgangsrestriksjonResources extends AbstractCollectionResources { +public class TilgangsrestriksjonResources + extends AbstractCollectionResources { - public TilgangsrestriksjonResources(Collection input) { - super(input); - } + public TilgangsrestriksjonResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 6d18d985..6c930f38 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class TilknyttetRegistreringSomResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 cd359ab6..b36fbbb6 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class TilknyttetRegistreringSomResources extends AbstractCollectionResources { +public class TilknyttetRegistreringSomResources + extends AbstractCollectionResources { - public TilknyttetRegistreringSomResources(Collection input) { - super(input); - } + public TilknyttetRegistreringSomResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 c92fd08b..5fdee526 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.arkiv.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class VariantformatResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 52129ca3..e0020469 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class VariantformatResources extends AbstractCollectionResources { - public VariantformatResources(Collection input) { - super(input); - } + public VariantformatResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 caf861e8..b60f7b99 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 @@ -1,60 +1,56 @@ package no.novari.fint.model.resource.arkiv.kulturminnevern; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; 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; +import no.novari.fint.model.resource.felles.kompleksedatatyper.MatrikkelnummerResource; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class DispensasjonAutomatiskFredaKulturminneResource extends SaksmappeResource implements FintResource { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = super.getNestedResources(); - if (matrikkelnummer != null) { - result.add(matrikkelnummer); - } - return result; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class DispensasjonAutomatiskFredaKulturminneResource extends SaksmappeResource + implements FintResource { + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = super.getNestedResources(); + if (matrikkelnummer != null) { + result.add(matrikkelnummer); } - @NotBlank - private String kulturminneId; - @NotNull - private @Valid MatrikkelnummerResource matrikkelnummer; - @NotNull - private @Valid Identifikator soknadsnummer; - private String tiltak; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - identifikators.put("soknadsnummer", this.soknadsnummer); + return result; + } - return Collections.unmodifiableMap(identifikators); - } + @NotBlank private String kulturminneId; + @NotNull private @Valid MatrikkelnummerResource matrikkelnummer; + @NotNull private @Valid Identifikator soknadsnummer; + private String tiltak; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + identifikators.put("soknadsnummer", this.soknadsnummer); + + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 077b88e9..7265db4b 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 @@ -2,24 +2,24 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class DispensasjonAutomatiskFredaKulturminneResources extends AbstractCollectionResources { +public class DispensasjonAutomatiskFredaKulturminneResources + extends AbstractCollectionResources { - public DispensasjonAutomatiskFredaKulturminneResources(Collection input) { - super(input); - } + public DispensasjonAutomatiskFredaKulturminneResources( + Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 a113594e..11061f91 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 @@ -1,51 +1,43 @@ package no.novari.fint.model.resource.arkiv.kulturminnevern; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class TilskuddFartoyResource extends SaksmappeResource implements FintResource { - // Attributes - @NotBlank - private String fartoyNavn; - @NotBlank - private String kallesignal; - @NotBlank - private String kulturminneId; - @NotNull - private @Valid Identifikator soknadsnummer; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - identifikators.put("soknadsnummer", this.soknadsnummer); + // Attributes + @NotBlank private String fartoyNavn; + @NotBlank private String kallesignal; + @NotBlank private String kulturminneId; + @NotNull private @Valid Identifikator soknadsnummer; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + identifikators.put("soknadsnummer", this.soknadsnummer); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 797a09d4..8279baa2 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TilskuddFartoyResources extends AbstractCollectionResources { - public TilskuddFartoyResources(Collection input) { - super(input); - } + public TilskuddFartoyResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 5f60dd6c..e8e33b2b 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 @@ -1,58 +1,56 @@ package no.novari.fint.model.resource.arkiv.kulturminnevern; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; 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; +import no.novari.fint.model.resource.felles.kompleksedatatyper.MatrikkelnummerResource; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class TilskuddFredaBygningPrivatEieResource extends SaksmappeResource implements FintResource { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = super.getNestedResources(); - if (matrikkelnummer != null) { - result.add(matrikkelnummer); - } - return result; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class TilskuddFredaBygningPrivatEieResource extends SaksmappeResource + implements FintResource { + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = super.getNestedResources(); + if (matrikkelnummer != null) { + result.add(matrikkelnummer); } - private String bygningsnavn; - @NotBlank - private String kulturminneId; - private @Valid MatrikkelnummerResource matrikkelnummer; - private @Valid Identifikator soknadsnummer; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - identifikators.put("soknadsnummer", this.soknadsnummer); + return result; + } - return Collections.unmodifiableMap(identifikators); - } + private String bygningsnavn; + @NotBlank private String kulturminneId; + private @Valid MatrikkelnummerResource matrikkelnummer; + private @Valid Identifikator soknadsnummer; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + identifikators.put("soknadsnummer", this.soknadsnummer); + + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 7c7e7e08..3ec75da5 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 @@ -2,24 +2,24 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class TilskuddFredaBygningPrivatEieResources extends AbstractCollectionResources { +public class TilskuddFredaBygningPrivatEieResources + extends AbstractCollectionResources { - public TilskuddFredaBygningPrivatEieResources(Collection input) { - super(input); - } + public TilskuddFredaBygningPrivatEieResources( + Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 82568c24..b9bcf2eb 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 @@ -1,55 +1,50 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; 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 @NoArgsConstructor @EqualsAndHashCode @ToString public class AdministrativEnhetResource implements FintResource { - // Attributes - private @Valid Periode gyldighetsperiode; - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + private @Valid Periode gyldighetsperiode; + @NotBlank private String navn; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getOrganisasjonselement() { + return getLinks().getOrDefault("organisasjonselement", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getOrganisasjonselement() { - return getLinks().getOrDefault("organisasjonselement", Collections.emptyList()); - } - public void addOrganisasjonselement(Link link) { - addLink("organisasjonselement", link); - } + public void addOrganisasjonselement(Link link) { + addLink("organisasjonselement", link); + } } 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 beeec383..86bfd507 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class AdministrativEnhetResources extends AbstractCollectionResources { +public class AdministrativEnhetResources + extends AbstractCollectionResources { - public AdministrativEnhetResources(Collection input) { - super(input); - } + public AdministrativEnhetResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 dba86d2d..318c1ae1 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 @@ -1,67 +1,48 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class ArkivdelResource implements FintResource { - // Attributes - @NotNull - private @Valid Identifikator systemId; - @NotBlank - private String tittel; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotNull private @Valid Identifikator systemId; + @NotBlank private String tittel; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getKlassifikasjonssystem() { + return getLinks().getOrDefault("klassifikasjonssystem", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getKlassifikasjonssystem() { - return getLinks().getOrDefault("klassifikasjonssystem", Collections.emptyList()); - } - public void addKlassifikasjonssystem(Link link) { - addLink("klassifikasjonssystem", link); - } - @JsonIgnore - public List getRegistrering() { - return getLinks().getOrDefault("registrering", Collections.emptyList()); - } - public void addRegistrering(Link link) { - addLink("registrering", link); - } - @JsonIgnore - public List getMappe() { - return getLinks().getOrDefault("mappe", Collections.emptyList()); - } - public void addMappe(Link link) { - addLink("mappe", link); - } + public void addKlassifikasjonssystem(Link link) { + addLink("klassifikasjonssystem", link); + } } 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 13572981..fa099b0b 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ArkivdelResources extends AbstractCollectionResources { - public ArkivdelResources(Collection input) { - super(input); - } + public ArkivdelResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 097291b0..79a8087f 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 @@ -1,65 +1,67 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.Valid; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; 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 no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class ArkivressursResource implements FintResource { - // Attributes - private @Valid Identifikator kildesystemId; - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("kildesystemId", this.kildesystemId); - identifikators.put("systemId", this.systemId); + // Attributes + private @Valid Identifikator kildesystemId; + private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("kildesystemId", this.kildesystemId); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getPersonalressurs() { + return getLinks().getOrDefault("personalressurs", Collections.emptyList()); + } + + public void addPersonalressurs(Link link) { + addLink("personalressurs", link); + } + + @JsonIgnore + public List getAutorisasjon() { + return getLinks().getOrDefault("autorisasjon", Collections.emptyList()); + } + + public void addAutorisasjon(Link link) { + addLink("autorisasjon", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getTilgang() { + return getLinks().getOrDefault("tilgang", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getPersonalressurs() { - return getLinks().getOrDefault("personalressurs", Collections.emptyList()); - } - public void addPersonalressurs(Link link) { - addLink("personalressurs", link); - } - @JsonIgnore - public List getAutorisasjon() { - return getLinks().getOrDefault("autorisasjon", Collections.emptyList()); - } - public void addAutorisasjon(Link link) { - addLink("autorisasjon", link); - } - @JsonIgnore - public List getTilgang() { - return getLinks().getOrDefault("tilgang", Collections.emptyList()); - } - public void addTilgang(Link link) { - addLink("tilgang", link); - } + public void addTilgang(Link link) { + addLink("tilgang", link); + } } 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 c12dd5a9..40e1ecfd 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ArkivressursResources extends AbstractCollectionResources { - public ArkivressursResources(Collection input) { - super(input); - } + public ArkivressursResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 efe78010..44912806 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 @@ -1,65 +1,65 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class AutorisasjonResource implements FintResource { - // Attributes - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getTilgangsrestriksjon() { + return getLinks().getOrDefault("tilgangsrestriksjon", Collections.emptyList()); + } + + public void addTilgangsrestriksjon(Link link) { + addLink("tilgangsrestriksjon", link); + } + + @JsonIgnore + public List getAdministrativenhet() { + return getLinks().getOrDefault("administrativenhet", Collections.emptyList()); + } + + public void addAdministrativenhet(Link link) { + addLink("administrativenhet", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getArkivressurs() { + return getLinks().getOrDefault("arkivressurs", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getTilgangsrestriksjon() { - return getLinks().getOrDefault("tilgangsrestriksjon", Collections.emptyList()); - } - public void addTilgangsrestriksjon(Link link) { - addLink("tilgangsrestriksjon", link); - } - @JsonIgnore - public List getAdministrativenhet() { - return getLinks().getOrDefault("administrativenhet", Collections.emptyList()); - } - public void addAdministrativenhet(Link link) { - addLink("administrativenhet", link); - } - @JsonIgnore - public List getArkivressurs() { - return getLinks().getOrDefault("arkivressurs", Collections.emptyList()); - } - public void addArkivressurs(Link link) { - addLink("arkivressurs", link); - } + public void addArkivressurs(Link link) { + addLink("arkivressurs", link); + } } 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 aa8f2db9..393920ab 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AutorisasjonResources extends AbstractCollectionResources { - public AutorisasjonResources(Collection input) { - super(input); - } + public AutorisasjonResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 5151c561..72a5f584 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 @@ -1,96 +1,99 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; - -import no.novari.fint.model.resource.FintLinks; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; - -import java.util.Date; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class DokumentbeskrivelseResource implements FintComplexDatatypeObject, FintLinks { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = FintLinks.super.getNestedResources(); - if (dokumentobjekt != null) { - result.addAll(dokumentobjekt); - } - if (part != null) { - result.addAll(part); - } - if (skjerming != null) { - result.add(skjerming); - } - return result; - } - private String beskrivelse; - private Long dokumentnummer; - private List<@Valid DokumentobjektResource> dokumentobjekt; - private List forfatter; - private @Valid Date opprettetDato; - private List<@Valid PartResource> part; - private List referanseArkivdel; - private @Valid SkjermingResource skjerming; - private @Valid Date tilknyttetDato; - @NotBlank - private String tittel; - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getDokumentstatus() { - return getLinks().getOrDefault("dokumentstatus", Collections.emptyList()); + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = FintLinks.super.getNestedResources(); + if (dokumentobjekt != null) { + result.addAll(dokumentobjekt); } - public void addDokumentstatus(Link link) { - addLink("dokumentstatus", link); + if (part != null) { + result.addAll(part); } - @JsonIgnore - public List getDokumentType() { - return getLinks().getOrDefault("dokumentType", Collections.emptyList()); - } - public void addDokumentType(Link link) { - addLink("dokumentType", link); - } - @JsonIgnore - public List getTilknyttetRegistreringSom() { - return getLinks().getOrDefault("tilknyttetRegistreringSom", Collections.emptyList()); - } - public void addTilknyttetRegistreringSom(Link link) { - addLink("tilknyttetRegistreringSom", link); - } - @JsonIgnore - public List getTilknyttetAv() { - return getLinks().getOrDefault("tilknyttetAv", Collections.emptyList()); - } - public void addTilknyttetAv(Link link) { - addLink("tilknyttetAv", link); - } - @JsonIgnore - public List getOpprettetAv() { - return getLinks().getOrDefault("opprettetAv", Collections.emptyList()); - } - public void addOpprettetAv(Link link) { - addLink("opprettetAv", link); + if (skjerming != null) { + result.add(skjerming); } + return result; + } + + private String beskrivelse; + private Long dokumentnummer; + private List<@Valid DokumentobjektResource> dokumentobjekt; + private List forfatter; + private @Valid Date opprettetDato; + private List<@Valid PartResource> part; + private List referanseArkivdel; + private @Valid SkjermingResource skjerming; + private @Valid Date tilknyttetDato; + @NotBlank private String tittel; + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getDokumentstatus() { + return getLinks().getOrDefault("dokumentstatus", Collections.emptyList()); + } + + public void addDokumentstatus(Link link) { + addLink("dokumentstatus", link); + } + + @JsonIgnore + public List getDokumentType() { + return getLinks().getOrDefault("dokumentType", Collections.emptyList()); + } + + public void addDokumentType(Link link) { + addLink("dokumentType", link); + } + + @JsonIgnore + public List getTilknyttetRegistreringSom() { + return getLinks().getOrDefault("tilknyttetRegistreringSom", Collections.emptyList()); + } + + public void addTilknyttetRegistreringSom(Link link) { + addLink("tilknyttetRegistreringSom", link); + } + + @JsonIgnore + public List getTilknyttetAv() { + return getLinks().getOrDefault("tilknyttetAv", Collections.emptyList()); + } + + public void addTilknyttetAv(Link link) { + addLink("tilknyttetAv", link); + } + + @JsonIgnore + public List getOpprettetAv() { + return getLinks().getOrDefault("opprettetAv", Collections.emptyList()); + } + + public void addOpprettetAv(Link link) { + addLink("opprettetAv", link); + } } 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 b7667c7b..65833ef8 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class DokumentbeskrivelseResources extends AbstractCollectionResources { +public class DokumentbeskrivelseResources + extends AbstractCollectionResources { - public DokumentbeskrivelseResources(Collection input) { - super(input); - } + public DokumentbeskrivelseResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 7b6277f1..e9954bd9 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 @@ -1,48 +1,41 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class DokumentfilResource implements FintResource { - // Attributes - @NotBlank - private String data; - private String filnavn; - @NotBlank - private String format; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotBlank private String data; + private String filnavn; + @NotBlank private String format; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 a0f824bf..99e5d5ae 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class DokumentfilResources extends AbstractCollectionResources { - public DokumentfilResources(Collection input) { - super(input); - } + public DokumentfilResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 79692860..d89fe01a 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 @@ -1,66 +1,67 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; - -import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class DokumentobjektResource implements FintComplexDatatypeObject, FintLinks { - // Attributes - private String filstorrelse; - @Deprecated - private String format; - private String formatDetaljer; - private String sjekksum; - private String sjekksumAlgoritme; - private Long versjonsnummer; + // Attributes + private String filstorrelse; + private String formatDetaljer; + private String sjekksum; + private String sjekksumAlgoritme; + private Long versjonsnummer; + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getFilformat() { + return getLinks().getOrDefault("filformat", Collections.emptyList()); + } + + public void addFilformat(Link link) { + addLink("filformat", link); + } + + @JsonIgnore + public List getVariantFormat() { + return getLinks().getOrDefault("variantFormat", Collections.emptyList()); + } + + public void addVariantFormat(Link link) { + addLink("variantFormat", link); + } + + @JsonIgnore + public List getOpprettetAv() { + return getLinks().getOrDefault("opprettetAv", Collections.emptyList()); + } + + public void addOpprettetAv(Link link) { + addLink("opprettetAv", link); + } + + @JsonIgnore + public List getReferanseDokumentfil() { + return getLinks().getOrDefault("referanseDokumentfil", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getFilformat() { - return getLinks().getOrDefault("filformat", Collections.emptyList()); - } - public void addFilformat(Link link) { - addLink("filformat", link); - } - @JsonIgnore - public List getVariantFormat() { - return getLinks().getOrDefault("variantFormat", Collections.emptyList()); - } - public void addVariantFormat(Link link) { - addLink("variantFormat", link); - } - @JsonIgnore - public List getOpprettetAv() { - return getLinks().getOrDefault("opprettetAv", Collections.emptyList()); - } - public void addOpprettetAv(Link link) { - addLink("opprettetAv", link); - } - @JsonIgnore - public List getReferanseDokumentfil() { - return getLinks().getOrDefault("referanseDokumentfil", Collections.emptyList()); - } - public void addReferanseDokumentfil(Link link) { - addLink("referanseDokumentfil", link); - } + public void addReferanseDokumentfil(Link link) { + addLink("referanseDokumentfil", link); + } } 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 c90e431e..efbc1664 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class DokumentobjektResources extends AbstractCollectionResources { - public DokumentobjektResources(Collection input) { - super(input); - } + public DokumentobjektResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 4f4a6692..e423b901 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 @@ -1,66 +1,68 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Map; +import javax.validation.Valid; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import javax.validation.Valid; - -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; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class JournalpostResource extends RegistreringResource implements FintComplexDatatypeObject, FintLinks { - // Attributes - private Long antallVedlegg; - private @Valid Avskrivning avskrivning; - private @Valid Date dokumentetsDato; - private @Valid Date forfallsDato; - private String journalAr; - private @Valid Date journalDato; - private Long journalPostnummer; - private Long journalSekvensnummer; - private @Valid Date mottattDato; - private @Valid Date offentlighetsvurdertDato; - private @Valid Date sendtDato; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class JournalpostResource extends RegistreringResource + implements FintComplexDatatypeObject, FintLinks { + // Attributes + private Long antallVedlegg; + private @Valid Avskrivning avskrivning; + private @Valid Date dokumentetsDato; + private @Valid Date forfallsDato; + private String journalAr; + private @Valid Date journalDato; + private Long journalPostnummer; + private Long journalSekvensnummer; + private @Valid Date mottattDato; + private @Valid Date offentlighetsvurdertDato; + private @Valid Date sendtDato; + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getJournalposttype() { + return getLinks().getOrDefault("journalposttype", Collections.emptyList()); + } + + public void addJournalposttype(Link link) { + addLink("journalposttype", link); + } + + @JsonIgnore + public List getJournalstatus() { + return getLinks().getOrDefault("journalstatus", Collections.emptyList()); + } + + public void addJournalstatus(Link link) { + addLink("journalstatus", link); + } + + @JsonIgnore + public List getJournalenhet() { + return getLinks().getOrDefault("journalenhet", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getJournalposttype() { - return getLinks().getOrDefault("journalposttype", Collections.emptyList()); - } - public void addJournalposttype(Link link) { - addLink("journalposttype", link); - } - @JsonIgnore - public List getJournalstatus() { - return getLinks().getOrDefault("journalstatus", Collections.emptyList()); - } - public void addJournalstatus(Link link) { - addLink("journalstatus", link); - } - @JsonIgnore - public List getJournalenhet() { - return getLinks().getOrDefault("journalenhet", Collections.emptyList()); - } - public void addJournalenhet(Link link) { - addLink("journalenhet", link); - } + public void addJournalenhet(Link link) { + addLink("journalenhet", link); + } } 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 af03cfe4..5481f69b 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class JournalpostResources extends AbstractCollectionResources { - public JournalpostResources(Collection input) { - super(input); - } + public JournalpostResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 c0b89484..262493b4 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 @@ -1,55 +1,50 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; import java.util.List; import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; - -import no.novari.fint.model.resource.FintLinks; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class KlasseResource implements FintComplexDatatypeObject, FintLinks { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = FintLinks.super.getNestedResources(); - if (skjerming != null) { - result.add(skjerming); - } - return result; + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = FintLinks.super.getNestedResources(); + if (skjerming != null) { + result.add(skjerming); } - @NotBlank - private String klasseId; - private Integer rekkefolge; - private @Valid SkjermingResource skjerming; - @NotBlank - private String tittel; + return result; + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getKlassifikasjonssystem() { - return getLinks().getOrDefault("klassifikasjonssystem", Collections.emptyList()); - } - public void addKlassifikasjonssystem(Link link) { - addLink("klassifikasjonssystem", link); - } + @NotBlank private String klasseId; + private Integer rekkefolge; + private @Valid SkjermingResource skjerming; + @NotBlank private String tittel; + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getKlassifikasjonssystem() { + return getLinks().getOrDefault("klassifikasjonssystem", Collections.emptyList()); + } + + public void addKlassifikasjonssystem(Link link) { + addLink("klassifikasjonssystem", link); + } } 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 5bd9ec42..0d9774cc 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KlasseResources extends AbstractCollectionResources { - public KlasseResources(Collection input) { - super(input); - } + public KlasseResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 d18734fd..5ac6e68c 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 @@ -1,79 +1,75 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; 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 @NoArgsConstructor @EqualsAndHashCode @ToString public class KlassifikasjonssystemResource implements FintResource { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = FintResource.super.getNestedResources(); - if (klasse != null) { - result.addAll(klasse); - } - return result; + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = FintResource.super.getNestedResources(); + if (klasse != null) { + result.addAll(klasse); } - private String avsluttetAv; - private @Valid Date avsluttetDato; - private String beskrivelse; - @NotEmpty - private List<@Valid KlasseResource> klasse; - @NotBlank - private String opprettetAv; - @NotNull - private @Valid Date opprettetDato; - @NotNull - private @Valid Identifikator systemId; - @NotBlank - private String tittel; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + return result; + } - return Collections.unmodifiableMap(identifikators); - } + private String avsluttetAv; + private @Valid Date avsluttetDato; + private String beskrivelse; + @NotEmpty private List<@Valid KlasseResource> klasse; + @NotBlank private String opprettetAv; + @NotNull private @Valid Date opprettetDato; + @NotNull private @Valid Identifikator systemId; + @NotBlank private String tittel; - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getKlassifikasjonstype() { - return getLinks().getOrDefault("klassifikasjonstype", Collections.emptyList()); - } - public void addKlassifikasjonstype(Link link) { - addLink("klassifikasjonstype", link); - } - @JsonIgnore - public List getArkivdel() { - return getLinks().getOrDefault("arkivdel", Collections.emptyList()); - } - public void addArkivdel(Link link) { - addLink("arkivdel", link); - } + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getKlassifikasjonstype() { + return getLinks().getOrDefault("klassifikasjonstype", Collections.emptyList()); + } + + public void addKlassifikasjonstype(Link link) { + addLink("klassifikasjonstype", link); + } + + @JsonIgnore + public List getArkivdel() { + return getLinks().getOrDefault("arkivdel", Collections.emptyList()); + } + + public void addArkivdel(Link link) { + addLink("arkivdel", link); + } } 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 53847015..aabc0d3f 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class KlassifikasjonssystemResources extends AbstractCollectionResources { +public class KlassifikasjonssystemResources + extends AbstractCollectionResources { - public KlassifikasjonssystemResources(Collection input) { - super(input); - } + public KlassifikasjonssystemResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 eccabad1..1f94a3be 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 @@ -1,60 +1,58 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.List; +import java.util.Map; +import javax.validation.Valid; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import javax.validation.Valid; - -import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; +import no.novari.fint.model.resource.FintLinks; 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; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class KorrespondansepartResource implements FintComplexDatatypeObject, FintLinks { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = FintLinks.super.getNestedResources(); - if (adresse != null) { - result.add(adresse); - } - if (skjerming != null) { - result.add(skjerming); - } - return result; - } - private @Valid AdresseResource adresse; - private String fodselsnummer; - private @Valid Kontaktinformasjon kontaktinformasjon; - private String kontaktperson; - private String korrespondansepartNavn; - private String organisasjonsnummer; - private @Valid SkjermingResource skjerming; - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getKorrespondanseparttype() { - return getLinks().getOrDefault("korrespondanseparttype", Collections.emptyList()); + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = FintLinks.super.getNestedResources(); + if (adresse != null) { + result.add(adresse); } - public void addKorrespondanseparttype(Link link) { - addLink("korrespondanseparttype", link); + if (skjerming != null) { + result.add(skjerming); } + return result; + } + + private @Valid AdresseResource adresse; + private String fodselsnummer; + private @Valid Kontaktinformasjon kontaktinformasjon; + private String kontaktperson; + private String korrespondansepartNavn; + private String organisasjonsnummer; + private @Valid SkjermingResource skjerming; + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getKorrespondanseparttype() { + return getLinks().getOrDefault("korrespondanseparttype", Collections.emptyList()); + } + + public void addKorrespondanseparttype(Link link) { + addLink("korrespondanseparttype", link); + } } 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 943b8808..d45c6d82 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class KorrespondansepartResources extends AbstractCollectionResources { +public class KorrespondansepartResources + extends AbstractCollectionResources { - public KorrespondansepartResources(Collection input) { - super(input); - } + public KorrespondansepartResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 099e5dd8..29c04ca8 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 @@ -1,94 +1,98 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.Valid; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; 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 no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; 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 @NoArgsConstructor @EqualsAndHashCode @ToString public abstract class MappeResource implements FintAbstractObject, FintLinks { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = FintLinks.super.getNestedResources(); - if (klasse != null) { - result.addAll(klasse); - } - if (merknad != null) { - result.addAll(merknad); - } - if (part != null) { - result.addAll(part); - } - if (skjerming != null) { - result.add(skjerming); - } - return result; - } - private @Valid Date avsluttetDato; - private String beskrivelse; - private List<@Valid KlasseResource> klasse; - private @Valid Identifikator mappeId; - private List<@Valid MerknadResource> merknad; - private List noekkelord; - private String offentligTittel; - private @Valid Date opprettetDato; - private List<@Valid PartResource> part; - private @Valid SkjermingResource skjerming; - private @Valid Identifikator systemId; - private String tittel; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("mappeId", this.mappeId); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getArkivdel() { - return getLinks().getOrDefault("arkivdel", Collections.emptyList()); + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = FintLinks.super.getNestedResources(); + if (klasse != null) { + result.addAll(klasse); } - public void addArkivdel(Link link) { - addLink("arkivdel", link); + if (merknad != null) { + result.addAll(merknad); } - @JsonIgnore - public List getAvsluttetAv() { - return getLinks().getOrDefault("avsluttetAv", Collections.emptyList()); + if (part != null) { + result.addAll(part); } - public void addAvsluttetAv(Link link) { - addLink("avsluttetAv", link); - } - @JsonIgnore - public List getOpprettetAv() { - return getLinks().getOrDefault("opprettetAv", Collections.emptyList()); - } - public void addOpprettetAv(Link link) { - addLink("opprettetAv", link); + if (skjerming != null) { + result.add(skjerming); } + return result; + } + + private @Valid Date avsluttetDato; + private String beskrivelse; + private List<@Valid KlasseResource> klasse; + private @Valid Identifikator mappeId; + private List<@Valid MerknadResource> merknad; + private List noekkelord; + private String offentligTittel; + private @Valid Date opprettetDato; + private List<@Valid PartResource> part; + private @Valid SkjermingResource skjerming; + private @Valid Identifikator systemId; + private String tittel; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("mappeId", this.mappeId); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getArkivdel() { + return getLinks().getOrDefault("arkivdel", Collections.emptyList()); + } + + public void addArkivdel(Link link) { + addLink("arkivdel", link); + } + + @JsonIgnore + public List getAvsluttetAv() { + return getLinks().getOrDefault("avsluttetAv", Collections.emptyList()); + } + + public void addAvsluttetAv(Link link) { + addLink("avsluttetAv", link); + } + + @JsonIgnore + public List getOpprettetAv() { + return getLinks().getOrDefault("opprettetAv", Collections.emptyList()); + } + + public void addOpprettetAv(Link link) { + addLink("opprettetAv", link); + } } 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 b7a34e19..5e436cc7 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class MappeResources extends AbstractCollectionResources { - public MappeResources(Collection input) { - super(input); - } + public MappeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 1f2700cc..43a819d4 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 @@ -1,52 +1,48 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; - -import no.novari.fint.model.resource.FintLinks; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; -import java.util.Date; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class MerknadResource implements FintComplexDatatypeObject, FintLinks { - // Attributes - @NotNull - private @Valid Date merknadsdato; - @NotBlank - private String merknadstekst; + // Attributes + @NotNull private @Valid Date merknadsdato; + @NotBlank private String merknadstekst; + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getMerknadstype() { + return getLinks().getOrDefault("merknadstype", Collections.emptyList()); + } + + public void addMerknadstype(Link link) { + addLink("merknadstype", link); + } + + @JsonIgnore + public List getMerknadRegistrertAv() { + return getLinks().getOrDefault("merknadRegistrertAv", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getMerknadstype() { - return getLinks().getOrDefault("merknadstype", Collections.emptyList()); - } - public void addMerknadstype(Link link) { - addLink("merknadstype", link); - } - @JsonIgnore - public List getMerknadRegistrertAv() { - return getLinks().getOrDefault("merknadRegistrertAv", Collections.emptyList()); - } - public void addMerknadRegistrertAv(Link link) { - addLink("merknadRegistrertAv", link); - } + public void addMerknadRegistrertAv(Link link) { + addLink("merknadRegistrertAv", link); + } } 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 b6525eaf..6bf15620 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class MerknadResources extends AbstractCollectionResources { - public MerknadResources(Collection input) { - super(input); - } + public MerknadResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 7cd4eff8..de2f834e 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 @@ -1,58 +1,54 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; import java.util.List; import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; - -import no.novari.fint.model.resource.FintLinks; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; +import no.novari.fint.model.resource.FintLinks; 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; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class PartResource implements FintComplexDatatypeObject, FintLinks { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = FintLinks.super.getNestedResources(); - if (adresse != null) { - result.add(adresse); - } - return result; + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = FintLinks.super.getNestedResources(); + if (adresse != null) { + result.add(adresse); } - private @Valid AdresseResource adresse; - private String fodselsnummer; - private @Valid Kontaktinformasjon kontaktinformasjon; - private String kontaktperson; - private String organisasjonsnummer; - @NotBlank - private String partNavn; + return result; + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getPartRolle() { - return getLinks().getOrDefault("partRolle", Collections.emptyList()); - } - public void addPartRolle(Link link) { - addLink("partRolle", link); - } + private @Valid AdresseResource adresse; + private String fodselsnummer; + private @Valid Kontaktinformasjon kontaktinformasjon; + private String kontaktperson; + private String organisasjonsnummer; + @NotBlank private String partNavn; + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getPartRolle() { + return getLinks().getOrDefault("partRolle", Collections.emptyList()); + } + + public void addPartRolle(Link link) { + addLink("partRolle", link); + } } 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 30275739..cfff8ea2 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PartResources extends AbstractCollectionResources { - public PartResources(Collection input) { - super(input); - } + public PartResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 61cbba8a..cdcb053a 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 @@ -1,116 +1,122 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; - -import no.novari.fint.model.resource.FintLinks; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; -import java.util.Date; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public abstract class RegistreringResource implements FintAbstractObject, FintLinks { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = FintLinks.super.getNestedResources(); - if (dokumentbeskrivelse != null) { - result.addAll(dokumentbeskrivelse); - } - if (klasse != null) { - result.add(klasse); - } - if (korrespondansepart != null) { - result.addAll(korrespondansepart); - } - if (merknad != null) { - result.addAll(merknad); - } - if (part != null) { - result.addAll(part); - } - if (skjerming != null) { - result.add(skjerming); - } - return result; - } - private @Valid Date arkivertDato; - private String beskrivelse; - private List<@Valid DokumentbeskrivelseResource> dokumentbeskrivelse; - private List forfatter; - private @Valid KlasseResource klasse; - private List<@Valid KorrespondansepartResource> korrespondansepart; - private List<@Valid MerknadResource> merknad; - private List nokkelord; - private String offentligTittel; - private @Valid Date opprettetDato; - private List<@Valid PartResource> part; - private List referanseArkivDel; - private String registreringsId; - private @Valid SkjermingResource skjerming; - @NotBlank - private String tittel; - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getTilgangsgruppe() { - return getLinks().getOrDefault("tilgangsgruppe", Collections.emptyList()); - } - public void addTilgangsgruppe(Link link) { - addLink("tilgangsgruppe", link); + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = FintLinks.super.getNestedResources(); + if (dokumentbeskrivelse != null) { + result.addAll(dokumentbeskrivelse); } - @JsonIgnore - public List getAdministrativEnhet() { - return getLinks().getOrDefault("administrativEnhet", Collections.emptyList()); + if (klasse != null) { + result.add(klasse); } - public void addAdministrativEnhet(Link link) { - addLink("administrativEnhet", link); + if (korrespondansepart != null) { + result.addAll(korrespondansepart); } - @JsonIgnore - public List getArkivdel() { - return getLinks().getOrDefault("arkivdel", Collections.emptyList()); + if (merknad != null) { + result.addAll(merknad); } - public void addArkivdel(Link link) { - addLink("arkivdel", link); + if (part != null) { + result.addAll(part); } - @JsonIgnore - public List getSaksbehandler() { - return getLinks().getOrDefault("saksbehandler", Collections.emptyList()); - } - public void addSaksbehandler(Link link) { - addLink("saksbehandler", link); - } - @JsonIgnore - public List getArkivertAv() { - return getLinks().getOrDefault("arkivertAv", Collections.emptyList()); - } - public void addArkivertAv(Link link) { - addLink("arkivertAv", link); - } - @JsonIgnore - public List getOpprettetAv() { - return getLinks().getOrDefault("opprettetAv", Collections.emptyList()); - } - public void addOpprettetAv(Link link) { - addLink("opprettetAv", link); + if (skjerming != null) { + result.add(skjerming); } + return result; + } + + private @Valid Date arkivertDato; + private String beskrivelse; + private List<@Valid DokumentbeskrivelseResource> dokumentbeskrivelse; + private List forfatter; + private @Valid KlasseResource klasse; + private List<@Valid KorrespondansepartResource> korrespondansepart; + private List<@Valid MerknadResource> merknad; + private List nokkelord; + private String offentligTittel; + private @Valid Date opprettetDato; + private List<@Valid PartResource> part; + private List referanseArkivDel; + private String registreringsId; + private @Valid SkjermingResource skjerming; + @NotBlank private String tittel; + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getTilgangsgruppe() { + return getLinks().getOrDefault("tilgangsgruppe", Collections.emptyList()); + } + + public void addTilgangsgruppe(Link link) { + addLink("tilgangsgruppe", link); + } + + @JsonIgnore + public List getAdministrativEnhet() { + return getLinks().getOrDefault("administrativEnhet", Collections.emptyList()); + } + + public void addAdministrativEnhet(Link link) { + addLink("administrativEnhet", link); + } + + @JsonIgnore + public List getArkivdel() { + return getLinks().getOrDefault("arkivdel", Collections.emptyList()); + } + + public void addArkivdel(Link link) { + addLink("arkivdel", link); + } + + @JsonIgnore + public List getSaksbehandler() { + return getLinks().getOrDefault("saksbehandler", Collections.emptyList()); + } + + public void addSaksbehandler(Link link) { + addLink("saksbehandler", link); + } + + @JsonIgnore + public List getArkivertAv() { + return getLinks().getOrDefault("arkivertAv", Collections.emptyList()); + } + + public void addArkivertAv(Link link) { + addLink("arkivertAv", link); + } + + @JsonIgnore + public List getOpprettetAv() { + return getLinks().getOrDefault("opprettetAv", Collections.emptyList()); + } + + public void addOpprettetAv(Link link) { + addLink("opprettetAv", link); + } } 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 add39375..0cadf13e 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class RegistreringResources extends AbstractCollectionResources { - public RegistreringResources(Collection input) { - super(input); - } + public RegistreringResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 d3ea3a43..b05be874 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 @@ -1,37 +1,33 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class SakResource extends SaksmappeResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 5573ac43..a0db75fd 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SakResources extends AbstractCollectionResources { - public SakResources(Collection input) { - super(input); - } + public SakResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 02e72b05..e9c17dce 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 @@ -1,102 +1,108 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.Valid; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; 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 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.FintLinks; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public abstract class SaksmappeResource extends MappeResource implements FintAbstractObject, FintLinks { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = super.getNestedResources(); - if (arkivnotat != null) { - result.addAll(arkivnotat); - } - if (journalpost != null) { - result.addAll(journalpost); - } - return result; - } - private List<@Valid RegistreringResource> arkivnotat; - private List<@Valid JournalpostResource> journalpost; - private String saksaar; - private @Valid Date saksdato; - private String sakssekvensnummer; - private @Valid Date utlaantDato; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public abstract class SaksmappeResource extends MappeResource + implements FintAbstractObject, FintLinks { + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = super.getNestedResources(); + if (journalpost != null) { + result.addAll(journalpost); } + return result; + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getSaksmappetype() { - return getLinks().getOrDefault("saksmappetype", Collections.emptyList()); - } - public void addSaksmappetype(Link link) { - addLink("saksmappetype", link); - } - @JsonIgnore - public List getSaksstatus() { - return getLinks().getOrDefault("saksstatus", Collections.emptyList()); - } - public void addSaksstatus(Link link) { - addLink("saksstatus", link); - } - @JsonIgnore - public List getTilgangsgruppe() { - return getLinks().getOrDefault("tilgangsgruppe", Collections.emptyList()); - } - public void addTilgangsgruppe(Link link) { - addLink("tilgangsgruppe", link); - } - @JsonIgnore - public List getJournalenhet() { - return getLinks().getOrDefault("journalenhet", Collections.emptyList()); - } - public void addJournalenhet(Link link) { - addLink("journalenhet", link); - } - @JsonIgnore - public List getAdministrativEnhet() { - return getLinks().getOrDefault("administrativEnhet", Collections.emptyList()); - } - public void addAdministrativEnhet(Link link) { - addLink("administrativEnhet", link); - } - @JsonIgnore - public List getSaksansvarlig() { - return getLinks().getOrDefault("saksansvarlig", Collections.emptyList()); - } - public void addSaksansvarlig(Link link) { - addLink("saksansvarlig", link); - } + private List<@Valid JournalpostResource> journalpost; + private String saksaar; + private @Valid Date saksdato; + private String sakssekvensnummer; + private @Valid Date utlaantDato; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getSaksmappetype() { + return getLinks().getOrDefault("saksmappetype", Collections.emptyList()); + } + + public void addSaksmappetype(Link link) { + addLink("saksmappetype", link); + } + + @JsonIgnore + public List getSaksstatus() { + return getLinks().getOrDefault("saksstatus", Collections.emptyList()); + } + + public void addSaksstatus(Link link) { + addLink("saksstatus", link); + } + + @JsonIgnore + public List getTilgangsgruppe() { + return getLinks().getOrDefault("tilgangsgruppe", Collections.emptyList()); + } + + public void addTilgangsgruppe(Link link) { + addLink("tilgangsgruppe", link); + } + + @JsonIgnore + public List getJournalenhet() { + return getLinks().getOrDefault("journalenhet", Collections.emptyList()); + } + + public void addJournalenhet(Link link) { + addLink("journalenhet", link); + } + + @JsonIgnore + public List getAdministrativEnhet() { + return getLinks().getOrDefault("administrativEnhet", Collections.emptyList()); + } + + public void addAdministrativEnhet(Link link) { + addLink("administrativEnhet", link); + } + + @JsonIgnore + public List getSaksansvarlig() { + return getLinks().getOrDefault("saksansvarlig", Collections.emptyList()); + } + + public void addSaksansvarlig(Link link) { + addLink("saksansvarlig", link); + } } 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 cc604c47..630a09d7 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SaksmappeResources extends AbstractCollectionResources { - public SaksmappeResources(Collection input) { - super(input); - } + public SaksmappeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 3e04b9af..2532909c 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 @@ -1,21 +1,18 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; - -import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor @@ -23,22 +20,24 @@ @ToString public class SkjermingResource implements FintComplexDatatypeObject, FintLinks { - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getSkjermingshjemmel() { - return getLinks().getOrDefault("skjermingshjemmel", Collections.emptyList()); - } - public void addSkjermingshjemmel(Link link) { - addLink("skjermingshjemmel", link); - } - @JsonIgnore - public List getTilgangsrestriksjon() { - return getLinks().getOrDefault("tilgangsrestriksjon", Collections.emptyList()); - } - public void addTilgangsrestriksjon(Link link) { - addLink("tilgangsrestriksjon", link); - } + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getSkjermingshjemmel() { + return getLinks().getOrDefault("skjermingshjemmel", Collections.emptyList()); + } + + public void addSkjermingshjemmel(Link link) { + addLink("skjermingshjemmel", link); + } + + @JsonIgnore + public List getTilgangsrestriksjon() { + return getLinks().getOrDefault("tilgangsrestriksjon", Collections.emptyList()); + } + + public void addTilgangsrestriksjon(Link link) { + addLink("tilgangsrestriksjon", link); + } } 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 bad33026..55bab703 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SkjermingResources extends AbstractCollectionResources { - public SkjermingResources(Collection input) { - super(input); - } + public SkjermingResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 140dbf17..39de6cae 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 @@ -1,74 +1,75 @@ package no.novari.fint.model.resource.arkiv.noark; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class TilgangResource implements FintResource { - // Attributes - @NotNull - private @Valid Identifikator systemId; - @NotBlank - private String tittel; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotNull private @Valid Identifikator systemId; + @NotBlank private String tittel; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getRolle() { + return getLinks().getOrDefault("rolle", Collections.emptyList()); + } + + public void addRolle(Link link) { + addLink("rolle", link); + } + + @JsonIgnore + public List getAdministrativEnhet() { + return getLinks().getOrDefault("administrativEnhet", Collections.emptyList()); + } + + public void addAdministrativEnhet(Link link) { + addLink("administrativEnhet", link); + } + + @JsonIgnore + public List getArkivdel() { + return getLinks().getOrDefault("arkivdel", Collections.emptyList()); + } + + public void addArkivdel(Link link) { + addLink("arkivdel", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getArkivressurs() { + return getLinks().getOrDefault("arkivressurs", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getRolle() { - return getLinks().getOrDefault("rolle", Collections.emptyList()); - } - public void addRolle(Link link) { - addLink("rolle", link); - } - @JsonIgnore - public List getAdministrativEnhet() { - return getLinks().getOrDefault("administrativEnhet", Collections.emptyList()); - } - public void addAdministrativEnhet(Link link) { - addLink("administrativEnhet", link); - } - @JsonIgnore - public List getArkivdel() { - return getLinks().getOrDefault("arkivdel", Collections.emptyList()); - } - public void addArkivdel(Link link) { - addLink("arkivdel", link); - } - @JsonIgnore - public List getArkivressurs() { - return getLinks().getOrDefault("arkivressurs", Collections.emptyList()); - } - public void addArkivressurs(Link link) { - addLink("arkivressurs", link); - } + public void addArkivressurs(Link link) { + addLink("arkivressurs", link); + } } 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 0b8061b0..7379fbbd 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TilgangResources extends AbstractCollectionResources { - public TilgangResources(Collection input) { - super(input); - } + public TilgangResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 cc3c4cda..bb534169 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 @@ -1,73 +1,75 @@ package no.novari.fint.model.resource.arkiv.personal; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - -import no.novari.fint.model.resource.FintLinks; -import no.novari.fint.model.resource.FintResource; -import no.novari.fint.model.resource.Link; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; import no.novari.fint.model.resource.arkiv.noark.SaksmappeResource; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class PersonalmappeResource extends SaksmappeResource implements FintResource { - // Attributes - @NotNull - private @Valid Personnavn navn; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + // Attributes + @NotNull private @Valid Personnavn navn; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getPerson() { + return getLinks().getOrDefault("person", Collections.emptyList()); + } + + public void addPerson(Link link) { + addLink("person", link); + } + + @JsonIgnore + public List getLeder() { + return getLinks().getOrDefault("leder", Collections.emptyList()); + } + + public void addLeder(Link link) { + addLink("leder", link); + } + + @JsonIgnore + public List getArbeidssted() { + return getLinks().getOrDefault("arbeidssted", Collections.emptyList()); + } + + public void addArbeidssted(Link link) { + addLink("arbeidssted", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getPersonalressurs() { + return getLinks().getOrDefault("personalressurs", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getPerson() { - return getLinks().getOrDefault("person", Collections.emptyList()); - } - public void addPerson(Link link) { - addLink("person", link); - } - @JsonIgnore - public List getLeder() { - return getLinks().getOrDefault("leder", Collections.emptyList()); - } - public void addLeder(Link link) { - addLink("leder", link); - } - @JsonIgnore - public List getArbeidssted() { - return getLinks().getOrDefault("arbeidssted", Collections.emptyList()); - } - public void addArbeidssted(Link link) { - addLink("arbeidssted", link); - } - @JsonIgnore - public List getPersonalressurs() { - return getLinks().getOrDefault("personalressurs", Collections.emptyList()); - } - public void addPersonalressurs(Link link) { - addLink("personalressurs", link); - } + public void addPersonalressurs(Link link) { + addLink("personalressurs", link); + } } 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 ad285534..2f866616 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PersonalmappeResources extends AbstractCollectionResources { - public PersonalmappeResources(Collection input) { - super(input); - } + public PersonalmappeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 dd28b4ab..c80a40b3 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 @@ -1,44 +1,38 @@ package no.novari.fint.model.resource.arkiv.samferdsel; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; 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.constraints.*; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; 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 @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class SoknadDrosjeloyveResource extends SaksmappeResource implements FintResource { - // Attributes - @NotBlank - private String organisasjonsnavn; - @NotBlank - private String organisasjonsnummer; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + // Attributes + @NotBlank private String organisasjonsnavn; + @NotBlank private String organisasjonsnummer; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 9da872f7..5fa9acc4 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class SoknadDrosjeloyveResources extends AbstractCollectionResources { +public class SoknadDrosjeloyveResources + extends AbstractCollectionResources { - public SoknadDrosjeloyveResources(Collection input) { - super(input); - } + public SoknadDrosjeloyveResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/FellesActions.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/FellesActions.java index 57d0e08f..c5185633 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/FellesActions.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/FellesActions.java @@ -4,29 +4,25 @@ import java.util.List; public enum FellesActions { - - GET_KONTAKTPERSON, - GET_ALL_KONTAKTPERSON, - UPDATE_KONTAKTPERSON, - GET_PERSON, - GET_ALL_PERSON, - UPDATE_PERSON, - GET_VIRKSOMHET, - GET_ALL_VIRKSOMHET, - UPDATE_VIRKSOMHET - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(FellesActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_KONTAKTPERSON, + GET_ALL_KONTAKTPERSON, + UPDATE_KONTAKTPERSON, + GET_PERSON, + GET_ALL_PERSON, + UPDATE_PERSON, + GET_VIRKSOMHET, + GET_ALL_VIRKSOMHET, + UPDATE_VIRKSOMHET; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(FellesActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 1f65224d..3f50f1fe 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 @@ -1,84 +1,77 @@ package no.novari.fint.model.felles; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; -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 @EqualsAndHashCode @ToString -public class Kontaktperson implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Kontaktperson implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + KONTAKTPERSON("kontaktperson", "no.novari.fint.model.felles.Person", NONE_TO_MANY, "parorende"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - @Deprecated - private Boolean foreldreansvar; - private @Valid Kontaktinformasjon kontaktinformasjon; - private @Valid Personnavn navn; - @NotNull - private @Valid Identifikator systemId; - @NotBlank - private String type; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private @Valid Kontaktinformasjon kontaktinformasjon; + private @Valid Personnavn navn; + @NotNull private @Valid Identifikator systemId; + @NotBlank private String type; } 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 1a722663..03cc1f43 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 @@ -1,96 +1,99 @@ package no.novari.fint.model.felles; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; +import no.novari.fint.model.felles.basisklasser.Aktor; import no.novari.fint.model.felles.kompleksedatatyper.Adresse; -import java.util.Date; - +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; -import no.novari.fint.model.felles.basisklasser.Aktor; - -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Person extends Aktor implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Person extends Aktor implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + STATSBORGERSKAP( + "statsborgerskap", "no.novari.fint.model.felles.kodeverk.iso.Landkode", NONE_TO_MANY, null), + KOMMUNE("kommune", "no.novari.fint.model.felles.kodeverk.Kommune", NONE_TO_ONE, null), + KJONN("kjonn", "no.novari.fint.model.felles.kodeverk.iso.Kjonn", NONE_TO_ONE, null), + FORELDREANSVAR( + "foreldreansvar", "no.novari.fint.model.felles.Person", NONE_TO_MANY, "foreldre"), + MALFORM("malform", "no.novari.fint.model.felles.kodeverk.iso.Sprak", NONE_TO_ONE, null), + PERSONALRESSURS( + "personalressurs", + "no.novari.fint.model.administrasjon.personal.Personalressurs", + NONE_TO_ONE, + "person"), + MORSMAL("morsmal", "no.novari.fint.model.felles.kodeverk.iso.Sprak", NONE_TO_ONE, null), + PARORENDE( + "parorende", "no.novari.fint.model.felles.Kontaktperson", NONE_TO_MANY, "kontaktperson"), + FORELDRE("foreldre", "no.novari.fint.model.felles.Person", NONE_TO_MANY, "foreldreansvar"), + LARLING("larling", "no.novari.fint.model.utdanning.larling.Larling", NONE_TO_MANY, "person"), + ELEV("elev", "no.novari.fint.model.utdanning.elev.Elev", NONE_TO_ONE, "person"), + OTUNGDOM("otungdom", "no.novari.fint.model.utdanning.ot.OtUngdom", NONE_TO_ONE, "person"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("fodselsnummer", this.fodselsnummer); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("fodselsnummer", this.fodselsnummer); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private String bilde; - private @Valid Adresse bostedsadresse; - private Date fodselsdato; - @NotNull - private @Valid Identifikator fodselsnummer; - @NotNull - private @Valid Personnavn navn; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private String bilde; + private @Valid Adresse bostedsadresse; + private Date fodselsdato; + @NotNull private @Valid Identifikator fodselsnummer; + @NotNull private @Valid Personnavn navn; } 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 da58b7b0..782dc1bf 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 @@ -1,77 +1,74 @@ package no.novari.fint.model.felles; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Enhet; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Virksomhet extends Enhet implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - LARLING("larling", "no.novari.fint.model.utdanning.larling.Larling", NONE_TO_MANY); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Virksomhet extends Enhet implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + LARLING("larling", "no.novari.fint.model.utdanning.larling.Larling", NONE_TO_MANY, "bedrift"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - identifikators.put("virksomhetsId", this.virksomhetsId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + identifikators.put("virksomhetsId", this.virksomhetsId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Identifikator virksomhetsId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Identifikator virksomhetsId; } 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 45c02cf5..8be85b48 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 @@ -1,38 +1,27 @@ package no.novari.fint.model.felles.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; - +import javax.validation.Valid; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import javax.validation.Valid; - -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.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; +import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public abstract class Aktor implements FintAbstractObject { +public abstract class Aktor implements FintAbstractObject { - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - private @Valid Kontaktinformasjon kontaktinformasjon; - private @Valid Adresse postadresse; + @JsonIgnore private final boolean writeable = true; + private @Valid Kontaktinformasjon kontaktinformasjon; + private @Valid Adresse postadresse; } diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/BasisklasserActions.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/BasisklasserActions.java index aac13efc..22ff351a 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/BasisklasserActions.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/basisklasser/BasisklasserActions.java @@ -4,20 +4,17 @@ import java.util.List; public enum BasisklasserActions { - - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(BasisklasserActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + ; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(BasisklasserActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 fa768d25..73245627 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 @@ -1,54 +1,41 @@ package no.novari.fint.model.felles.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; - import java.util.Collections; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; 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.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -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 @EqualsAndHashCode @ToString -public abstract class Begrep implements FintAbstractObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; - private @Valid Periode gyldighetsperiode; - @NotBlank - private String kode; - @NotBlank - private String navn; - private Boolean passiv; - @NotNull - private @Valid Identifikator systemId; +public abstract class Begrep implements FintAbstractObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; + private @Valid Periode gyldighetsperiode; + @NotBlank private String kode; + @NotBlank private String navn; + private Boolean passiv; + @NotNull private @Valid Identifikator systemId; } 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 336f2b7c..d00dccd6 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 @@ -1,49 +1,39 @@ package no.novari.fint.model.felles.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; - import java.util.Collections; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import javax.validation.Valid; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; 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.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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public abstract class Enhet extends Aktor implements FintAbstractObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("organisasjonsnummer", this.organisasjonsnummer); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = true; - private @Valid Adresse forretningsadresse; - private String organisasjonsnavn; - private @Valid Identifikator organisasjonsnummer; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public abstract class Enhet extends Aktor implements FintAbstractObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("organisasjonsnummer", this.organisasjonsnummer); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = true; + private @Valid Adresse forretningsadresse; + private String organisasjonsnavn; + private @Valid Identifikator organisasjonsnummer; } 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 eb90da45..0f38911e 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 @@ -1,72 +1,70 @@ package no.novari.fint.model.felles.kodeverk; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Fylke extends Begrep implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - KOMMUNE("kommune", "no.novari.fint.model.felles.kodeverk.Kommune", NONE_TO_MANY); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Fylke extends Begrep implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + KOMMUNE("kommune", "no.novari.fint.model.felles.kodeverk.Kommune", NONE_TO_MANY, "fylke"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/KodeverkActions.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/KodeverkActions.java index e7c936d9..8823f722 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/KodeverkActions.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/KodeverkActions.java @@ -4,29 +4,25 @@ import java.util.List; public enum KodeverkActions { - - GET_FYLKE, - GET_ALL_FYLKE, - UPDATE_FYLKE, - GET_KOMMUNE, - GET_ALL_KOMMUNE, - UPDATE_KOMMUNE, - GET_VALUTA, - GET_ALL_VALUTA, - UPDATE_VALUTA - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(KodeverkActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_FYLKE, + GET_ALL_FYLKE, + UPDATE_FYLKE, + GET_KOMMUNE, + GET_ALL_KOMMUNE, + UPDATE_KOMMUNE, + GET_VALUTA, + GET_ALL_VALUTA, + UPDATE_VALUTA; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(KodeverkActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 1b1c75a4..3159b63f 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 @@ -1,72 +1,70 @@ package no.novari.fint.model.felles.kodeverk; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Kommune extends Begrep implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - FYLKE("fylke", "no.novari.fint.model.felles.kodeverk.Fylke", ONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Kommune extends Begrep implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + FYLKE("fylke", "no.novari.fint.model.felles.kodeverk.Fylke", ONE_TO_ONE, "kommune"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 9929d70c..d76dea04 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 @@ -1,52 +1,39 @@ package no.novari.fint.model.felles.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; - import java.util.Collections; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; 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; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Valuta implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("bokstavkode", this.bokstavkode); - identifikators.put("nummerkode", this.nummerkode); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; - @NotNull - private @Valid Identifikator bokstavkode; - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator nummerkode; +public class Valuta implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("bokstavkode", this.bokstavkode); + identifikators.put("nummerkode", this.nummerkode); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; + @NotNull private @Valid Identifikator bokstavkode; + @NotBlank private String navn; + @NotNull private @Valid Identifikator nummerkode; } diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/IsoActions.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/IsoActions.java index dba47e7d..fa5c53ba 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/IsoActions.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kodeverk/iso/IsoActions.java @@ -4,29 +4,23 @@ import java.util.List; public enum IsoActions { - - GET_KJONN, - GET_ALL_KJONN, - UPDATE_KJONN, - GET_LANDKODE, - GET_ALL_LANDKODE, - UPDATE_LANDKODE, - GET_SPRAK, - GET_ALL_SPRAK, - UPDATE_SPRAK - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(IsoActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_KJONN, + GET_ALL_KJONN, + UPDATE_KJONN, + GET_LANDKODE, + GET_ALL_LANDKODE, + UPDATE_LANDKODE, + GET_SPRAK, + GET_ALL_SPRAK, + UPDATE_SPRAK; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(IsoActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new)); + } } - 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 c5643ca1..4728f172 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.felles.kodeverk.iso; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Kjonn extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Kjonn extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 204dc9d0..d7936ef0 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.felles.kodeverk.iso; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Landkode extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Landkode extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 7724c7e6..1317932e 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.felles.kodeverk.iso; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Sprak extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Sprak extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 b7c6ef16..4cf0ce55 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 @@ -1,65 +1,61 @@ package no.novari.fint.model.felles.kompleksedatatyper; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; import java.util.List; - -import no.novari.fint.model.FintMultiplicity; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintComplexDatatypeObject; -import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; 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 @EqualsAndHashCode @ToString -public class Adresse implements FintComplexDatatypeObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - LAND("land", "no.novari.fint.model.felles.kodeverk.iso.Landkode", NONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; - - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } +public class Adresse implements FintComplexDatatypeObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + LAND("land", "no.novari.fint.model.felles.kodeverk.iso.Landkode", NONE_TO_ONE, null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - return Collections.unmodifiableList(relations); - } + return Collections.unmodifiableList(relations); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private List adresselinje; - private String postnummer; - private String poststed; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private List adresselinje; + private String postnummer; + private String poststed; } 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 2ccac4e5..23f025ab 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 @@ -1,37 +1,26 @@ package no.novari.fint.model.felles.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; - +import javax.validation.Valid; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import javax.validation.Valid; -import javax.validation.constraints.*; -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.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 @EqualsAndHashCode @ToString -public class Identifikator implements FintComplexDatatypeObject, FintIdentifikator { +public class Identifikator implements FintComplexDatatypeObject, FintIdentifikator { - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - private @Valid Periode gyldighetsperiode; - @NotBlank - private String identifikatorverdi; + @JsonIgnore private final boolean writeable = false; + private @Valid Periode gyldighetsperiode; + @NotBlank private String identifikatorverdi; } diff --git a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/KompleksedatatyperActions.java b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/KompleksedatatyperActions.java index 22cea417..6f92bb9c 100644 --- a/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/KompleksedatatyperActions.java +++ b/fint-felles-model-java/src/main/java/no/novari/fint/model/felles/kompleksedatatyper/KompleksedatatyperActions.java @@ -4,20 +4,17 @@ import java.util.List; public enum KompleksedatatyperActions { - - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(KompleksedatatyperActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + ; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(KompleksedatatyperActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 65defbcc..dfba451f 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 @@ -1,36 +1,27 @@ package no.novari.fint.model.felles.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; - +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; -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.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 @EqualsAndHashCode @ToString -public class Kontaktinformasjon implements FintComplexDatatypeObject { +public class Kontaktinformasjon implements FintComplexDatatypeObject { - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - private String epostadresse; - private String mobiltelefonnummer; - private String nettsted; - private String sip; - private String telefonnummer; + @JsonIgnore private final boolean writeable = false; + private String epostadresse; + private String mobiltelefonnummer; + private String nettsted; + private String sip; + private String telefonnummer; } 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 0b0a3b00..22c08e5a 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 @@ -1,68 +1,65 @@ package no.novari.fint.model.felles.kompleksedatatyper; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; import java.util.List; import javax.validation.Valid; - -import no.novari.fint.model.FintMultiplicity; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintComplexDatatypeObject; -import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; 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 @EqualsAndHashCode @ToString -public class Matrikkelnummer implements FintComplexDatatypeObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - KOMMUNENUMMER("kommunenummer", "no.novari.fint.model.felles.kodeverk.Kommune", NONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +public class Matrikkelnummer implements FintComplexDatatypeObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + KOMMUNENUMMER( + "kommunenummer", "no.novari.fint.model.felles.kodeverk.Kommune", NONE_TO_ONE, null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - return Collections.unmodifiableList(relations); - } + return Collections.unmodifiableList(relations); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private @Valid Adresse adresse; - private String bruksnummer; - private String festenummer; - private String gardsnummer; - private String seksjonsnummer; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private @Valid Adresse adresse; + private String bruksnummer; + private String festenummer; + private String gardsnummer; + private String seksjonsnummer; } 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 f4a277fa..80f9a86d 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 @@ -1,39 +1,27 @@ package no.novari.fint.model.felles.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Date; +import javax.validation.Valid; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import javax.validation.Valid; -import javax.validation.constraints.*; -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.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 @EqualsAndHashCode @ToString -public class Periode implements FintComplexDatatypeObject { +public class Periode implements FintComplexDatatypeObject { - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - private String beskrivelse; - private @Valid Date slutt; - @NotNull - private @Valid Date start; + @JsonIgnore private final boolean writeable = false; + private String beskrivelse; + private @Valid Date slutt; + @NotNull private @Valid Date start; } 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 02ea14dd..fb503972 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 @@ -1,38 +1,25 @@ package no.novari.fint.model.felles.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; - +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import javax.validation.constraints.*; -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.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 @EqualsAndHashCode @ToString -public class Personnavn implements FintComplexDatatypeObject { +public class Personnavn implements FintComplexDatatypeObject { - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @NotBlank - private String etternavn; - @NotBlank - private String fornavn; - private String mellomnavn; + @JsonIgnore private final boolean writeable = false; + @NotBlank private String etternavn; + @NotBlank private String fornavn; + private String mellomnavn; } diff --git a/fint-felles-resource-model-java-tests/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 index 2ed95a03..c9adfe0e 100644 --- a/fint-felles-resource-model-java-tests/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 @@ -1,11 +1,10 @@ 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 @Import(TestConfiguration.class) -public class TestApplication { -} +public class TestApplication {} diff --git a/fint-felles-resource-model-java-tests/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 index f318f21b..e7aaabd5 100644 --- a/fint-felles-resource-model-java-tests/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 @@ -10,11 +10,9 @@ @Configuration public class TestConfiguration { - @Bean - @Primary - public ObjectMapper objectMapper() { - return Jackson2ObjectMapperBuilder.json() - .modules(new Jackson2HalModule()) - .build(); - } + @Bean + @Primary + public ObjectMapper objectMapper() { + return Jackson2ObjectMapperBuilder.json().modules(new Jackson2HalModule()).build(); + } } 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 0ca7d282..2c00332e 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 @@ -1,68 +1,52 @@ package no.novari.fint.model.resource.felles; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; -import no.novari.fint.model.resource.FintResource; -import no.novari.fint.model.resource.Link; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class KontaktpersonResource implements FintResource { - // Attributes - @Deprecated - private Boolean foreldreansvar; - private @Valid Kontaktinformasjon kontaktinformasjon; - private @Valid Personnavn navn; - @NotNull - private @Valid Identifikator systemId; - @NotBlank - private String type; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + private @Valid Kontaktinformasjon kontaktinformasjon; + private @Valid Personnavn navn; + @NotNull private @Valid Identifikator systemId; + @NotBlank private String type; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getKontaktperson() { + return getLinks().getOrDefault("kontaktperson", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getKontaktperson() { - return getLinks().getOrDefault("kontaktperson", Collections.emptyList()); - } - public void addKontaktperson(Link link) { - addLink("kontaktperson", link); - } - @Deprecated - @JsonIgnore - public List getPerson() { - return getLinks().getOrDefault("person", Collections.emptyList()); - } - @Deprecated - public void addPerson(Link link) { - addLink("person", link); - } + public void addKontaktperson(Link link) { + addLink("kontaktperson", link); + } } 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 d56c76d4..b3d938b2 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KontaktpersonResources extends AbstractCollectionResources { - public KontaktpersonResources(Collection input) { - super(input); - } + public KontaktpersonResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 c9dac7f4..5329a336 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 @@ -1,147 +1,165 @@ package no.novari.fint.model.resource.felles; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; 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; - -import no.novari.fint.model.felles.kompleksedatatyper.Personnavn; import no.novari.fint.model.resource.felles.basisklasser.AktorResource; +import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class PersonResource extends AktorResource implements FintResource { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = super.getNestedResources(); - if (bostedsadresse != null) { - result.add(bostedsadresse); - } - return result; - } - private String bilde; - private @Valid AdresseResource bostedsadresse; - private Date fodselsdato; - @NotNull - private @Valid Identifikator fodselsnummer; - @NotNull - private @Valid Personnavn navn; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("fodselsnummer", this.fodselsnummer); - - return Collections.unmodifiableMap(identifikators); - } + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = super.getNestedResources(); + if (bostedsadresse != null) { + result.add(bostedsadresse); + } + return result; + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getStatsborgerskap() { - return getLinks().getOrDefault("statsborgerskap", Collections.emptyList()); - } - public void addStatsborgerskap(Link link) { - addLink("statsborgerskap", link); - } - @JsonIgnore - public List getKommune() { - return getLinks().getOrDefault("kommune", Collections.emptyList()); - } - public void addKommune(Link link) { - addLink("kommune", link); - } - @JsonIgnore - public List getKjonn() { - return getLinks().getOrDefault("kjonn", Collections.emptyList()); - } - public void addKjonn(Link link) { - addLink("kjonn", link); - } - @JsonIgnore - public List getForeldreansvar() { - return getLinks().getOrDefault("foreldreansvar", Collections.emptyList()); - } - public void addForeldreansvar(Link link) { - addLink("foreldreansvar", link); - } - @JsonIgnore - public List getMalform() { - return getLinks().getOrDefault("malform", Collections.emptyList()); - } - public void addMalform(Link link) { - addLink("malform", link); - } - @JsonIgnore - public List getPersonalressurs() { - return getLinks().getOrDefault("personalressurs", Collections.emptyList()); - } - public void addPersonalressurs(Link link) { - addLink("personalressurs", link); - } - @JsonIgnore - public List getMorsmal() { - return getLinks().getOrDefault("morsmal", Collections.emptyList()); - } - public void addMorsmal(Link link) { - addLink("morsmal", link); - } - @JsonIgnore - public List getParorende() { - return getLinks().getOrDefault("parorende", Collections.emptyList()); - } - public void addParorende(Link link) { - addLink("parorende", link); - } - @JsonIgnore - public List getForeldre() { - return getLinks().getOrDefault("foreldre", Collections.emptyList()); - } - public void addForeldre(Link link) { - addLink("foreldre", link); - } - @JsonIgnore - public List getLarling() { - return getLinks().getOrDefault("larling", Collections.emptyList()); - } - public void addLarling(Link link) { - addLink("larling", link); - } - @JsonIgnore - public List getElev() { - return getLinks().getOrDefault("elev", Collections.emptyList()); - } - public void addElev(Link link) { - addLink("elev", link); - } - @JsonIgnore - public List getOtungdom() { - return getLinks().getOrDefault("otungdom", Collections.emptyList()); - } - public void addOtungdom(Link link) { - addLink("otungdom", link); - } + private String bilde; + private @Valid AdresseResource bostedsadresse; + private Date fodselsdato; + @NotNull private @Valid Identifikator fodselsnummer; + @NotNull private @Valid Personnavn navn; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("fodselsnummer", this.fodselsnummer); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getStatsborgerskap() { + return getLinks().getOrDefault("statsborgerskap", Collections.emptyList()); + } + + public void addStatsborgerskap(Link link) { + addLink("statsborgerskap", link); + } + + @JsonIgnore + public List getKommune() { + return getLinks().getOrDefault("kommune", Collections.emptyList()); + } + + public void addKommune(Link link) { + addLink("kommune", link); + } + + @JsonIgnore + public List getKjonn() { + return getLinks().getOrDefault("kjonn", Collections.emptyList()); + } + + public void addKjonn(Link link) { + addLink("kjonn", link); + } + + @JsonIgnore + public List getForeldreansvar() { + return getLinks().getOrDefault("foreldreansvar", Collections.emptyList()); + } + + public void addForeldreansvar(Link link) { + addLink("foreldreansvar", link); + } + + @JsonIgnore + public List getMalform() { + return getLinks().getOrDefault("malform", Collections.emptyList()); + } + + public void addMalform(Link link) { + addLink("malform", link); + } + + @JsonIgnore + public List getPersonalressurs() { + return getLinks().getOrDefault("personalressurs", Collections.emptyList()); + } + + public void addPersonalressurs(Link link) { + addLink("personalressurs", link); + } + + @JsonIgnore + public List getMorsmal() { + return getLinks().getOrDefault("morsmal", Collections.emptyList()); + } + + public void addMorsmal(Link link) { + addLink("morsmal", link); + } + + @JsonIgnore + public List getParorende() { + return getLinks().getOrDefault("parorende", Collections.emptyList()); + } + + public void addParorende(Link link) { + addLink("parorende", link); + } + + @JsonIgnore + public List getForeldre() { + return getLinks().getOrDefault("foreldre", Collections.emptyList()); + } + + public void addForeldre(Link link) { + addLink("foreldre", link); + } + + @JsonIgnore + public List getLarling() { + return getLinks().getOrDefault("larling", Collections.emptyList()); + } + + public void addLarling(Link link) { + addLink("larling", link); + } + + @JsonIgnore + public List getElev() { + return getLinks().getOrDefault("elev", Collections.emptyList()); + } + + public void addElev(Link link) { + addLink("elev", link); + } + + @JsonIgnore + public List getOtungdom() { + return getLinks().getOrDefault("otungdom", Collections.emptyList()); + } + + public void addOtungdom(Link link) { + addLink("otungdom", link); + } } 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 ae277d7d..8c9e11ff 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PersonResources extends AbstractCollectionResources { - public PersonResources(Collection input) { - super(input); - } + public PersonResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 10e4ab78..eab0e148 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 @@ -1,53 +1,49 @@ package no.novari.fint.model.resource.felles; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class VirksomhetResource extends EnhetResource implements FintResource { - // Attributes - @NotNull - private @Valid Identifikator virksomhetsId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - identifikators.put("virksomhetsId", this.virksomhetsId); + // Attributes + @NotNull private @Valid Identifikator virksomhetsId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + identifikators.put("virksomhetsId", this.virksomhetsId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getLarling() { + return getLinks().getOrDefault("larling", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getLarling() { - return getLinks().getOrDefault("larling", Collections.emptyList()); - } - public void addLarling(Link link) { - addLink("larling", link); - } + public void addLarling(Link link) { + addLink("larling", link); + } } 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 ee71ca6a..cd14604c 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class VirksomhetResources extends AbstractCollectionResources { - public VirksomhetResources(Collection input) { - super(input); - } + public VirksomhetResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 501de565..f7620f05 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 @@ -1,22 +1,19 @@ package no.novari.fint.model.resource.felles.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.List; +import java.util.Map; +import javax.validation.Valid; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.List; -import java.util.Map; -import javax.validation.Valid; - -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.FintLinks; +import no.novari.fint.model.resource.Link; import no.novari.fint.model.resource.felles.kompleksedatatyper.AdresseResource; @Data @@ -24,20 +21,20 @@ @EqualsAndHashCode @ToString public abstract class AktorResource implements FintAbstractObject, FintLinks { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = FintLinks.super.getNestedResources(); - if (postadresse != null) { - result.add(postadresse); - } - return result; + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = FintLinks.super.getNestedResources(); + if (postadresse != null) { + result.add(postadresse); } - private @Valid Kontaktinformasjon kontaktinformasjon; - private @Valid AdresseResource postadresse; + return result; + } + + private @Valid Kontaktinformasjon kontaktinformasjon; + private @Valid AdresseResource postadresse; - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 6a416e83..61a03091 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AktorResources extends AbstractCollectionResources { - public AktorResources(Collection input) { - super(input); - } + public AktorResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 f4970e73..699f074a 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 @@ -1,50 +1,44 @@ package no.novari.fint.model.resource.felles.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; 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.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public abstract class BegrepResource implements FintAbstractObject, FintLinks { - // Attributes - private @Valid Periode gyldighetsperiode; - @NotBlank - private String kode; - @NotBlank - private String navn; - private Boolean passiv; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + private @Valid Periode gyldighetsperiode; + @NotBlank private String kode; + @NotBlank private String navn; + private Boolean passiv; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 5de6962f..c28be550 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class BegrepResources extends AbstractCollectionResources { - public BegrepResources(Collection input) { - super(input); - } + public BegrepResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 fd1f7edb..846034a4 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 @@ -1,53 +1,52 @@ package no.novari.fint.model.resource.felles.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.Valid; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; 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 no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; 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 @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public abstract class EnhetResource extends AktorResource implements FintAbstractObject, FintLinks { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = super.getNestedResources(); - if (forretningsadresse != null) { - result.add(forretningsadresse); - } - return result; + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = super.getNestedResources(); + if (forretningsadresse != null) { + result.add(forretningsadresse); } - private @Valid AdresseResource forretningsadresse; - private String organisasjonsnavn; - private @Valid Identifikator organisasjonsnummer; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("organisasjonsnummer", this.organisasjonsnummer); + return result; + } - return Collections.unmodifiableMap(identifikators); - } + private @Valid AdresseResource forretningsadresse; + private String organisasjonsnavn; + private @Valid Identifikator organisasjonsnummer; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("organisasjonsnummer", this.organisasjonsnummer); + + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 089f62ec..1b9bf3f8 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class EnhetResources extends AbstractCollectionResources { - public EnhetResources(Collection input) { - super(input); - } + public EnhetResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 5fbf9fdf..dc9ef167 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 @@ -1,46 +1,43 @@ package no.novari.fint.model.resource.felles.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class FylkeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getKommune() { + return getLinks().getOrDefault("kommune", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getKommune() { - return getLinks().getOrDefault("kommune", Collections.emptyList()); - } - public void addKommune(Link link) { - addLink("kommune", link); - } + public void addKommune(Link link) { + addLink("kommune", link); + } } 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 d3b6628e..932e9f3a 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FylkeResources extends AbstractCollectionResources { - public FylkeResources(Collection input) { - super(input); - } + public FylkeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 37968169..ac4a88fb 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 @@ -1,46 +1,43 @@ package no.novari.fint.model.resource.felles.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class KommuneResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getFylke() { + return getLinks().getOrDefault("fylke", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getFylke() { - return getLinks().getOrDefault("fylke", Collections.emptyList()); - } - public void addFylke(Link link) { - addLink("fylke", link); - } + public void addFylke(Link link) { + addLink("fylke", link); + } } 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 f9c5b5cc..0694f2b7 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KommuneResources extends AbstractCollectionResources { - public KommuneResources(Collection input) { - super(input); - } + public KommuneResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 a5ca348f..96c8dc71 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 @@ -1,48 +1,41 @@ package no.novari.fint.model.resource.felles.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class ValutaResource implements FintResource { - // Attributes - @NotNull - private @Valid Identifikator bokstavkode; - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator nummerkode; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("bokstavkode", this.bokstavkode); - identifikators.put("nummerkode", this.nummerkode); + // Attributes + @NotNull private @Valid Identifikator bokstavkode; + @NotBlank private String navn; + @NotNull private @Valid Identifikator nummerkode; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("bokstavkode", this.bokstavkode); + identifikators.put("nummerkode", this.nummerkode); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 95874955..d6312302 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ValutaResources extends AbstractCollectionResources { - public ValutaResources(Collection input) { - super(input); - } + public ValutaResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 0186221b..0432e07e 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.felles.kodeverk.iso; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class KjonnResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 30aff77e..985206ab 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KjonnResources extends AbstractCollectionResources { - public KjonnResources(Collection input) { - super(input); - } + public KjonnResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 bb9a773a..bc207175 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.felles.kodeverk.iso; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class LandkodeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 995e4cbf..7d4db02f 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class LandkodeResources extends AbstractCollectionResources { - public LandkodeResources(Collection input) { - super(input); - } + public LandkodeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 0dd80e1c..db01af7f 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.felles.kodeverk.iso; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class SprakResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 c94f30c9..db4ebfa9 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SprakResources extends AbstractCollectionResources { - public SprakResources(Collection input) { - super(input); - } + public SprakResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 8597fcba..6f6bbe87 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 @@ -1,41 +1,38 @@ package no.novari.fint.model.resource.felles.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; - -import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class AdresseResource implements FintComplexDatatypeObject, FintLinks { - // Attributes - private List adresselinje; - private String postnummer; - private String poststed; + // Attributes + private List adresselinje; + private String postnummer; + private String poststed; + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getLand() { + return getLinks().getOrDefault("land", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getLand() { - return getLinks().getOrDefault("land", Collections.emptyList()); - } - public void addLand(Link link) { - addLink("land", link); - } + public void addLand(Link link) { + addLink("land", link); + } } 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 977eeee1..54187247 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AdresseResources extends AbstractCollectionResources { - public AdresseResources(Collection input) { - super(input); - } + public AdresseResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 5b1d5008..5c87110a 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 @@ -1,53 +1,51 @@ package no.novari.fint.model.resource.felles.kompleksedatatyper; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.List; +import java.util.Map; +import javax.validation.Valid; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import javax.validation.Valid; - -import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class MatrikkelnummerResource implements FintComplexDatatypeObject, FintLinks { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = FintLinks.super.getNestedResources(); - if (adresse != null) { - result.add(adresse); - } - return result; + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = FintLinks.super.getNestedResources(); + if (adresse != null) { + result.add(adresse); } - private @Valid AdresseResource adresse; - private String bruksnummer; - private String festenummer; - private String gardsnummer; - private String seksjonsnummer; + return result; + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getKommunenummer() { - return getLinks().getOrDefault("kommunenummer", Collections.emptyList()); - } - public void addKommunenummer(Link link) { - addLink("kommunenummer", link); - } + private @Valid AdresseResource adresse; + private String bruksnummer; + private String festenummer; + private String gardsnummer; + private String seksjonsnummer; + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getKommunenummer() { + return getLinks().getOrDefault("kommunenummer", Collections.emptyList()); + } + + public void addKommunenummer(Link link) { + addLink("kommunenummer", link); + } } 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 df3be991..81783def 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class MatrikkelnummerResources extends AbstractCollectionResources { - public MatrikkelnummerResources(Collection input) { - super(input); - } + public MatrikkelnummerResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 c7dcfff7..2125ad26 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 @@ -1,90 +1,87 @@ package no.novari.fint.model.okonomi.faktura; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Adresse; -import java.util.Date; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Faktura implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - FAKTURAGRUNNLAG("fakturagrunnlag", "no.novari.fint.model.okonomi.faktura.Fakturagrunnlag", ONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +public class Faktura implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + FAKTURAGRUNNLAG( + "fakturagrunnlag", + "no.novari.fint.model.okonomi.faktura.Fakturagrunnlag", + ONE_TO_ONE, + "faktura"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("fakturanummer", this.fakturanummer); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("fakturanummer", this.fakturanummer); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private @Valid Adresse adresse; - @NotNull - private Long belop; - private Boolean betalt; - @NotNull - private Date dato; - @NotNull - private @Valid Identifikator fakturanummer; - private Boolean fakturert; - @NotNull - private Date forfallsdato; - private Boolean kreditert; - @NotBlank - private String mottaker; - private Long restbelop; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private @Valid Adresse adresse; + @NotNull private Long belop; + private Boolean betalt; + @NotNull private Date dato; + @NotNull private @Valid Identifikator fakturanummer; + private Boolean fakturert; + @NotNull private Date forfallsdato; + private Boolean kreditert; + @NotBlank private String mottaker; + private Long restbelop; } diff --git a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/FakturaActions.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/FakturaActions.java index 2ced0296..489f5060 100644 --- a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/FakturaActions.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/faktura/FakturaActions.java @@ -4,29 +4,25 @@ import java.util.List; public enum FakturaActions { - - GET_FAKTURA, - GET_ALL_FAKTURA, - UPDATE_FAKTURA, - GET_FAKTURAGRUNNLAG, - GET_ALL_FAKTURAGRUNNLAG, - UPDATE_FAKTURAGRUNNLAG, - GET_FAKTURAUTSTEDER, - GET_ALL_FAKTURAUTSTEDER, - UPDATE_FAKTURAUTSTEDER - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(FakturaActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_FAKTURA, + GET_ALL_FAKTURA, + UPDATE_FAKTURA, + GET_FAKTURAGRUNNLAG, + GET_ALL_FAKTURAGRUNNLAG, + UPDATE_FAKTURAGRUNNLAG, + GET_FAKTURAUTSTEDER, + GET_ALL_FAKTURAUTSTEDER, + UPDATE_FAKTURAUTSTEDER; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(FakturaActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 406893e2..f047f60f 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 @@ -1,86 +1,86 @@ package no.novari.fint.model.okonomi.faktura; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; - -import java.util.Date; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Fakturagrunnlag implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Fakturagrunnlag implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + FAKTURA( + "faktura", "no.novari.fint.model.okonomi.faktura.Faktura", NONE_TO_MANY, "fakturagrunnlag"), + FAKTURAUTSTEDER( + "fakturautsteder", + "no.novari.fint.model.okonomi.faktura.Fakturautsteder", + ONE_TO_ONE, + "fakturagrunnlag"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("ordrenummer", this.ordrenummer); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("ordrenummer", this.ordrenummer); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private Long avgiftsbelop; - @NotEmpty - private List<@Valid Fakturalinje> fakturalinjer; - private Date leveringsdato; - @NotNull - private @Valid Fakturamottaker mottaker; - private Long nettobelop; - @NotNull - private @Valid Identifikator ordrenummer; - private Long totalbelop; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private Long avgiftsbelop; + @NotEmpty private List<@Valid Fakturalinje> fakturalinjer; + private Date leveringsdato; + @NotNull private @Valid Fakturamottaker mottaker; + private Long nettobelop; + @NotNull private @Valid Identifikator ordrenummer; + private Long totalbelop; } 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 8dd6350e..643b81d1 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 @@ -1,67 +1,61 @@ package no.novari.fint.model.okonomi.faktura; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; import java.util.List; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintComplexDatatypeObject; -import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; 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 @EqualsAndHashCode @ToString -public class Fakturalinje implements FintComplexDatatypeObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - VARE("vare", "no.novari.fint.model.okonomi.kodeverk.Vare", ONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; - - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } +public class Fakturalinje implements FintComplexDatatypeObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + VARE("vare", "no.novari.fint.model.okonomi.kodeverk.Vare", ONE_TO_ONE, null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - return Collections.unmodifiableList(relations); - } + return Collections.unmodifiableList(relations); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private Float antall; - private List fritekst; - @NotNull - private Long pris; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + @NotNull private Float antall; + private List fritekst; + @NotNull private Long pris; } 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 7caf8e19..8e5d4c27 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 @@ -1,62 +1,58 @@ package no.novari.fint.model.okonomi.faktura; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; import java.util.List; - -import no.novari.fint.model.FintMultiplicity; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintComplexDatatypeObject; -import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; 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 @EqualsAndHashCode @ToString -public class Fakturamottaker implements FintComplexDatatypeObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - PERSON("person", "no.novari.fint.model.felles.Person", ONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; - - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } +public class Fakturamottaker implements FintComplexDatatypeObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + PERSON("person", "no.novari.fint.model.felles.Person", ONE_TO_ONE, null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - return Collections.unmodifiableList(relations); - } + return Collections.unmodifiableList(relations); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 f9c10773..7a7e8525 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 @@ -1,79 +1,84 @@ package no.novari.fint.model.okonomi.faktura; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Fakturautsteder implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Fakturautsteder implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ORGANISASJONSELEMENT( + "organisasjonselement", + "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", + NONE_TO_ONE, + null), + FAKTURAGRUNNLAG( + "fakturagrunnlag", + "no.novari.fint.model.okonomi.faktura.Fakturagrunnlag", + NONE_TO_MANY, + "fakturautsteder"), + VARE("vare", "no.novari.fint.model.okonomi.kodeverk.Vare", NONE_TO_MANY, "fakturautsteder"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotBlank private String navn; + @NotNull private @Valid Identifikator systemId; } diff --git a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/KodeverkActions.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/KodeverkActions.java index a17d9386..6652eb46 100644 --- a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/KodeverkActions.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/kodeverk/KodeverkActions.java @@ -4,26 +4,22 @@ import java.util.List; public enum KodeverkActions { - - GET_MERVERDIAVGIFT, - GET_ALL_MERVERDIAVGIFT, - UPDATE_MERVERDIAVGIFT, - GET_VARE, - GET_ALL_VARE, - UPDATE_VARE - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(KodeverkActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_MERVERDIAVGIFT, + GET_ALL_MERVERDIAVGIFT, + UPDATE_MERVERDIAVGIFT, + GET_VARE, + GET_ALL_VARE, + UPDATE_VARE; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(KodeverkActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 efad0676..eaf42514 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 @@ -1,46 +1,35 @@ package no.novari.fint.model.okonomi.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; - import java.util.Collections; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; -import no.novari.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Merverdiavgift extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; - @NotNull - private Long sats; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Merverdiavgift extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; + @NotNull private Long sats; } 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 98065909..eecb971a 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 @@ -1,80 +1,81 @@ package no.novari.fint.model.okonomi.kodeverk; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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.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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Vare extends Begrep implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Vare extends Begrep implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + FAKTURAUTSTEDER( + "fakturautsteder", + "no.novari.fint.model.okonomi.faktura.Fakturautsteder", + ONE_TO_ONE, + "vare"), + MERVERDIAVGIFT( + "merverdiavgift", "no.novari.fint.model.okonomi.kodeverk.Merverdiavgift", ONE_TO_ONE, null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - @NotBlank - private String enhet; - private @Valid Kontostreng kontering; - @NotNull - private Long pris; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + @NotBlank private String enhet; + private @Valid Kontostreng kontering; + @NotNull private Long pris; } 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 e4e8c6c8..6777a5e9 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 @@ -1,41 +1,29 @@ package no.novari.fint.model.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Date; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import javax.validation.constraints.*; -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.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 @EqualsAndHashCode @ToString -public class Bilag implements FintComplexDatatypeObject { +public class Bilag implements FintComplexDatatypeObject { - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @NotNull - private Date bilagsdato; - private String bilagsnummer; - private String data; - private String filnavn; - private String referanse; - private String url; + @JsonIgnore private final boolean writeable = true; + @NotNull private Date bilagsdato; + private String bilagsnummer; + private String data; + private String filnavn; + private String referanse; + private String url; } 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 e27edaf8..38cf678e 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 @@ -1,80 +1,81 @@ package no.novari.fint.model.okonomi.regnskap; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Leverandor implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Leverandor implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + PERSON("person", "no.novari.fint.model.felles.Person", NONE_TO_ONE, null), + LEVERANDORGRUPPE( + "leverandorgruppe", + "no.novari.fint.model.okonomi.regnskap.Leverandorgruppe", + NONE_TO_ONE, + null), + VIRKSOMHET("virksomhet", "no.novari.fint.model.felles.Virksomhet", NONE_TO_ONE, null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("leverandornummer", this.leverandornummer); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("leverandornummer", this.leverandornummer); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private String kontonummer; - private @Valid Identifikator leverandornummer; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private String kontonummer; + private @Valid Identifikator leverandornummer; + @NotNull private @Valid Identifikator systemId; } 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 9174f646..45dbca1a 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 @@ -1,77 +1,74 @@ package no.novari.fint.model.okonomi.regnskap; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Leverandorgruppe implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - LEVERANDOR("leverandor", "no.novari.fint.model.okonomi.regnskap.Leverandor", NONE_TO_MANY); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +public class Leverandorgruppe implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + LEVERANDOR( + "leverandor", "no.novari.fint.model.okonomi.regnskap.Leverandor", NONE_TO_MANY, null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + @NotBlank private String navn; + @NotNull private @Valid Identifikator systemId; } 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 2b99d16b..5ef82944 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 @@ -1,82 +1,80 @@ package no.novari.fint.model.okonomi.regnskap; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.administrasjon.kompleksedatatyper.Kontostreng; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Postering implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - TRANSAKSJON("transaksjon", "no.novari.fint.model.okonomi.regnskap.Transaksjon", NONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +public class Postering implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + TRANSAKSJON( + "transaksjon", + "no.novari.fint.model.okonomi.regnskap.Transaksjon", + NONE_TO_ONE, + "postering"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("posteringsId", this.posteringsId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("posteringsId", this.posteringsId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private Long belop; - @NotNull - private Boolean debet; - @NotNull - private @Valid Kontostreng kontering; - @NotNull - private @Valid Identifikator posteringsId; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + @NotNull private Long belop; + @NotNull private Boolean debet; + @NotNull private @Valid Kontostreng kontering; + @NotNull private @Valid Identifikator posteringsId; } diff --git a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/RegnskapActions.java b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/RegnskapActions.java index 5f4b92a8..f70c4437 100644 --- a/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/RegnskapActions.java +++ b/fint-okonomi-model-java/src/main/java/no/novari/fint/model/okonomi/regnskap/RegnskapActions.java @@ -4,32 +4,28 @@ import java.util.List; public enum RegnskapActions { - - GET_LEVERANDOR, - GET_ALL_LEVERANDOR, - UPDATE_LEVERANDOR, - GET_LEVERANDORGRUPPE, - GET_ALL_LEVERANDORGRUPPE, - UPDATE_LEVERANDORGRUPPE, - GET_POSTERING, - GET_ALL_POSTERING, - UPDATE_POSTERING, - GET_TRANSAKSJON, - GET_ALL_TRANSAKSJON, - UPDATE_TRANSAKSJON - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(RegnskapActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_LEVERANDOR, + GET_ALL_LEVERANDOR, + UPDATE_LEVERANDOR, + GET_LEVERANDORGRUPPE, + GET_ALL_LEVERANDORGRUPPE, + UPDATE_LEVERANDORGRUPPE, + GET_POSTERING, + GET_ALL_POSTERING, + UPDATE_POSTERING, + GET_TRANSAKSJON, + GET_ALL_TRANSAKSJON, + UPDATE_TRANSAKSJON; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(RegnskapActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 d9b01ac8..5d36b183 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 @@ -1,87 +1,89 @@ package no.novari.fint.model.okonomi.regnskap; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; - -import java.util.Date; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Transaksjon implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Transaksjon implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + LEVERANDOR("leverandor", "no.novari.fint.model.okonomi.regnskap.Leverandor", NONE_TO_ONE, null), + ANSVARLIG( + "ansvarlig", + "no.novari.fint.model.administrasjon.personal.Personalressurs", + NONE_TO_ONE, + null), + VALUTA("valuta", "no.novari.fint.model.felles.kodeverk.Valuta", ONE_TO_ONE, null), + POSTERING( + "postering", "no.novari.fint.model.okonomi.regnskap.Postering", ONE_TO_MANY, "transaksjon"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("transaksjonsId", this.transaksjonsId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("transaksjonsId", this.transaksjonsId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private Long belop; - private String beskrivelse; - private List<@Valid Bilag> bilag; - @NotNull - private Date forfallsdato; - private Date oppdateringstidspunkt; - private @Valid Identifikator transaksjonsId; - private Date transaksjonstidspunkt; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + @NotNull private Long belop; + private String beskrivelse; + private List<@Valid Bilag> bilag; + @NotNull private Date forfallsdato; + private Date oppdateringstidspunkt; + @NotNull private @Valid Identifikator transaksjonsId; + private Date transaksjonstidspunkt; } 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 f6563b1c..9e1d150c 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 @@ -1,75 +1,69 @@ package no.novari.fint.model.resource.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; 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; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class FakturaResource implements FintResource { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = FintResource.super.getNestedResources(); - if (adresse != null) { - result.add(adresse); - } - return result; + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = FintResource.super.getNestedResources(); + if (adresse != null) { + result.add(adresse); } - private @Valid AdresseResource adresse; - @NotNull - private Long belop; - private Boolean betalt; - @NotNull - private Date dato; - @NotNull - private @Valid Identifikator fakturanummer; - private Boolean fakturert; - @NotNull - private Date forfallsdato; - private Boolean kreditert; - @NotBlank - private String mottaker; - private Long restbelop; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("fakturanummer", this.fakturanummer); + return result; + } - return Collections.unmodifiableMap(identifikators); - } + private @Valid AdresseResource adresse; + @NotNull private Long belop; + private Boolean betalt; + @NotNull private Date dato; + @NotNull private @Valid Identifikator fakturanummer; + private Boolean fakturert; + @NotNull private Date forfallsdato; + private Boolean kreditert; + @NotBlank private String mottaker; + private Long restbelop; - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getFakturagrunnlag() { - return getLinks().getOrDefault("fakturagrunnlag", Collections.emptyList()); - } - public void addFakturagrunnlag(Link link) { - addLink("fakturagrunnlag", link); - } + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("fakturanummer", this.fakturanummer); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getFakturagrunnlag() { + return getLinks().getOrDefault("fakturagrunnlag", Collections.emptyList()); + } + + public void addFakturagrunnlag(Link link) { + addLink("fakturagrunnlag", link); + } } 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 629f4699..2960f8ba 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FakturaResources extends AbstractCollectionResources { - public FakturaResources(Collection input) { - super(input); - } + public FakturaResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 26b5f3dc..34d57974 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 @@ -1,80 +1,77 @@ package no.novari.fint.model.resource.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; 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 @NoArgsConstructor @EqualsAndHashCode @ToString public class FakturagrunnlagResource implements FintResource { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = FintResource.super.getNestedResources(); - if (fakturalinjer != null) { - result.addAll(fakturalinjer); - } - if (mottaker != null) { - result.add(mottaker); - } - return result; + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = FintResource.super.getNestedResources(); + if (fakturalinjer != null) { + result.addAll(fakturalinjer); } - private Long avgiftsbelop; - @NotEmpty - private List<@Valid FakturalinjeResource> fakturalinjer; - private Date leveringsdato; - @NotNull - private @Valid FakturamottakerResource mottaker; - private Long nettobelop; - @NotNull - private @Valid Identifikator ordrenummer; - private Long totalbelop; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("ordrenummer", this.ordrenummer); - - return Collections.unmodifiableMap(identifikators); + if (mottaker != null) { + result.add(mottaker); } + return result; + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getFaktura() { - return getLinks().getOrDefault("faktura", Collections.emptyList()); - } - public void addFaktura(Link link) { - addLink("faktura", link); - } - @JsonIgnore - public List getFakturautsteder() { - return getLinks().getOrDefault("fakturautsteder", Collections.emptyList()); - } - public void addFakturautsteder(Link link) { - addLink("fakturautsteder", link); - } + private Long avgiftsbelop; + @NotEmpty private List<@Valid FakturalinjeResource> fakturalinjer; + private Date leveringsdato; + @NotNull private @Valid FakturamottakerResource mottaker; + private Long nettobelop; + @NotNull private @Valid Identifikator ordrenummer; + private Long totalbelop; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("ordrenummer", this.ordrenummer); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getFaktura() { + return getLinks().getOrDefault("faktura", Collections.emptyList()); + } + + public void addFaktura(Link link) { + addLink("faktura", link); + } + + @JsonIgnore + public List getFakturautsteder() { + return getLinks().getOrDefault("fakturautsteder", Collections.emptyList()); + } + + public void addFakturautsteder(Link link) { + addLink("fakturautsteder", link); + } } 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 4a42f573..b4842601 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FakturagrunnlagResources extends AbstractCollectionResources { - public FakturagrunnlagResources(Collection input) { - super(input); - } + public FakturagrunnlagResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 18e42a1e..4101442b 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 @@ -1,44 +1,38 @@ package no.novari.fint.model.resource.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import javax.validation.constraints.*; - -import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class FakturalinjeResource implements FintComplexDatatypeObject, FintLinks { - // Attributes - @NotNull - private Float antall; - private List fritekst; - @NotNull - private Long pris; + // Attributes + @NotNull private Float antall; + private List fritekst; + @NotNull private Long pris; + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getVare() { + return getLinks().getOrDefault("vare", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getVare() { - return getLinks().getOrDefault("vare", Collections.emptyList()); - } - public void addVare(Link link) { - addLink("vare", link); - } + public void addVare(Link link) { + addLink("vare", link); + } } 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 813ebf9d..fb0d5129 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FakturalinjeResources extends AbstractCollectionResources { - public FakturalinjeResources(Collection input) { - super(input); - } + public FakturalinjeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 51fd8544..ea4c9183 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 @@ -1,21 +1,18 @@ package no.novari.fint.model.resource.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; - -import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.FintComplexDatatypeObject; +import no.novari.fint.model.resource.FintLinks; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor @@ -23,15 +20,15 @@ @ToString public class FakturamottakerResource implements FintComplexDatatypeObject, FintLinks { - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getPerson() { - return getLinks().getOrDefault("person", Collections.emptyList()); - } - public void addPerson(Link link) { - addLink("person", link); - } + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getPerson() { + return getLinks().getOrDefault("person", Collections.emptyList()); + } + + public void addPerson(Link link) { + addLink("person", link); + } } 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 f0adba51..e03e4de2 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FakturamottakerResources extends AbstractCollectionResources { - public FakturamottakerResources(Collection input) { - super(input); - } + public FakturamottakerResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 394aac5c..2ce78dac 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 @@ -1,67 +1,66 @@ package no.novari.fint.model.resource.okonomi.faktura; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class FakturautstederResource implements FintResource { - // Attributes - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotBlank private String navn; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getOrganisasjonselement() { + return getLinks().getOrDefault("organisasjonselement", Collections.emptyList()); + } + + public void addOrganisasjonselement(Link link) { + addLink("organisasjonselement", link); + } + + @JsonIgnore + public List getFakturagrunnlag() { + return getLinks().getOrDefault("fakturagrunnlag", Collections.emptyList()); + } + + public void addFakturagrunnlag(Link link) { + addLink("fakturagrunnlag", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getVare() { + return getLinks().getOrDefault("vare", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getOrganisasjonselement() { - return getLinks().getOrDefault("organisasjonselement", Collections.emptyList()); - } - public void addOrganisasjonselement(Link link) { - addLink("organisasjonselement", link); - } - @JsonIgnore - public List getFakturagrunnlag() { - return getLinks().getOrDefault("fakturagrunnlag", Collections.emptyList()); - } - public void addFakturagrunnlag(Link link) { - addLink("fakturagrunnlag", link); - } - @JsonIgnore - public List getVare() { - return getLinks().getOrDefault("vare", Collections.emptyList()); - } - public void addVare(Link link) { - addLink("vare", link); - } + public void addVare(Link link) { + addLink("vare", link); + } } 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 f7b07132..c43cdd09 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FakturautstederResources extends AbstractCollectionResources { - public FakturautstederResources(Collection input) { - super(input); - } + public FakturautstederResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 ba3293a5..44d5235e 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 @@ -1,42 +1,37 @@ package no.novari.fint.model.resource.okonomi.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; 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.constraints.*; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class MerverdiavgiftResource extends Begrep implements FintResource { - // Attributes - @NotNull - private Long sats; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + // Attributes + @NotNull private Long sats; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 ec1bc9fb..12fd8191 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class MerverdiavgiftResources extends AbstractCollectionResources { - public MerverdiavgiftResources(Collection input) { - super(input); - } + public MerverdiavgiftResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 bfd4f289..3addbb07 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 @@ -1,71 +1,70 @@ package no.novari.fint.model.resource.okonomi.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.felles.basisklasser.Begrep; 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; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class VareResource extends Begrep implements FintResource { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = FintResource.super.getNestedResources(); - if (kontering != null) { - result.add(kontering); - } - return result; + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = FintResource.super.getNestedResources(); + if (kontering != null) { + result.add(kontering); } - @NotBlank - private String enhet; - private @Valid KontostrengResource kontering; - @NotNull - private Long pris; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + return result; + } - return Collections.unmodifiableMap(identifikators); - } + @NotBlank private String enhet; + private @Valid KontostrengResource kontering; + @NotNull private Long pris; - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getFakturautsteder() { - return getLinks().getOrDefault("fakturautsteder", Collections.emptyList()); - } - public void addFakturautsteder(Link link) { - addLink("fakturautsteder", link); - } - @JsonIgnore - public List getMerverdiavgift() { - return getLinks().getOrDefault("merverdiavgift", Collections.emptyList()); - } - public void addMerverdiavgift(Link link) { - addLink("merverdiavgift", link); - } + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getFakturautsteder() { + return getLinks().getOrDefault("fakturautsteder", Collections.emptyList()); + } + + public void addFakturautsteder(Link link) { + addLink("fakturautsteder", link); + } + + @JsonIgnore + public List getMerverdiavgift() { + return getLinks().getOrDefault("merverdiavgift", Collections.emptyList()); + } + + public void addMerverdiavgift(Link link) { + addLink("merverdiavgift", link); + } } 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 49bad5cf..f03a78df 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class VareResources extends AbstractCollectionResources { - public VareResources(Collection input) { - super(input); - } + public VareResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 a5e62786..d3677645 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 @@ -1,68 +1,68 @@ package no.novari.fint.model.resource.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class LeverandorResource implements FintResource { - // Attributes - private String kontonummer; - private @Valid Identifikator leverandornummer; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("leverandornummer", this.leverandornummer); - identifikators.put("systemId", this.systemId); + // Attributes + private String kontonummer; + private @Valid Identifikator leverandornummer; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("leverandornummer", this.leverandornummer); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getPerson() { + return getLinks().getOrDefault("person", Collections.emptyList()); + } + + public void addPerson(Link link) { + addLink("person", link); + } + + @JsonIgnore + public List getLeverandorgruppe() { + return getLinks().getOrDefault("leverandorgruppe", Collections.emptyList()); + } + + public void addLeverandorgruppe(Link link) { + addLink("leverandorgruppe", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getVirksomhet() { + return getLinks().getOrDefault("virksomhet", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getPerson() { - return getLinks().getOrDefault("person", Collections.emptyList()); - } - public void addPerson(Link link) { - addLink("person", link); - } - @JsonIgnore - public List getLeverandorgruppe() { - return getLinks().getOrDefault("leverandorgruppe", Collections.emptyList()); - } - public void addLeverandorgruppe(Link link) { - addLink("leverandorgruppe", link); - } - @JsonIgnore - public List getVirksomhet() { - return getLinks().getOrDefault("virksomhet", Collections.emptyList()); - } - public void addVirksomhet(Link link) { - addLink("virksomhet", link); - } + public void addVirksomhet(Link link) { + addLink("virksomhet", link); + } } 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 5387ee12..d06ba9bd 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class LeverandorResources extends AbstractCollectionResources { - public LeverandorResources(Collection input) { - super(input); - } + public LeverandorResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 cfb61247..f24325df 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 @@ -1,53 +1,48 @@ package no.novari.fint.model.resource.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class LeverandorgruppeResource implements FintResource { - // Attributes - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotBlank private String navn; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getLeverandor() { + return getLinks().getOrDefault("leverandor", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getLeverandor() { - return getLinks().getOrDefault("leverandor", Collections.emptyList()); - } - public void addLeverandor(Link link) { - addLink("leverandor", link); - } + public void addLeverandor(Link link) { + addLink("leverandor", link); + } } 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 7a3449db..3aaa9667 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class LeverandorgruppeResources extends AbstractCollectionResources { +public class LeverandorgruppeResources + extends AbstractCollectionResources { - public LeverandorgruppeResources(Collection input) { - super(input); - } + public LeverandorgruppeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 932ae23b..fc191128 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 @@ -1,25 +1,22 @@ package no.novari.fint.model.resource.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; 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 @@ -27,41 +24,39 @@ @EqualsAndHashCode @ToString public class PosteringResource implements FintResource { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = FintResource.super.getNestedResources(); - if (kontering != null) { - result.add(kontering); - } - return result; + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = FintResource.super.getNestedResources(); + if (kontering != null) { + result.add(kontering); } - @NotNull - private Long belop; - @NotNull - private Boolean debet; - @NotNull - private @Valid KontostrengResource kontering; - @NotNull - private @Valid Identifikator posteringsId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("posteringsId", this.posteringsId); + return result; + } - return Collections.unmodifiableMap(identifikators); - } + @NotNull private Long belop; + @NotNull private Boolean debet; + @NotNull private @Valid KontostrengResource kontering; + @NotNull private @Valid Identifikator posteringsId; - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getTransaksjon() { - return getLinks().getOrDefault("transaksjon", Collections.emptyList()); - } - public void addTransaksjon(Link link) { - addLink("transaksjon", link); - } + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("posteringsId", this.posteringsId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getTransaksjon() { + return getLinks().getOrDefault("transaksjon", Collections.emptyList()); + } + + public void addTransaksjon(Link link) { + addLink("transaksjon", link); + } } 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 68488e75..41f8b851 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PosteringResources extends AbstractCollectionResources { - public PosteringResources(Collection input) { - super(input); - } + public PosteringResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 e3ef6e03..9fea4635 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 @@ -1,81 +1,82 @@ package no.novari.fint.model.resource.okonomi.regnskap; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.okonomi.regnskap.Bilag; 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; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class TransaksjonResource implements FintResource { - // Attributes - @NotNull - private Long belop; - private String beskrivelse; - private List<@Valid Bilag> bilag; - @NotNull - private Date forfallsdato; - private Date oppdateringstidspunkt; - private @Valid Identifikator transaksjonsId; - private Date transaksjonstidspunkt; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("transaksjonsId", this.transaksjonsId); + // Attributes + @NotNull private Long belop; + private String beskrivelse; + private List<@Valid Bilag> bilag; + @NotNull private Date forfallsdato; + private Date oppdateringstidspunkt; + @NotNull private @Valid Identifikator transaksjonsId; + private Date transaksjonstidspunkt; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("transaksjonsId", this.transaksjonsId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getLeverandor() { + return getLinks().getOrDefault("leverandor", Collections.emptyList()); + } + + public void addLeverandor(Link link) { + addLink("leverandor", link); + } + + @JsonIgnore + public List getAnsvarlig() { + return getLinks().getOrDefault("ansvarlig", Collections.emptyList()); + } + + public void addAnsvarlig(Link link) { + addLink("ansvarlig", link); + } + + @JsonIgnore + public List getValuta() { + return getLinks().getOrDefault("valuta", Collections.emptyList()); + } + + public void addValuta(Link link) { + addLink("valuta", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getPostering() { + return getLinks().getOrDefault("postering", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getLeverandor() { - return getLinks().getOrDefault("leverandor", Collections.emptyList()); - } - public void addLeverandor(Link link) { - addLink("leverandor", link); - } - @JsonIgnore - public List getAnsvarlig() { - return getLinks().getOrDefault("ansvarlig", Collections.emptyList()); - } - public void addAnsvarlig(Link link) { - addLink("ansvarlig", link); - } - @JsonIgnore - public List getValuta() { - return getLinks().getOrDefault("valuta", Collections.emptyList()); - } - public void addValuta(Link link) { - addLink("valuta", link); - } - @JsonIgnore - public List getPostering() { - return getLinks().getOrDefault("postering", Collections.emptyList()); - } - public void addPostering(Link link) { - addLink("postering", link); - } + public void addPostering(Link link) { + addLink("postering", link); + } } 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 b69c7007..87a71b6a 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TransaksjonResources extends AbstractCollectionResources { - public TransaksjonResources(Collection input) { - super(input); - } + public TransaksjonResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 d98832fc..a1246da3 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.personvern.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Behandlingsgrunnlag extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Behandlingsgrunnlag extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } diff --git a/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/KodeverkActions.java b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/KodeverkActions.java index ec4a42c5..6aef65bb 100644 --- a/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/KodeverkActions.java +++ b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/kodeverk/KodeverkActions.java @@ -4,26 +4,22 @@ import java.util.List; public enum KodeverkActions { - - GET_BEHANDLINGSGRUNNLAG, - GET_ALL_BEHANDLINGSGRUNNLAG, - UPDATE_BEHANDLINGSGRUNNLAG, - GET_PERSONOPPLYSNING, - GET_ALL_PERSONOPPLYSNING, - UPDATE_PERSONOPPLYSNING - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(KodeverkActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_BEHANDLINGSGRUNNLAG, + GET_ALL_BEHANDLINGSGRUNNLAG, + UPDATE_BEHANDLINGSGRUNNLAG, + GET_PERSONOPPLYSNING, + GET_ALL_PERSONOPPLYSNING, + UPDATE_PERSONOPPLYSNING; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(KodeverkActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 54847d88..a9fbb032 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.personvern.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Personopplysning extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Personopplysning extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 e1a8689a..4d1b19ee 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 @@ -1,84 +1,93 @@ package no.novari.fint.model.personvern.samtykke; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; -import java.util.Date; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Behandling implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Behandling implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + BEHANDLINGSGRUNNLAG( + "behandlingsgrunnlag", + "no.novari.fint.model.personvern.kodeverk.Behandlingsgrunnlag", + ONE_TO_ONE, + null), + PERSONOPPLYSNING( + "personopplysning", + "no.novari.fint.model.personvern.kodeverk.Personopplysning", + ONE_TO_ONE, + null), + SAMTYKKE( + "samtykke", + "no.novari.fint.model.personvern.samtykke.Samtykke", + NONE_TO_MANY, + "behandling"), + TJENESTE( + "tjeneste", "no.novari.fint.model.personvern.samtykke.Tjeneste", ONE_TO_ONE, "behandling"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private Boolean aktiv; - @NotBlank - private String formal; - private @Valid Date slettet; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + @NotNull private Boolean aktiv; + @NotBlank private String formal; + private @Valid Date slettet; + @NotNull private @Valid Identifikator systemId; } 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 a9436a28..65f3a8ce 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 @@ -1,83 +1,87 @@ package no.novari.fint.model.personvern.samtykke; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -import java.util.Date; - -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 @EqualsAndHashCode @ToString -public class Samtykke implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Samtykke implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + BEHANDLING( + "behandling", + "no.novari.fint.model.personvern.samtykke.Behandling", + ONE_TO_ONE, + "samtykke"), + PERSON("person", "no.novari.fint.model.felles.Person", ONE_TO_ONE, null), + ORGANISASJONSELEMENT( + "organisasjonselement", + "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", + NONE_TO_ONE, + null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Periode gyldighetsperiode; - @NotNull - private @Valid Date opprettet; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Periode gyldighetsperiode; + @NotNull private @Valid Date opprettet; + @NotNull private @Valid Identifikator systemId; } diff --git a/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/SamtykkeActions.java b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/SamtykkeActions.java index 8e95d59d..fe798207 100644 --- a/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/SamtykkeActions.java +++ b/fint-personvern-model-java/src/main/java/no/novari/fint/model/personvern/samtykke/SamtykkeActions.java @@ -4,29 +4,25 @@ import java.util.List; public enum SamtykkeActions { - - GET_BEHANDLING, - GET_ALL_BEHANDLING, - UPDATE_BEHANDLING, - GET_SAMTYKKE, - GET_ALL_SAMTYKKE, - UPDATE_SAMTYKKE, - GET_TJENESTE, - GET_ALL_TJENESTE, - UPDATE_TJENESTE - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(SamtykkeActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_BEHANDLING, + GET_ALL_BEHANDLING, + UPDATE_BEHANDLING, + GET_SAMTYKKE, + GET_ALL_SAMTYKKE, + UPDATE_SAMTYKKE, + GET_TJENESTE, + GET_ALL_TJENESTE, + UPDATE_TJENESTE; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(SamtykkeActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 4bc7ac52..351a15f5 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 @@ -1,79 +1,79 @@ package no.novari.fint.model.personvern.samtykke; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; -import java.util.Date; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Tjeneste implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - BEHANDLING("behandling", "no.novari.fint.model.personvern.samtykke.Behandling", NONE_TO_MANY); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +public class Tjeneste implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + BEHANDLING( + "behandling", + "no.novari.fint.model.personvern.samtykke.Behandling", + NONE_TO_MANY, + "tjeneste"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - @NotBlank - private String navn; - private @Valid Date slettet; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + @NotBlank private String navn; + private @Valid Date slettet; + @NotNull private @Valid Identifikator systemId; } 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 6fee547f..0983d6c8 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.personvern.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class BehandlingsgrunnlagResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 05e07ab8..e312802e 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class BehandlingsgrunnlagResources extends AbstractCollectionResources { +public class BehandlingsgrunnlagResources + extends AbstractCollectionResources { - public BehandlingsgrunnlagResources(Collection input) { - super(input); - } + public BehandlingsgrunnlagResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 7322db30..878edc7a 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.personvern.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class PersonopplysningResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 d8f8889f..faa66ffc 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class PersonopplysningResources extends AbstractCollectionResources { +public class PersonopplysningResources + extends AbstractCollectionResources { - public PersonopplysningResources(Collection input) { - super(input); - } + public PersonopplysningResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 d6f8eb94..cd768bf6 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 @@ -1,78 +1,78 @@ package no.novari.fint.model.resource.personvern.samtykke; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @NoArgsConstructor @EqualsAndHashCode @ToString public class BehandlingResource implements FintResource { - // Attributes - @NotNull - private Boolean aktiv; - @NotBlank - private String formal; - private @Valid Date slettet; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotNull private Boolean aktiv; + @NotBlank private String formal; + private @Valid Date slettet; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getBehandlingsgrunnlag() { + return getLinks().getOrDefault("behandlingsgrunnlag", Collections.emptyList()); + } + + public void addBehandlingsgrunnlag(Link link) { + addLink("behandlingsgrunnlag", link); + } + + @JsonIgnore + public List getPersonopplysning() { + return getLinks().getOrDefault("personopplysning", Collections.emptyList()); + } + + public void addPersonopplysning(Link link) { + addLink("personopplysning", link); + } + + @JsonIgnore + public List getSamtykke() { + return getLinks().getOrDefault("samtykke", Collections.emptyList()); + } + + public void addSamtykke(Link link) { + addLink("samtykke", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getTjeneste() { + return getLinks().getOrDefault("tjeneste", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getBehandlingsgrunnlag() { - return getLinks().getOrDefault("behandlingsgrunnlag", Collections.emptyList()); - } - public void addBehandlingsgrunnlag(Link link) { - addLink("behandlingsgrunnlag", link); - } - @JsonIgnore - public List getPersonopplysning() { - return getLinks().getOrDefault("personopplysning", Collections.emptyList()); - } - public void addPersonopplysning(Link link) { - addLink("personopplysning", link); - } - @JsonIgnore - public List getSamtykke() { - return getLinks().getOrDefault("samtykke", Collections.emptyList()); - } - public void addSamtykke(Link link) { - addLink("samtykke", link); - } - @JsonIgnore - public List getTjeneste() { - return getLinks().getOrDefault("tjeneste", Collections.emptyList()); - } - public void addTjeneste(Link link) { - addLink("tjeneste", link); - } + public void addTjeneste(Link link) { + addLink("tjeneste", link); + } } 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 8ba1cdd9..b33ad696 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class BehandlingResources extends AbstractCollectionResources { - public BehandlingResources(Collection input) { - super(input); - } + public BehandlingResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 dfd1c6ed..80181a85 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 @@ -1,71 +1,69 @@ package no.novari.fint.model.resource.personvern.samtykke; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; 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; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class SamtykkeResource implements FintResource { - // Attributes - @NotNull - private @Valid Periode gyldighetsperiode; - @NotNull - private @Valid Date opprettet; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotNull private @Valid Periode gyldighetsperiode; + @NotNull private @Valid Date opprettet; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getBehandling() { + return getLinks().getOrDefault("behandling", Collections.emptyList()); + } + + public void addBehandling(Link link) { + addLink("behandling", link); + } + + @JsonIgnore + public List getPerson() { + return getLinks().getOrDefault("person", Collections.emptyList()); + } + + public void addPerson(Link link) { + addLink("person", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getOrganisasjonselement() { + return getLinks().getOrDefault("organisasjonselement", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getBehandling() { - return getLinks().getOrDefault("behandling", Collections.emptyList()); - } - public void addBehandling(Link link) { - addLink("behandling", link); - } - @JsonIgnore - public List getPerson() { - return getLinks().getOrDefault("person", Collections.emptyList()); - } - public void addPerson(Link link) { - addLink("person", link); - } - @JsonIgnore - public List getOrganisasjonselement() { - return getLinks().getOrDefault("organisasjonselement", Collections.emptyList()); - } - public void addOrganisasjonselement(Link link) { - addLink("organisasjonselement", link); - } + public void addOrganisasjonselement(Link link) { + addLink("organisasjonselement", link); + } } 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 b7f8b3f0..1610e4f7 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SamtykkeResources extends AbstractCollectionResources { - public SamtykkeResources(Collection input) { - super(input); - } + public SamtykkeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 33ef2a81..2eb572d3 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 @@ -1,55 +1,50 @@ package no.novari.fint.model.resource.personvern.samtykke; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @NoArgsConstructor @EqualsAndHashCode @ToString public class TjenesteResource implements FintResource { - // Attributes - @NotBlank - private String navn; - private @Valid Date slettet; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotBlank private String navn; + private @Valid Date slettet; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getBehandling() { + return getLinks().getOrDefault("behandling", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getBehandling() { - return getLinks().getOrDefault("behandling", Collections.emptyList()); - } - public void addBehandling(Link link) { - addLink("behandling", link); - } + public void addBehandling(Link link) { + addLink("behandling", link); + } } 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 c75c11ed..540ce467 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TjenesteResources extends AbstractCollectionResources { - public TjenesteResources(Collection input) { - super(input); - } + public TjenesteResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/DatautstyrActions.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/DatautstyrActions.java index b56e4374..211bf932 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/DatautstyrActions.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/DatautstyrActions.java @@ -4,29 +4,25 @@ import java.util.List; public enum DatautstyrActions { - - GET_ENHETSGRUPPEMEDLEMSKAP, - GET_ALL_ENHETSGRUPPEMEDLEMSKAP, - UPDATE_ENHETSGRUPPEMEDLEMSKAP, - GET_ENHETSGRUPPE, - GET_ALL_ENHETSGRUPPE, - UPDATE_ENHETSGRUPPE, - GET_DIGITALENHET, - GET_ALL_DIGITALENHET, - UPDATE_DIGITALENHET - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(DatautstyrActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_DIGITALENHET, + GET_ALL_DIGITALENHET, + UPDATE_DIGITALENHET, + GET_ENHETSGRUPPE, + GET_ALL_ENHETSGRUPPE, + UPDATE_ENHETSGRUPPE, + GET_ENHETSGRUPPEMEDLEMSKAP, + GET_ALL_ENHETSGRUPPEMEDLEMSKAP, + UPDATE_ENHETSGRUPPEMEDLEMSKAP; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(DatautstyrActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/DigitalEnhet.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/DigitalEnhet.java index c087c809..f9b67e16 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/DigitalEnhet.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/DigitalEnhet.java @@ -1,91 +1,104 @@ package no.novari.fint.model.ressurs.datautstyr; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString -public class DigitalEnhet implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - ADMINISTRATOR("administrator", "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", ONE_TO_ONE), - EIER("eier", "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", NONE_TO_ONE), - PERSONALRESSURS("personalressurs", "no.novari.fint.model.administrasjon.personal.Personalressurs", NONE_TO_ONE), - ELEV("elev", "no.novari.fint.model.utdanning.elev.Elev", NONE_TO_ONE), - STATUS("status", "no.novari.fint.model.ressurs.kodeverk.Status", NONE_TO_ONE), - PRODUSENT("produsent", "no.novari.fint.model.ressurs.kodeverk.Produsent", NONE_TO_ONE), - ENHETSTYPE("enhetstype", "no.novari.fint.model.ressurs.kodeverk.Enhetstype", ONE_TO_ONE), - PLATTFORM("plattform", "no.novari.fint.model.ressurs.kodeverk.Plattform", ONE_TO_ONE), - ENHETSGRUPPEMEDLEMSKAP("enhetsgruppemedlemskap", "no.novari.fint.model.ressurs.datautstyr.Enhetsgruppemedlemskap", NONE_TO_MANY); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +public class DigitalEnhet implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ADMINISTRATOR( + "administrator", + "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", + ONE_TO_ONE, + null), + EIER( + "eier", + "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", + NONE_TO_ONE, + null), + PERSONALRESSURS( + "personalressurs", + "no.novari.fint.model.administrasjon.personal.Personalressurs", + NONE_TO_ONE, + null), + ELEV("elev", "no.novari.fint.model.utdanning.elev.Elev", NONE_TO_ONE, null), + STATUS("status", "no.novari.fint.model.ressurs.kodeverk.Status", NONE_TO_ONE, null), + ENHETSTYPE("enhetstype", "no.novari.fint.model.ressurs.kodeverk.Enhetstype", ONE_TO_ONE, null), + PLATTFORM("plattform", "no.novari.fint.model.ressurs.kodeverk.Plattform", ONE_TO_ONE, null), + PRODUSENT("produsent", "no.novari.fint.model.ressurs.kodeverk.Produsent", NONE_TO_ONE, null), + ENHETSGRUPPEMEDLEMSKAP( + "enhetsgruppemedlemskap", + "no.novari.fint.model.ressurs.datautstyr.Enhetsgruppemedlemskap", + NONE_TO_MANY, + "digitalEnhet"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("dataobjektId", this.dataobjektId); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("dataobjektId", this.dataobjektId); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private @Valid Identifikator dataobjektId; - private Boolean flerbrukerenhet; - private String navn; - private Boolean privateid; - @NotBlank - private String serienummer; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private @Valid Identifikator dataobjektId; + private Boolean flerbrukerenhet; + private String navn; + private Boolean privateid; + @NotBlank private String serienummer; + @NotNull private @Valid Identifikator systemId; } diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/Enhetsgruppe.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/Enhetsgruppe.java index 61f9f534..1f850d48 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/Enhetsgruppe.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/Enhetsgruppe.java @@ -1,81 +1,85 @@ package no.novari.fint.model.ressurs.datautstyr; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString -public class Enhetsgruppe implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - ORGANISASJONSENHET("organisasjonsenhet", "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", ONE_TO_ONE), - PLATTFORM("plattform", "no.novari.fint.model.ressurs.kodeverk.Plattform", ONE_TO_ONE), - ENHETSTYPE("enhetstype", "no.novari.fint.model.ressurs.kodeverk.Enhetstype", ONE_TO_ONE), - ENHETSGRUPPEMEDLEMSKAP("enhetsgruppemedlemskap", "no.novari.fint.model.ressurs.datautstyr.Enhetsgruppemedlemskap", NONE_TO_MANY); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +public class Enhetsgruppe implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ORGANISASJONSENHET( + "organisasjonsenhet", + "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", + ONE_TO_ONE, + null), + ENHETSTYPE("enhetstype", "no.novari.fint.model.ressurs.kodeverk.Enhetstype", ONE_TO_ONE, null), + PLATTFORM("plattform", "no.novari.fint.model.ressurs.kodeverk.Plattform", ONE_TO_ONE, null), + ENHETSGRUPPEMEDLEMSKAP( + "enhetsgruppemedlemskap", + "no.novari.fint.model.ressurs.datautstyr.Enhetsgruppemedlemskap", + NONE_TO_MANY, + "enhetsgruppe"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotBlank private String navn; + @NotNull private @Valid Identifikator systemId; } diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/Enhetsgruppemedlemskap.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/Enhetsgruppemedlemskap.java index d298432f..f8d6507b 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/Enhetsgruppemedlemskap.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/datautstyr/Enhetsgruppemedlemskap.java @@ -1,77 +1,81 @@ package no.novari.fint.model.ressurs.datautstyr; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString -public class Enhetsgruppemedlemskap implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - DIGITALENHET("digitalEnhet", "no.novari.fint.model.ressurs.datautstyr.DigitalEnhet", ONE_TO_ONE), - ENHETSGRUPPE("enhetsgruppe", "no.novari.fint.model.ressurs.datautstyr.Enhetsgruppe", ONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +public class Enhetsgruppemedlemskap implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + DIGITALENHET( + "digitalEnhet", + "no.novari.fint.model.ressurs.datautstyr.DigitalEnhet", + ONE_TO_ONE, + "enhetsgruppemedlemskap"), + ENHETSGRUPPE( + "enhetsgruppe", + "no.novari.fint.model.ressurs.datautstyr.Enhetsgruppe", + ONE_TO_ONE, + "enhetsgruppemedlemskap"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Identifikator systemId; } 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 5dba6389..bdb22c4a 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 @@ -1,83 +1,86 @@ package no.novari.fint.model.ressurs.eiendel; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -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 @EqualsAndHashCode @ToString -public class Applikasjon implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Applikasjon implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + PLATTFORM("plattform", "no.novari.fint.model.ressurs.kodeverk.Plattform", NONE_TO_MANY, null), + RESSURS( + "ressurs", + "no.novari.fint.model.ressurs.eiendel.Applikasjonsressurs", + NONE_TO_MANY, + "applikasjon"), + APPLIKASJONSKATEGORI( + "applikasjonskategori", + "no.novari.fint.model.ressurs.kodeverk.Applikasjonskategori", + NONE_TO_MANY, + null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private String beskrivelse; - @NotNull - private @Valid Periode gyldighetsperiode; - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private String beskrivelse; + @NotNull private @Valid Periode gyldighetsperiode; + @NotBlank private String navn; + @NotNull private @Valid Identifikator systemId; } 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 c394255a..9d7f5bab 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 @@ -1,89 +1,101 @@ package no.novari.fint.model.ressurs.eiendel; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -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 @EqualsAndHashCode @ToString -public class Applikasjonsressurs implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Applikasjonsressurs implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + BRUKERTYPE("brukertype", "no.novari.fint.model.ressurs.kodeverk.Brukertype", ONE_TO_MANY, null), + HANDHEVINGSTYPE( + "handhevingstype", + "no.novari.fint.model.ressurs.kodeverk.Handhevingstype", + NONE_TO_ONE, + null), + LISENSMODELL( + "lisensmodell", "no.novari.fint.model.ressurs.kodeverk.Lisensmodell", NONE_TO_ONE, null), + RESSURSTILGJENGELIGHET( + "ressurstilgjengelighet", + "no.novari.fint.model.ressurs.eiendel.Applikasjonsressurstilgjengelighet", + NONE_TO_MANY, + "ressurs"), + EIER( + "eier", + "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", + ONE_TO_ONE, + null), + APPLIKASJON( + "applikasjon", "no.novari.fint.model.ressurs.eiendel.Applikasjon", ONE_TO_ONE, "ressurs"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private String beskrivelse; - private Long enhetskostnad; - @NotNull - private @Valid Periode gyldighetsperiode; - private Boolean kreverGodkjenning; - private Long lisensantall; - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private String beskrivelse; + private Long enhetskostnad; + @NotNull private @Valid Periode gyldighetsperiode; + private Boolean kreverGodkjenning; + private Long lisensantall; + @NotBlank private String navn; + @NotNull private @Valid Identifikator systemId; } 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 bc4db968..af3a0122 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 @@ -1,80 +1,84 @@ package no.novari.fint.model.ressurs.eiendel; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -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 @EqualsAndHashCode @ToString -public class Applikasjonsressurstilgjengelighet implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Applikasjonsressurstilgjengelighet implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + KONSUMENT( + "konsument", + "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", + ONE_TO_ONE, + null), + RESSURS( + "ressurs", + "no.novari.fint.model.ressurs.eiendel.Applikasjonsressurs", + ONE_TO_ONE, + "ressurstilgjengelighet"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Periode gyldighetsperiode; - private Long lisensantall; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Periode gyldighetsperiode; + private Long lisensantall; + @NotNull private @Valid Identifikator systemId; } diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/EiendelActions.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/EiendelActions.java index 297a19b7..1e8cad50 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/EiendelActions.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/eiendel/EiendelActions.java @@ -4,29 +4,25 @@ import java.util.List; public enum EiendelActions { - - GET_APPLIKASJON, - GET_ALL_APPLIKASJON, - UPDATE_APPLIKASJON, - GET_APPLIKASJONSRESSURS, - GET_ALL_APPLIKASJONSRESSURS, - UPDATE_APPLIKASJONSRESSURS, - GET_APPLIKASJONSRESSURSTILGJENGELIGHET, - GET_ALL_APPLIKASJONSRESSURSTILGJENGELIGHET, - UPDATE_APPLIKASJONSRESSURSTILGJENGELIGHET - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(EiendelActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_APPLIKASJON, + GET_ALL_APPLIKASJON, + UPDATE_APPLIKASJON, + GET_APPLIKASJONSRESSURS, + GET_ALL_APPLIKASJONSRESSURS, + UPDATE_APPLIKASJONSRESSURS, + GET_APPLIKASJONSRESSURSTILGJENGELIGHET, + GET_ALL_APPLIKASJONSRESSURSTILGJENGELIGHET, + UPDATE_APPLIKASJONSRESSURSTILGJENGELIGHET; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(EiendelActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 579f7c32..3a01c428 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Applikasjonskategori extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Applikasjonskategori extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 1061210b..9ede4cc6 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Brukertype extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Brukertype extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Enhetstype.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Enhetstype.java index a9a0595b..8c7512a8 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Enhetstype.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Enhetstype.java @@ -1,49 +1,34 @@ package no.novari.fint.model.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -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 java.util.Map; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; -import no.novari.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Enhetstype extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Enhetstype extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; + @JsonIgnore private final boolean writeable = false; } 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 958f3e30..ce043e78 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Handhevingstype extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Handhevingstype extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/KodeverkActions.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/KodeverkActions.java index 4156db23..2a0ceb7e 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/KodeverkActions.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/KodeverkActions.java @@ -4,44 +4,40 @@ import java.util.List; public enum KodeverkActions { - - GET_APPLIKASJONSKATEGORI, - GET_ALL_APPLIKASJONSKATEGORI, - UPDATE_APPLIKASJONSKATEGORI, - GET_BRUKERTYPE, - GET_ALL_BRUKERTYPE, - UPDATE_BRUKERTYPE, - GET_ENHETSTYPE, - GET_ALL_ENHETSTYPE, - UPDATE_ENHETSTYPE, - GET_HANDHEVINGSTYPE, - GET_ALL_HANDHEVINGSTYPE, - UPDATE_HANDHEVINGSTYPE, - GET_LISENSMODELL, - GET_ALL_LISENSMODELL, - UPDATE_LISENSMODELL, - GET_PLATTFORM, - GET_ALL_PLATTFORM, - UPDATE_PLATTFORM, - GET_PRODUSENT, - GET_ALL_PRODUSENT, - UPDATE_PRODUSENT, - GET_STATUS, - GET_ALL_STATUS, - UPDATE_STATUS - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(KodeverkActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_APPLIKASJONSKATEGORI, + GET_ALL_APPLIKASJONSKATEGORI, + UPDATE_APPLIKASJONSKATEGORI, + GET_BRUKERTYPE, + GET_ALL_BRUKERTYPE, + UPDATE_BRUKERTYPE, + GET_ENHETSTYPE, + GET_ALL_ENHETSTYPE, + UPDATE_ENHETSTYPE, + GET_HANDHEVINGSTYPE, + GET_ALL_HANDHEVINGSTYPE, + UPDATE_HANDHEVINGSTYPE, + GET_LISENSMODELL, + GET_ALL_LISENSMODELL, + UPDATE_LISENSMODELL, + GET_PLATTFORM, + GET_ALL_PLATTFORM, + UPDATE_PLATTFORM, + GET_PRODUSENT, + GET_ALL_PRODUSENT, + UPDATE_PRODUSENT, + GET_STATUS, + GET_ALL_STATUS, + UPDATE_STATUS; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(KodeverkActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 9ed15f50..36854f77 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Lisensmodell extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Lisensmodell extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 746798b7..181e24a7 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Plattform extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Plattform extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Produsent.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Produsent.java index a486616a..70993bf9 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Produsent.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Produsent.java @@ -1,49 +1,34 @@ package no.novari.fint.model.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -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 java.util.Map; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; -import no.novari.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Produsent extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Produsent extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; + @JsonIgnore private final boolean writeable = false; } diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Status.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Status.java index 29531994..8493a6b7 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Status.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/kodeverk/Status.java @@ -1,49 +1,34 @@ package no.novari.fint.model.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -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 java.util.Map; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; -import no.novari.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Status extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Status extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; + @JsonIgnore private final boolean writeable = false; } 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 fb5728c3..068284cc 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 @@ -1,76 +1,79 @@ package no.novari.fint.model.ressurs.tilgang; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Identitet implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Identitet implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + PERSONALRESSURS( + "personalressurs", + "no.novari.fint.model.administrasjon.personal.Personalressurs", + NONE_TO_ONE, + null), + RETTIGHET( + "rettighet", "no.novari.fint.model.ressurs.tilgang.Rettighet", NONE_TO_MANY, "identitet"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Identifikator systemId; } 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 92cf9c15..fc499718 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 @@ -1,74 +1,72 @@ package no.novari.fint.model.ressurs.tilgang; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Rettighet extends Begrep implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - IDENTITET("identitet", "no.novari.fint.model.ressurs.tilgang.Identitet", NONE_TO_MANY); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Rettighet extends Begrep implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + IDENTITET( + "identitet", "no.novari.fint.model.ressurs.tilgang.Identitet", NONE_TO_MANY, "rettighet"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotBlank - private String beskrivelse; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotBlank private String beskrivelse; } diff --git a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/TilgangActions.java b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/TilgangActions.java index b4a4648c..9b822c31 100644 --- a/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/TilgangActions.java +++ b/fint-ressurs-model-java/src/main/java/no/novari/fint/model/ressurs/tilgang/TilgangActions.java @@ -4,26 +4,22 @@ import java.util.List; public enum TilgangActions { - - GET_IDENTITET, - GET_ALL_IDENTITET, - UPDATE_IDENTITET, - GET_RETTIGHET, - GET_ALL_RETTIGHET, - UPDATE_RETTIGHET - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(TilgangActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_IDENTITET, + GET_ALL_IDENTITET, + UPDATE_IDENTITET, + GET_RETTIGHET, + GET_ALL_RETTIGHET, + UPDATE_RETTIGHET; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(TilgangActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/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 index 16cbf2b8..6e1420cd 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/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 @@ -1,115 +1,125 @@ package no.novari.fint.model.resource.ressurs.datautstyr; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class DigitalEnhetResource implements FintResource { - // Attributes - private @Valid Identifikator dataobjektId; - private Boolean flerbrukerenhet; - private String navn; - private Boolean privateid; - @NotBlank - private String serienummer; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("dataobjektId", this.dataobjektId); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getAdministrator() { - return getLinks().getOrDefault("administrator", Collections.emptyList()); - } - public void addAdministrator(Link link) { - addLink("administrator", link); - } - @JsonIgnore - public List getEier() { - return getLinks().getOrDefault("eier", Collections.emptyList()); - } - public void addEier(Link link) { - addLink("eier", link); - } - @JsonIgnore - public List getPersonalressurs() { - return getLinks().getOrDefault("personalressurs", Collections.emptyList()); - } - public void addPersonalressurs(Link link) { - addLink("personalressurs", link); - } - @JsonIgnore - public List getElev() { - return getLinks().getOrDefault("elev", Collections.emptyList()); - } - public void addElev(Link link) { - addLink("elev", link); - } - @JsonIgnore - public List getStatus() { - return getLinks().getOrDefault("status", Collections.emptyList()); - } - public void addStatus(Link link) { - addLink("status", link); - } - @JsonIgnore - public List getProdusent() { - return getLinks().getOrDefault("produsent", Collections.emptyList()); - } - public void addProdusent(Link link) { - addLink("produsent", link); - } - @JsonIgnore - public List getEnhetstype() { - return getLinks().getOrDefault("enhetstype", Collections.emptyList()); - } - public void addEnhetstype(Link link) { - addLink("enhetstype", link); - } - @JsonIgnore - public List getPlattform() { - return getLinks().getOrDefault("plattform", Collections.emptyList()); - } - public void addPlattform(Link link) { - addLink("plattform", link); - } - @JsonIgnore - public List getEnhetsgruppemedlemskap() { - return getLinks().getOrDefault("enhetsgruppemedlemskap", Collections.emptyList()); - } - public void addEnhetsgruppemedlemskap(Link link) { - addLink("enhetsgruppemedlemskap", link); - } + // Attributes + private @Valid Identifikator dataobjektId; + private Boolean flerbrukerenhet; + private String navn; + private Boolean privateid; + @NotBlank private String serienummer; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("dataobjektId", this.dataobjektId); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getAdministrator() { + return getLinks().getOrDefault("administrator", Collections.emptyList()); + } + + public void addAdministrator(Link link) { + addLink("administrator", link); + } + + @JsonIgnore + public List getEier() { + return getLinks().getOrDefault("eier", Collections.emptyList()); + } + + public void addEier(Link link) { + addLink("eier", link); + } + + @JsonIgnore + public List getPersonalressurs() { + return getLinks().getOrDefault("personalressurs", Collections.emptyList()); + } + + public void addPersonalressurs(Link link) { + addLink("personalressurs", link); + } + + @JsonIgnore + public List getElev() { + return getLinks().getOrDefault("elev", Collections.emptyList()); + } + + public void addElev(Link link) { + addLink("elev", link); + } + + @JsonIgnore + public List getStatus() { + return getLinks().getOrDefault("status", Collections.emptyList()); + } + + public void addStatus(Link link) { + addLink("status", link); + } + + @JsonIgnore + public List getEnhetstype() { + return getLinks().getOrDefault("enhetstype", Collections.emptyList()); + } + + public void addEnhetstype(Link link) { + addLink("enhetstype", link); + } + + @JsonIgnore + public List getPlattform() { + return getLinks().getOrDefault("plattform", Collections.emptyList()); + } + + public void addPlattform(Link link) { + addLink("plattform", link); + } + + @JsonIgnore + public List getProdusent() { + return getLinks().getOrDefault("produsent", Collections.emptyList()); + } + + public void addProdusent(Link link) { + addLink("produsent", link); + } + + @JsonIgnore + public List getEnhetsgruppemedlemskap() { + return getLinks().getOrDefault("enhetsgruppemedlemskap", Collections.emptyList()); + } + + public void addEnhetsgruppemedlemskap(Link link) { + addLink("enhetsgruppemedlemskap", link); + } } diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/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 index 601223d1..1b7ba139 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class DigitalEnhetResources extends AbstractCollectionResources { - public DigitalEnhetResources(Collection input) { - super(input); - } + public DigitalEnhetResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/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 index 0d10c4e1..c87d76c2 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/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 @@ -1,75 +1,75 @@ package no.novari.fint.model.resource.ressurs.datautstyr; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class EnhetsgruppeResource implements FintResource { - // Attributes - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotBlank private String navn; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getOrganisasjonsenhet() { + return getLinks().getOrDefault("organisasjonsenhet", Collections.emptyList()); + } + + public void addOrganisasjonsenhet(Link link) { + addLink("organisasjonsenhet", link); + } + + @JsonIgnore + public List getEnhetstype() { + return getLinks().getOrDefault("enhetstype", Collections.emptyList()); + } + + public void addEnhetstype(Link link) { + addLink("enhetstype", link); + } + + @JsonIgnore + public List getPlattform() { + return getLinks().getOrDefault("plattform", Collections.emptyList()); + } + + public void addPlattform(Link link) { + addLink("plattform", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getEnhetsgruppemedlemskap() { + return getLinks().getOrDefault("enhetsgruppemedlemskap", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getOrganisasjonsenhet() { - return getLinks().getOrDefault("organisasjonsenhet", Collections.emptyList()); - } - public void addOrganisasjonsenhet(Link link) { - addLink("organisasjonsenhet", link); - } - @JsonIgnore - public List getPlattform() { - return getLinks().getOrDefault("plattform", Collections.emptyList()); - } - public void addPlattform(Link link) { - addLink("plattform", link); - } - @JsonIgnore - public List getEnhetstype() { - return getLinks().getOrDefault("enhetstype", Collections.emptyList()); - } - public void addEnhetstype(Link link) { - addLink("enhetstype", link); - } - @JsonIgnore - public List getEnhetsgruppemedlemskap() { - return getLinks().getOrDefault("enhetsgruppemedlemskap", Collections.emptyList()); - } - public void addEnhetsgruppemedlemskap(Link link) { - addLink("enhetsgruppemedlemskap", link); - } + public void addEnhetsgruppemedlemskap(Link link) { + addLink("enhetsgruppemedlemskap", link); + } } diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/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 index 26b25588..90152228 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class EnhetsgruppeResources extends AbstractCollectionResources { - public EnhetsgruppeResources(Collection input) { - super(input); - } + public EnhetsgruppeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/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 index cf14b86b..916ab919 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/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 @@ -1,59 +1,56 @@ package no.novari.fint.model.resource.ressurs.datautstyr; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class EnhetsgruppemedlemskapResource implements FintResource { - // Attributes - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getDigitalEnhet() { - return getLinks().getOrDefault("digitalEnhet", Collections.emptyList()); - } - public void addDigitalEnhet(Link link) { - addLink("digitalEnhet", link); - } - @JsonIgnore - public List getEnhetsgruppe() { - return getLinks().getOrDefault("enhetsgruppe", Collections.emptyList()); - } - public void addEnhetsgruppe(Link link) { - addLink("enhetsgruppe", link); - } + // Attributes + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getDigitalEnhet() { + return getLinks().getOrDefault("digitalEnhet", Collections.emptyList()); + } + + public void addDigitalEnhet(Link link) { + addLink("digitalEnhet", link); + } + + @JsonIgnore + public List getEnhetsgruppe() { + return getLinks().getOrDefault("enhetsgruppe", Collections.emptyList()); + } + + public void addEnhetsgruppe(Link link) { + addLink("enhetsgruppe", link); + } } diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/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 index 5b0933bd..a45226e0 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class EnhetsgruppemedlemskapResources extends AbstractCollectionResources { +public class EnhetsgruppemedlemskapResources + extends AbstractCollectionResources { - public EnhetsgruppemedlemskapResources(Collection input) { - super(input); - } + public EnhetsgruppemedlemskapResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 5ee87cef..68c45358 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 @@ -1,71 +1,69 @@ package no.novari.fint.model.resource.ressurs.eiendel; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; 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 @NoArgsConstructor @EqualsAndHashCode @ToString public class ApplikasjonResource implements FintResource { - // Attributes - private String beskrivelse; - @NotNull - private @Valid Periode gyldighetsperiode; - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + private String beskrivelse; + @NotNull private @Valid Periode gyldighetsperiode; + @NotBlank private String navn; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getPlattform() { + return getLinks().getOrDefault("plattform", Collections.emptyList()); + } + + public void addPlattform(Link link) { + addLink("plattform", link); + } + + @JsonIgnore + public List getRessurs() { + return getLinks().getOrDefault("ressurs", Collections.emptyList()); + } + + public void addRessurs(Link link) { + addLink("ressurs", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getApplikasjonskategori() { + return getLinks().getOrDefault("applikasjonskategori", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getPlattform() { - return getLinks().getOrDefault("plattform", Collections.emptyList()); - } - public void addPlattform(Link link) { - addLink("plattform", link); - } - @JsonIgnore - public List getRessurs() { - return getLinks().getOrDefault("ressurs", Collections.emptyList()); - } - public void addRessurs(Link link) { - addLink("ressurs", link); - } - @JsonIgnore - public List getApplikasjonskategori() { - return getLinks().getOrDefault("applikasjonskategori", Collections.emptyList()); - } - public void addApplikasjonskategori(Link link) { - addLink("applikasjonskategori", link); - } + public void addApplikasjonskategori(Link link) { + addLink("applikasjonskategori", link); + } } 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 ad064837..38910cec 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ApplikasjonResources extends AbstractCollectionResources { - public ApplikasjonResources(Collection input) { - super(input); - } + public ApplikasjonResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 6746a91f..f0fbb379 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 @@ -1,95 +1,99 @@ package no.novari.fint.model.resource.ressurs.eiendel; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; 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 @NoArgsConstructor @EqualsAndHashCode @ToString public class ApplikasjonsressursResource implements FintResource { - // Attributes - private String beskrivelse; - private Long enhetskostnad; - @NotNull - private @Valid Periode gyldighetsperiode; - private Boolean kreverGodkjenning; - private Long lisensantall; - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getBrukertype() { - return getLinks().getOrDefault("brukertype", Collections.emptyList()); - } - public void addBrukertype(Link link) { - addLink("brukertype", link); - } - @JsonIgnore - public List getHandhevingstype() { - return getLinks().getOrDefault("handhevingstype", Collections.emptyList()); - } - public void addHandhevingstype(Link link) { - addLink("handhevingstype", link); - } - @JsonIgnore - public List getLisensmodell() { - return getLinks().getOrDefault("lisensmodell", Collections.emptyList()); - } - public void addLisensmodell(Link link) { - addLink("lisensmodell", link); - } - @JsonIgnore - public List getRessurstilgjengelighet() { - return getLinks().getOrDefault("ressurstilgjengelighet", Collections.emptyList()); - } - public void addRessurstilgjengelighet(Link link) { - addLink("ressurstilgjengelighet", link); - } - @JsonIgnore - public List getEier() { - return getLinks().getOrDefault("eier", Collections.emptyList()); - } - public void addEier(Link link) { - addLink("eier", link); - } - @JsonIgnore - public List getApplikasjon() { - return getLinks().getOrDefault("applikasjon", Collections.emptyList()); - } - public void addApplikasjon(Link link) { - addLink("applikasjon", link); - } + // Attributes + private String beskrivelse; + private Long enhetskostnad; + @NotNull private @Valid Periode gyldighetsperiode; + private Boolean kreverGodkjenning; + private Long lisensantall; + @NotBlank private String navn; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getBrukertype() { + return getLinks().getOrDefault("brukertype", Collections.emptyList()); + } + + public void addBrukertype(Link link) { + addLink("brukertype", link); + } + + @JsonIgnore + public List getHandhevingstype() { + return getLinks().getOrDefault("handhevingstype", Collections.emptyList()); + } + + public void addHandhevingstype(Link link) { + addLink("handhevingstype", link); + } + + @JsonIgnore + public List getLisensmodell() { + return getLinks().getOrDefault("lisensmodell", Collections.emptyList()); + } + + public void addLisensmodell(Link link) { + addLink("lisensmodell", link); + } + + @JsonIgnore + public List getRessurstilgjengelighet() { + return getLinks().getOrDefault("ressurstilgjengelighet", Collections.emptyList()); + } + + public void addRessurstilgjengelighet(Link link) { + addLink("ressurstilgjengelighet", link); + } + + @JsonIgnore + public List getEier() { + return getLinks().getOrDefault("eier", Collections.emptyList()); + } + + public void addEier(Link link) { + addLink("eier", link); + } + + @JsonIgnore + public List getApplikasjon() { + return getLinks().getOrDefault("applikasjon", Collections.emptyList()); + } + + public void addApplikasjon(Link link) { + addLink("applikasjon", link); + } } 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 68c56c1a..56d52cd1 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class ApplikasjonsressursResources extends AbstractCollectionResources { +public class ApplikasjonsressursResources + extends AbstractCollectionResources { - public ApplikasjonsressursResources(Collection input) { - super(input); - } + public ApplikasjonsressursResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 b441bc63..eea62576 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 @@ -1,62 +1,59 @@ package no.novari.fint.model.resource.ressurs.eiendel; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; 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 @NoArgsConstructor @EqualsAndHashCode @ToString public class ApplikasjonsressurstilgjengelighetResource implements FintResource { - // Attributes - @NotNull - private @Valid Periode gyldighetsperiode; - private Long lisensantall; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getKonsument() { - return getLinks().getOrDefault("konsument", Collections.emptyList()); - } - public void addKonsument(Link link) { - addLink("konsument", link); - } - @JsonIgnore - public List getRessurs() { - return getLinks().getOrDefault("ressurs", Collections.emptyList()); - } - public void addRessurs(Link link) { - addLink("ressurs", link); - } + // Attributes + @NotNull private @Valid Periode gyldighetsperiode; + private Long lisensantall; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getKonsument() { + return getLinks().getOrDefault("konsument", Collections.emptyList()); + } + + public void addKonsument(Link link) { + addLink("konsument", link); + } + + @JsonIgnore + public List getRessurs() { + return getLinks().getOrDefault("ressurs", Collections.emptyList()); + } + + public void addRessurs(Link link) { + addLink("ressurs", link); + } } 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 06225475..eb1b3780 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 @@ -2,24 +2,24 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class ApplikasjonsressurstilgjengelighetResources extends AbstractCollectionResources { +public class ApplikasjonsressurstilgjengelighetResources + extends AbstractCollectionResources { - public ApplikasjonsressurstilgjengelighetResources(Collection input) { - super(input); - } + public ApplikasjonsressurstilgjengelighetResources( + Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 64a67426..9d2ebe5d 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class ApplikasjonskategoriResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 c8cc901a..d39ede3a 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class ApplikasjonskategoriResources extends AbstractCollectionResources { +public class ApplikasjonskategoriResources + extends AbstractCollectionResources { - public ApplikasjonskategoriResources(Collection input) { - super(input); - } + public ApplikasjonskategoriResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 2264ec10..9a27fda2 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class BrukertypeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 9c4cb82c..b391bbab 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class BrukertypeResources extends AbstractCollectionResources { - public BrukertypeResources(Collection input) { - super(input); - } + public BrukertypeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/EnhetstypeResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/EnhetstypeResource.java index 05ddcf1d..990c00ae 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/EnhetstypeResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/EnhetstypeResource.java @@ -1,41 +1,34 @@ package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; 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.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class EnhetstypeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/EnhetstypeResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/EnhetstypeResources.java index daa40c5a..7332d956 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/EnhetstypeResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/EnhetstypeResources.java @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class EnhetstypeResources extends AbstractCollectionResources { - public EnhetstypeResources(Collection input) { - super(input); - } + public EnhetstypeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 c41f00a1..b5801566 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class HandhevingstypeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 65415399..165b6dcb 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class HandhevingstypeResources extends AbstractCollectionResources { - public HandhevingstypeResources(Collection input) { - super(input); - } + public HandhevingstypeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 f5e89d80..1413497c 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class LisensmodellResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 c595c403..df011034 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class LisensmodellResources extends AbstractCollectionResources { - public LisensmodellResources(Collection input) { - super(input); - } + public LisensmodellResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 b13a80aa..064e5232 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class PlattformResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 e09dcdff..056aaee3 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PlattformResources extends AbstractCollectionResources { - public PlattformResources(Collection input) { - super(input); - } + public PlattformResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ProdusentResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ProdusentResource.java index 82241bb8..09dd992d 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ProdusentResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ProdusentResource.java @@ -1,41 +1,34 @@ package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; 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.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class ProdusentResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ProdusentResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ProdusentResources.java index 750ddfe3..2532bf53 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ProdusentResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/ProdusentResources.java @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ProdusentResources extends AbstractCollectionResources { - public ProdusentResources(Collection input) { - super(input); - } + public ProdusentResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/StatusResource.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/StatusResource.java index d622d681..c8c3c6ec 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/StatusResource.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/StatusResource.java @@ -1,41 +1,34 @@ package no.novari.fint.model.resource.ressurs.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; 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.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class StatusResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } diff --git a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/StatusResources.java b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/StatusResources.java index cd46e2c8..7011ecfc 100644 --- a/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/StatusResources.java +++ b/fint-ressurs-resource-model-java/src/main/java/no/novari/fint/model/resource/ressurs/kodeverk/StatusResources.java @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class StatusResources extends AbstractCollectionResources { - public StatusResources(Collection input) { - super(input); - } + public StatusResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 ca32bb6d..3a55db62 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 @@ -1,58 +1,56 @@ package no.novari.fint.model.resource.ressurs.tilgang; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class IdentitetResource implements FintResource { - // Attributes - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getPersonalressurs() { - return getLinks().getOrDefault("personalressurs", Collections.emptyList()); - } - public void addPersonalressurs(Link link) { - addLink("personalressurs", link); - } - @JsonIgnore - public List getRettighet() { - return getLinks().getOrDefault("rettighet", Collections.emptyList()); - } - public void addRettighet(Link link) { - addLink("rettighet", link); - } + // Attributes + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getPersonalressurs() { + return getLinks().getOrDefault("personalressurs", Collections.emptyList()); + } + + public void addPersonalressurs(Link link) { + addLink("personalressurs", link); + } + + @JsonIgnore + public List getRettighet() { + return getLinks().getOrDefault("rettighet", Collections.emptyList()); + } + + public void addRettighet(Link link) { + addLink("rettighet", link); + } } 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 6998c742..a292ae95 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class IdentitetResources extends AbstractCollectionResources { - public IdentitetResources(Collection input) { - super(input); - } + public IdentitetResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 05e3f6f1..554ade45 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 @@ -1,50 +1,46 @@ package no.novari.fint.model.resource.ressurs.tilgang; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; 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.constraints.*; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class RettighetResource extends Begrep implements FintResource { - // Attributes - @NotBlank - private String beskrivelse; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + // Attributes + @NotBlank private String beskrivelse; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getIdentitet() { + return getLinks().getOrDefault("identitet", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getIdentitet() { - return getLinks().getOrDefault("identitet", Collections.emptyList()); - } - public void addIdentitet(Link link) { - addLink("identitet", link); - } + public void addIdentitet(Link link) { + addLink("identitet", link); + } } 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 796bf2fd..3914fd93 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class RettighetResources extends AbstractCollectionResources { - public RettighetResources(Collection input) { - super(input); - } + public RettighetResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/BasisklasserActions.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/BasisklasserActions.java index 4f3d8da3..c995364d 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/BasisklasserActions.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/basisklasser/BasisklasserActions.java @@ -4,20 +4,17 @@ import java.util.List; public enum BasisklasserActions { - - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(BasisklasserActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + ; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(BasisklasserActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 283216d8..a5c4a165 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 @@ -1,84 +1,38 @@ package no.novari.fint.model.utdanning.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -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 java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; 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.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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public abstract class Gruppe implements FintAbstractObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; - - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } - } - - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - - relations.addAll(Arrays.asList(Relasjonsnavn.values())); - - return Collections.unmodifiableList(relations); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotBlank - private String beskrivelse; - @NotBlank - private String navn; - @Deprecated - private List<@Valid Periode> periode; - @NotNull - private @Valid Identifikator systemId; +public abstract class Gruppe implements FintAbstractObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; + @NotBlank private String beskrivelse; + @NotBlank private String navn; + @NotNull private @Valid Identifikator systemId; } 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 084d9fed..5a1e75f6 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 @@ -1,49 +1,38 @@ package no.novari.fint.model.utdanning.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; - import java.util.Collections; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; 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.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -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 @EqualsAndHashCode @ToString -public abstract class Gruppemedlemskap implements FintAbstractObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; - private @Valid Periode gyldighetsperiode; - @NotNull - private @Valid Identifikator systemId; +public abstract class Gruppemedlemskap implements FintAbstractObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; + private @Valid Periode gyldighetsperiode; + @NotNull private @Valid Identifikator systemId; } 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 af80eb2f..18b3b846 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 @@ -1,77 +1,37 @@ package no.novari.fint.model.utdanning.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -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 java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintAbstractObject; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public abstract class Utdanningsforhold implements FintAbstractObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - MEDLEMSKAP("medlemskap", "no.novari.fint.model.utdanning.elev.Medlemskap", NONE_TO_MANY); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; - - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } - } - - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - - relations.addAll(Arrays.asList(Relasjonsnavn.values())); - - return Collections.unmodifiableList(relations); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotBlank - private String beskrivelse; - @NotNull - private @Valid Identifikator systemId; +public abstract class Utdanningsforhold implements FintAbstractObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; + @NotBlank private String beskrivelse; + @NotNull private @Valid Identifikator systemId; } 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 deleted file mode 100644 index 405b62c2..00000000 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Basisgruppe.java +++ /dev/null @@ -1,80 +0,0 @@ -package no.novari.fint.model.utdanning.elev; - -import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -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 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.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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Basisgruppe extends Gruppe implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; - - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } - } - - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); - - relations.addAll(Arrays.asList(Relasjonsnavn.values())); - - return Collections.unmodifiableList(relations); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); -} 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 deleted file mode 100644 index 443ac3b0..00000000 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Basisgruppemedlemskap.java +++ /dev/null @@ -1,73 +0,0 @@ -package no.novari.fint.model.utdanning.elev; - -import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -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 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.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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Basisgruppemedlemskap extends Gruppemedlemskap implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; - - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } - } - - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - - relations.addAll(Arrays.asList(Relasjonsnavn.values())); - - return Collections.unmodifiableList(relations); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); -} 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 a8cd20dc..525c4348 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 @@ -1,87 +1,86 @@ package no.novari.fint.model.utdanning.elev; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.kompleksedatatyper.Adresse; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; -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 @EqualsAndHashCode @ToString -public class Elev implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Elev implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + PERSON("person", "no.novari.fint.model.felles.Person", ONE_TO_ONE, "elev"), + ELEVFORHOLD( + "elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", NONE_TO_MANY, "elev"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("brukernavn", this.brukernavn); - identifikators.put("elevnummer", this.elevnummer); - identifikators.put("feidenavn", this.feidenavn); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("brukernavn", this.brukernavn); + identifikators.put("elevnummer", this.elevnummer); + identifikators.put("feidenavn", this.feidenavn); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private @Valid Identifikator brukernavn; - private @Valid Identifikator elevnummer; - private @Valid Identifikator feidenavn; - private Boolean gjest; - private @Valid Adresse hybeladresse; - private @Valid Kontaktinformasjon kontaktinformasjon; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private @Valid Identifikator brukernavn; + private @Valid Identifikator elevnummer; + private @Valid Identifikator feidenavn; + private Boolean gjest; + private @Valid Adresse hybeladresse; + private @Valid Kontaktinformasjon kontaktinformasjon; + @NotNull private @Valid Identifikator systemId; } diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/ElevActions.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/ElevActions.java index 50beca78..9aca25b3 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/ElevActions.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/ElevActions.java @@ -4,59 +4,50 @@ import java.util.List; public enum ElevActions { - - GET_BASISGRUPPE, - GET_ALL_BASISGRUPPE, - UPDATE_BASISGRUPPE, - GET_BASISGRUPPEMEDLEMSKAP, - GET_ALL_BASISGRUPPEMEDLEMSKAP, - UPDATE_BASISGRUPPEMEDLEMSKAP, - GET_ELEV, - GET_ALL_ELEV, - UPDATE_ELEV, - GET_ELEVFORHOLD, - GET_ALL_ELEVFORHOLD, - UPDATE_ELEVFORHOLD, - GET_ELEVTILRETTELEGGING, - GET_ALL_ELEVTILRETTELEGGING, - UPDATE_ELEVTILRETTELEGGING, - GET_KONTAKTLARERGRUPPE, - GET_ALL_KONTAKTLARERGRUPPE, - UPDATE_KONTAKTLARERGRUPPE, - GET_KONTAKTLARERGRUPPEMEDLEMSKAP, - GET_ALL_KONTAKTLARERGRUPPEMEDLEMSKAP, - UPDATE_KONTAKTLARERGRUPPEMEDLEMSKAP, - GET_MEDLEMSKAP, - GET_ALL_MEDLEMSKAP, - UPDATE_MEDLEMSKAP, - GET_PERSONGRUPPE, - GET_ALL_PERSONGRUPPE, - UPDATE_PERSONGRUPPE, - GET_PERSONGRUPPEMEDLEMSKAP, - GET_ALL_PERSONGRUPPEMEDLEMSKAP, - UPDATE_PERSONGRUPPEMEDLEMSKAP, - GET_SKOLERESSURS, - GET_ALL_SKOLERESSURS, - UPDATE_SKOLERESSURS, - GET_UNDERVISNINGSFORHOLD, - GET_ALL_UNDERVISNINGSFORHOLD, - UPDATE_UNDERVISNINGSFORHOLD, - GET_VARSEL, - GET_ALL_VARSEL, - UPDATE_VARSEL - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(ElevActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_ELEV, + GET_ALL_ELEV, + UPDATE_ELEV, + GET_ELEVFORHOLD, + GET_ALL_ELEVFORHOLD, + UPDATE_ELEVFORHOLD, + GET_ELEVTILRETTELEGGING, + GET_ALL_ELEVTILRETTELEGGING, + UPDATE_ELEVTILRETTELEGGING, + GET_KLASSE, + GET_ALL_KLASSE, + UPDATE_KLASSE, + GET_KLASSEMEDLEMSKAP, + GET_ALL_KLASSEMEDLEMSKAP, + UPDATE_KLASSEMEDLEMSKAP, + GET_KONTAKTLARERGRUPPE, + GET_ALL_KONTAKTLARERGRUPPE, + UPDATE_KONTAKTLARERGRUPPE, + GET_KONTAKTLARERGRUPPEMEDLEMSKAP, + GET_ALL_KONTAKTLARERGRUPPEMEDLEMSKAP, + UPDATE_KONTAKTLARERGRUPPEMEDLEMSKAP, + GET_PERSONGRUPPE, + GET_ALL_PERSONGRUPPE, + UPDATE_PERSONGRUPPE, + GET_PERSONGRUPPEMEDLEMSKAP, + GET_ALL_PERSONGRUPPEMEDLEMSKAP, + UPDATE_PERSONGRUPPEMEDLEMSKAP, + GET_SKOLERESSURS, + GET_ALL_SKOLERESSURS, + UPDATE_SKOLERESSURS, + GET_UNDERVISNINGSFORHOLD, + GET_ALL_UNDERVISNINGSFORHOLD, + UPDATE_UNDERVISNINGSFORHOLD, + GET_VARSEL, + GET_ALL_VARSEL, + UPDATE_VARSEL; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(ElevActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new)); + } } - 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 3e9c22ff..89c1d320 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 @@ -1,112 +1,148 @@ package no.novari.fint.model.utdanning.elev; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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.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; +import no.novari.fint.model.utdanning.vurdering.Anmerkninger; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Elevforhold extends Utdanningsforhold implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Elevforhold extends Utdanningsforhold implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ELEV("elev", "no.novari.fint.model.utdanning.elev.Elev", ONE_TO_ONE, "elevforhold"), + KATEGORI("kategori", "no.novari.fint.model.utdanning.kodeverk.Elevkategori", NONE_TO_ONE, null), + SKOLE( + "skole", + "no.novari.fint.model.utdanning.utdanningsprogram.Skole", + ONE_TO_ONE, + "elevforhold"), + AVBRUDDSARSAK( + "avbruddsarsak", + "no.novari.fint.model.utdanning.kodeverk.Avbruddsarsak", + NONE_TO_MANY, + null), + FRAVARSREGISTRERINGER( + "fravarsregistreringer", + "no.novari.fint.model.utdanning.vurdering.Elevfravar", + NONE_TO_ONE, + "elevforhold"), + FAGGRUPPEMEDLEMSKAP( + "faggruppemedlemskap", + "no.novari.fint.model.utdanning.timeplan.Faggruppemedlemskap", + NONE_TO_MANY, + null), + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE, null), + UNDERVISNINGSGRUPPEMEDLEMSKAP( + "undervisningsgruppemedlemskap", + "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppemedlemskap", + NONE_TO_MANY, + "elevforhold"), + PERSONGRUPPEMEDLEMSKAP( + "persongruppemedlemskap", + "no.novari.fint.model.utdanning.elev.Persongruppemedlemskap", + NONE_TO_MANY, + "elevforhold"), + EKSAMENSGRUPPEMEDLEMSKAP( + "eksamensgruppemedlemskap", + "no.novari.fint.model.utdanning.vurdering.Eksamensgruppemedlemskap", + NONE_TO_MANY, + "elevforhold"), + KONTAKTLARERGRUPPEMEDLEMSKAP( + "kontaktlarergruppemedlemskap", + "no.novari.fint.model.utdanning.elev.Kontaktlarergruppemedlemskap", + NONE_TO_MANY, + "elevforhold"), + ELEVFRAVAR( + "elevfravar", + "no.novari.fint.model.utdanning.vurdering.Fravarsoversikt", + NONE_TO_MANY, + "elevforhold"), + TILRETTELEGGING( + "tilrettelegging", + "no.novari.fint.model.utdanning.elev.Elevtilrettelegging", + NONE_TO_MANY, + "elev"), + ELEVVURDERING( + "elevvurdering", + "no.novari.fint.model.utdanning.vurdering.Elevvurdering", + NONE_TO_ONE, + "elevforhold"), + PROGRAMOMRADEMEDLEMSKAP( + "programomrademedlemskap", + "no.novari.fint.model.utdanning.utdanningsprogram.Programomrademedlemskap", + NONE_TO_MANY, + "elevforhold"), + KLASSEMEDLEMSKAP( + "klassemedlemskap", + "no.novari.fint.model.utdanning.elev.Klassemedlemskap", + NONE_TO_MANY, + "elevforhold"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private List<@Valid Anmerkninger> anmerkninger; - private Date avbruddsdato; - private @Valid Periode gyldighetsperiode; - private Boolean hovedskole; - private Boolean tosprakligFagopplaring; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private List<@Valid Anmerkninger> anmerkninger; + private Date avbruddsdato; + private @Valid Periode gyldighetsperiode; + private Boolean hovedskole; + private Boolean tosprakligFagopplaring; } 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 d8d363ed..a38d6d6c 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 @@ -1,78 +1,81 @@ package no.novari.fint.model.utdanning.elev; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Elevtilrettelegging implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Elevtilrettelegging implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ELEV("elev", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE, "tilrettelegging"), + FAG("fag", "no.novari.fint.model.utdanning.timeplan.Fag", NONE_TO_ONE, "tilrettelegging"), + TILRETTELEGGING( + "tilrettelegging", + "no.novari.fint.model.utdanning.kodeverk.Tilrettelegging", + ONE_TO_ONE, + null), + EKSAMENSFORM( + "eksamensform", "no.novari.fint.model.utdanning.kodeverk.Eksamensform", NONE_TO_ONE, null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Identifikator systemId; } diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Klasse.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Klasse.java new file mode 100644 index 00000000..cde18564 --- /dev/null +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Klasse.java @@ -0,0 +1,91 @@ +package no.novari.fint.model.utdanning.elev; + +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintRelation; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Klasse extends Gruppe implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE, null), + TERMIN("termin", "no.novari.fint.model.utdanning.kodeverk.Termin", NONE_TO_MANY, null), + TRINN( + "trinn", "no.novari.fint.model.utdanning.utdanningsprogram.Arstrinn", ONE_TO_ONE, "klasse"), + SKOLE("skole", "no.novari.fint.model.utdanning.utdanningsprogram.Skole", ONE_TO_ONE, "klasse"), + UNDERVISNINGSFORHOLD( + "undervisningsforhold", + "no.novari.fint.model.utdanning.elev.Undervisningsforhold", + NONE_TO_MANY, + "klasse"), + KLASSEMEDLEMSKAP( + "klassemedlemskap", + "no.novari.fint.model.utdanning.elev.Klassemedlemskap", + NONE_TO_MANY, + "klasse"), + KONTAKTLARERGRUPPE( + "kontaktlarergruppe", + "no.novari.fint.model.utdanning.elev.Kontaktlarergruppe", + NONE_TO_MANY, + "klasse"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; + } + } + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); + + relations.addAll(Arrays.asList(Relasjonsnavn.values())); + + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); +} diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Klassemedlemskap.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Klassemedlemskap.java new file mode 100644 index 00000000..e357ecec --- /dev/null +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Klassemedlemskap.java @@ -0,0 +1,75 @@ +package no.novari.fint.model.utdanning.elev; + +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; +import no.novari.fint.model.FintRelation; +import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Klassemedlemskap extends Gruppemedlemskap implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ELEVFORHOLD( + "elevforhold", + "no.novari.fint.model.utdanning.elev.Elevforhold", + ONE_TO_ONE, + "klassemedlemskap"), + KLASSE("klasse", "no.novari.fint.model.utdanning.elev.Klasse", ONE_TO_ONE, "klassemedlemskap"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; + } + } + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); + + relations.addAll(Arrays.asList(Relasjonsnavn.values())); + + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); +} 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 c3e3fcbe..2ff7cb29 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 @@ -1,79 +1,91 @@ package no.novari.fint.model.utdanning.elev; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Kontaktlarergruppe extends Gruppe implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Kontaktlarergruppe extends Gruppe implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + KLASSE( + "klasse", "no.novari.fint.model.utdanning.elev.Klasse", ONE_TO_MANY, "kontaktlarergruppe"), + TERMIN("termin", "no.novari.fint.model.utdanning.kodeverk.Termin", NONE_TO_MANY, null), + SKOLE( + "skole", + "no.novari.fint.model.utdanning.utdanningsprogram.Skole", + ONE_TO_ONE, + "kontaktlarergruppe"), + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE, null), + UNDERVISNINGSFORHOLD( + "undervisningsforhold", + "no.novari.fint.model.utdanning.elev.Undervisningsforhold", + NONE_TO_MANY, + "kontaktlarergruppe"), + GRUPPEMEDLEMSKAP( + "gruppemedlemskap", + "no.novari.fint.model.utdanning.elev.Kontaktlarergruppemedlemskap", + NONE_TO_MANY, + "kontaktlarergruppe"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 69adc097..30e0da47 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 @@ -1,73 +1,79 @@ package no.novari.fint.model.utdanning.elev; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Kontaktlarergruppemedlemskap extends Gruppemedlemskap implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Kontaktlarergruppemedlemskap extends Gruppemedlemskap implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ELEVFORHOLD( + "elevforhold", + "no.novari.fint.model.utdanning.elev.Elevforhold", + ONE_TO_ONE, + "kontaktlarergruppemedlemskap"), + KONTAKTLARERGRUPPE( + "kontaktlarergruppe", + "no.novari.fint.model.utdanning.elev.Kontaktlarergruppe", + ONE_TO_ONE, + "gruppemedlemskap"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 deleted file mode 100644 index 64d7cad2..00000000 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/elev/Medlemskap.java +++ /dev/null @@ -1,81 +0,0 @@ -package no.novari.fint.model.utdanning.elev; - -import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -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.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 -@EqualsAndHashCode -@ToString -@Deprecated -public class Medlemskap implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; - - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } - } - - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - - relations.addAll(Arrays.asList(Relasjonsnavn.values())); - - return Collections.unmodifiableList(relations); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @Deprecated - @NotNull - private @Valid Identifikator systemId; -} 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 d643e27f..aec8286e 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 @@ -1,79 +1,85 @@ package no.novari.fint.model.utdanning.elev; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Persongruppe extends Gruppe implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Persongruppe extends Gruppe implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ELEV("elev", "no.novari.fint.model.utdanning.elev.Elev", NONE_TO_MANY, null), + PERSONGRUPPEMEDLEMSKAP( + "persongruppemedlemskap", + "no.novari.fint.model.utdanning.elev.Persongruppemedlemskap", + NONE_TO_MANY, + "persongruppe"), + TERMIN("termin", "no.novari.fint.model.utdanning.kodeverk.Termin", NONE_TO_MANY, null), + UNDERVISNINGSFORHOLD( + "undervisningsforhold", + "no.novari.fint.model.utdanning.elev.Undervisningsforhold", + NONE_TO_MANY, + null), + SKOLE("skole", "no.novari.fint.model.utdanning.utdanningsprogram.Skole", NONE_TO_MANY, null), + SKOLERESSURS( + "skoleressurs", "no.novari.fint.model.utdanning.elev.Skoleressurs", NONE_TO_MANY, null), + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_MANY, null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 271b7669..32ca8191 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 @@ -1,73 +1,80 @@ package no.novari.fint.model.utdanning.elev; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Persongruppemedlemskap extends Gruppemedlemskap implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Persongruppemedlemskap extends Gruppemedlemskap implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ELEVFORHOLD( + "elevforhold", + "no.novari.fint.model.utdanning.elev.Elevforhold", + NONE_TO_ONE, + "persongruppemedlemskap"), + PERSONGRUPPE( + "persongruppe", + "no.novari.fint.model.utdanning.elev.Persongruppe", + ONE_TO_ONE, + "persongruppemedlemskap"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 aace5f22..2ecb6e17 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 @@ -1,81 +1,93 @@ package no.novari.fint.model.utdanning.elev; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Skoleressurs implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Skoleressurs implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + PERSON("person", "no.novari.fint.model.felles.Person", NONE_TO_ONE, null), + PERSONALRESSURS( + "personalressurs", + "no.novari.fint.model.administrasjon.personal.Personalressurs", + ONE_TO_ONE, + "skoleressurs"), + UNDERVISNINGSFORHOLD( + "undervisningsforhold", + "no.novari.fint.model.utdanning.elev.Undervisningsforhold", + NONE_TO_MANY, + "skoleressurs"), + SKOLE( + "skole", + "no.novari.fint.model.utdanning.utdanningsprogram.Skole", + NONE_TO_MANY, + "skoleressurs"), + SENSOR( + "sensor", "no.novari.fint.model.utdanning.vurdering.Sensor", NONE_TO_MANY, "skoleressurs"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("feidenavn", this.feidenavn); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("feidenavn", this.feidenavn); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private @Valid Identifikator feidenavn; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private @Valid Identifikator feidenavn; + @NotNull private @Valid Identifikator systemId; } 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 4ad91438..9d4fa24b 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 @@ -1,81 +1,111 @@ package no.novari.fint.model.utdanning.elev; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Utdanningsforhold; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Undervisningsforhold extends Utdanningsforhold implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Undervisningsforhold extends Utdanningsforhold implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ARBEIDSFORHOLD( + "arbeidsforhold", + "no.novari.fint.model.administrasjon.personal.Arbeidsforhold", + ONE_TO_ONE, + "undervisningsforhold"), + KLASSE( + "klasse", + "no.novari.fint.model.utdanning.elev.Klasse", + NONE_TO_MANY, + "undervisningsforhold"), + KONTAKTLARERGRUPPE( + "kontaktlarergruppe", + "no.novari.fint.model.utdanning.elev.Kontaktlarergruppe", + NONE_TO_MANY, + "undervisningsforhold"), + UNDERVISNINGSGRUPPE( + "undervisningsgruppe", + "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppe", + NONE_TO_MANY, + "undervisningsforhold"), + EKSAMENSGRUPPE( + "eksamensgruppe", + "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", + NONE_TO_MANY, + "undervisningsforhold"), + TIME( + "time", + "no.novari.fint.model.utdanning.timeplan.Time", + NONE_TO_MANY, + "undervisningsforhold"), + SKOLE( + "skole", + "no.novari.fint.model.utdanning.utdanningsprogram.Skole", + ONE_TO_ONE, + "undervisningsforhold"), + SKOLERESSURS( + "skoleressurs", + "no.novari.fint.model.utdanning.elev.Skoleressurs", + ONE_TO_ONE, + "undervisningsforhold"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private Boolean hovedskole; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private Boolean hovedskole; } 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 7b348463..c84ac874 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 @@ -1,85 +1,88 @@ package no.novari.fint.model.utdanning.elev; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; -import java.util.Date; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Varsel implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Varsel implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + UTSTEDER("utsteder", "no.novari.fint.model.utdanning.elev.Skoleressurs", NONE_TO_ONE, null), + KARAKTERANSVARLIG( + "karakteransvarlig", + "no.novari.fint.model.utdanning.elev.Undervisningsforhold", + NONE_TO_ONE, + null), + TYPE("type", "no.novari.fint.model.utdanning.kodeverk.Varseltype", NONE_TO_ONE, null), + FAGGRUPPEMEDLEMSKAP( + "faggruppemedlemskap", + "no.novari.fint.model.utdanning.timeplan.Faggruppemedlemskap", + ONE_TO_ONE, + "varsel"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private Long fravarsprosent; - @NotNull - private Date sendt; - @NotNull - private @Valid Identifikator systemId; - @NotBlank - private String tekst; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private Long fravarsprosent; + @NotNull private Date sendt; + @NotNull private @Valid Identifikator systemId; + @NotBlank private String tekst; } 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 e579d76f..dc865804 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Avbruddsarsak extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Avbruddsarsak extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 bcef263f..fca824ec 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Betalingsstatus extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Betalingsstatus extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 84f9b934..cef7d9db 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Bevistype extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Bevistype extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 1a1c1d6f..c4327888 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Brevtype extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Brevtype extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 51081055..5705c4b9 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Eksamensform extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Eksamensform extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 565e83e2..4f0d0aea 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Elevkategori extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Elevkategori extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 15d797ed..42f3d0cd 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Fagmerknad extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Fagmerknad extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 f5214353..6c7936ff 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Fagstatus extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Fagstatus extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 3da97092..4a69a6de 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Fravarstype extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Fravarstype extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 321ba60c..8ef1c5ee 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Fullfortkode extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Fullfortkode extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 74df9000..f10816fc 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 @@ -1,31 +1,22 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; -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.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 @EqualsAndHashCode @ToString -public class Grepreferanse implements FintReference { +public class Grepreferanse implements FintReference { - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; + @JsonIgnore private final boolean writeable = false; } 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 d05cd053..e1f71bc5 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 @@ -1,73 +1,76 @@ package no.novari.fint.model.utdanning.kodeverk; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Karakterskala extends Begrep implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Karakterskala extends Begrep implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + VIGOREFERANSE( + "vigoreferanse", + "no.novari.fint.model.utdanning.kodeverk.Vigoreferanse", + NONE_TO_ONE, + null), + VERDI("verdi", "no.novari.fint.model.utdanning.vurdering.Karakterverdi", NONE_TO_MANY, "skala"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 afd532ac..574f0dac 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Karakterstatus extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Karakterstatus extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/KodeverkActions.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/KodeverkActions.java index 42b59968..3229313a 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/KodeverkActions.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/kodeverk/KodeverkActions.java @@ -4,83 +4,79 @@ import java.util.List; public enum KodeverkActions { - - GET_AVBRUDDSARSAK, - GET_ALL_AVBRUDDSARSAK, - UPDATE_AVBRUDDSARSAK, - GET_BETALINGSSTATUS, - GET_ALL_BETALINGSSTATUS, - UPDATE_BETALINGSSTATUS, - GET_BEVISTYPE, - GET_ALL_BEVISTYPE, - UPDATE_BEVISTYPE, - GET_BREVTYPE, - GET_ALL_BREVTYPE, - UPDATE_BREVTYPE, - GET_EKSAMENSFORM, - GET_ALL_EKSAMENSFORM, - UPDATE_EKSAMENSFORM, - GET_ELEVKATEGORI, - GET_ALL_ELEVKATEGORI, - UPDATE_ELEVKATEGORI, - GET_FAGMERKNAD, - GET_ALL_FAGMERKNAD, - UPDATE_FAGMERKNAD, - GET_FAGSTATUS, - GET_ALL_FAGSTATUS, - UPDATE_FAGSTATUS, - GET_FRAVARSTYPE, - GET_ALL_FRAVARSTYPE, - UPDATE_FRAVARSTYPE, - GET_FULLFORTKODE, - GET_ALL_FULLFORTKODE, - UPDATE_FULLFORTKODE, - GET_KARAKTERSKALA, - GET_ALL_KARAKTERSKALA, - UPDATE_KARAKTERSKALA, - GET_KARAKTERSTATUS, - GET_ALL_KARAKTERSTATUS, - UPDATE_KARAKTERSTATUS, - GET_OTENHET, - GET_ALL_OTENHET, - UPDATE_OTENHET, - GET_OTSTATUS, - GET_ALL_OTSTATUS, - UPDATE_OTSTATUS, - GET_PROVESTATUS, - GET_ALL_PROVESTATUS, - UPDATE_PROVESTATUS, - GET_SKOLEAR, - GET_ALL_SKOLEAR, - UPDATE_SKOLEAR, - GET_SKOLEEIERTYPE, - GET_ALL_SKOLEEIERTYPE, - UPDATE_SKOLEEIERTYPE, - GET_TERMIN, - GET_ALL_TERMIN, - UPDATE_TERMIN, - GET_TILRETTELEGGING, - GET_ALL_TILRETTELEGGING, - UPDATE_TILRETTELEGGING, - GET_VARSELTYPE, - GET_ALL_VARSELTYPE, - UPDATE_VARSELTYPE, - GET_VITNEMALSMERKNAD, - GET_ALL_VITNEMALSMERKNAD, - UPDATE_VITNEMALSMERKNAD - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(KodeverkActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_BREVTYPE, + GET_ALL_BREVTYPE, + UPDATE_BREVTYPE, + GET_BEVISTYPE, + GET_ALL_BEVISTYPE, + UPDATE_BEVISTYPE, + GET_FULLFORTKODE, + GET_ALL_FULLFORTKODE, + UPDATE_FULLFORTKODE, + GET_PROVESTATUS, + GET_ALL_PROVESTATUS, + UPDATE_PROVESTATUS, + GET_BETALINGSSTATUS, + GET_ALL_BETALINGSSTATUS, + UPDATE_BETALINGSSTATUS, + GET_VARSELTYPE, + GET_ALL_VARSELTYPE, + UPDATE_VARSELTYPE, + GET_VITNEMALSMERKNAD, + GET_ALL_VITNEMALSMERKNAD, + UPDATE_VITNEMALSMERKNAD, + GET_FAGSTATUS, + GET_ALL_FAGSTATUS, + UPDATE_FAGSTATUS, + GET_OTENHET, + GET_ALL_OTENHET, + UPDATE_OTENHET, + GET_OTSTATUS, + GET_ALL_OTSTATUS, + UPDATE_OTSTATUS, + GET_FAGMERKNAD, + GET_ALL_FAGMERKNAD, + UPDATE_FAGMERKNAD, + GET_TILRETTELEGGING, + GET_ALL_TILRETTELEGGING, + UPDATE_TILRETTELEGGING, + GET_AVBRUDDSARSAK, + GET_ALL_AVBRUDDSARSAK, + UPDATE_AVBRUDDSARSAK, + GET_EKSAMENSFORM, + GET_ALL_EKSAMENSFORM, + UPDATE_EKSAMENSFORM, + GET_KARAKTERSTATUS, + GET_ALL_KARAKTERSTATUS, + UPDATE_KARAKTERSTATUS, + GET_SKOLEAR, + GET_ALL_SKOLEAR, + UPDATE_SKOLEAR, + GET_TERMIN, + GET_ALL_TERMIN, + UPDATE_TERMIN, + GET_KARAKTERSKALA, + GET_ALL_KARAKTERSKALA, + UPDATE_KARAKTERSKALA, + GET_FRAVARSTYPE, + GET_ALL_FRAVARSTYPE, + UPDATE_FRAVARSTYPE, + GET_ELEVKATEGORI, + GET_ALL_ELEVKATEGORI, + UPDATE_ELEVKATEGORI, + GET_SKOLEEIERTYPE, + GET_ALL_SKOLEEIERTYPE, + UPDATE_SKOLEEIERTYPE; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(KodeverkActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 88be8663..08b41a4f 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 @@ -1,72 +1,70 @@ package no.novari.fint.model.utdanning.kodeverk; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class OtEnhet extends Begrep implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - KOMMUNE("kommune", "no.novari.fint.model.felles.kodeverk.Kommune", ONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class OtEnhet extends Begrep implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + KOMMUNE("kommune", "no.novari.fint.model.felles.kodeverk.Kommune", ONE_TO_ONE, null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 2bb97b55..c3c97820 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 @@ -1,47 +1,36 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; - import java.util.Collections; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; -import no.novari.fint.model.FintRelation; +import no.novari.fint.model.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class OtStatus extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; - private String beskrivelse; - @NotBlank - private String type; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class OtStatus extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; + private String beskrivelse; + @NotBlank private String type; } 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 7fb55bc9..157b966a 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Provestatus extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Provestatus extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 5cee2921..95fa28d2 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Skolear extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Skolear extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 65df904e..a6aa2428 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Skoleeiertype extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Skoleeiertype extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 b7ded9c8..7f3e3897 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Termin extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Termin extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 4e3462d3..2084979f 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Tilrettelegging extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Tilrettelegging extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 c8d2c879..0dfefcb9 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Varseltype extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Varseltype extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 ce897f47..f39a988f 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 @@ -1,31 +1,22 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; -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.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 @EqualsAndHashCode @ToString -public class Vigoreferanse implements FintReference { +public class Vigoreferanse implements FintReference { - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; + @JsonIgnore private final boolean writeable = false; } 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 1eb6c10d..5a1ea43f 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 @@ -1,44 +1,34 @@ package no.novari.fint.model.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -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.FintModelObject; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Vitnemalsmerknad extends Begrep implements FintModelObject { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Vitnemalsmerknad extends Begrep implements FintModelObject { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + public boolean isWriteable() { + return this.writeable; + } + + @JsonIgnore private final boolean writeable = false; } 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 2476dd07..2e23d7f6 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 @@ -1,81 +1,81 @@ package no.novari.fint.model.utdanning.larling; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; -import java.util.Date; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class AvlagtProve implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class AvlagtProve implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + PROVESTATUS( + "provestatus", "no.novari.fint.model.utdanning.kodeverk.Provestatus", NONE_TO_ONE, null), + LARLING("larling", "no.novari.fint.model.utdanning.larling.Larling", ONE_TO_ONE, "avlagtprove"), + FULLFORTKODE( + "fullfortkode", "no.novari.fint.model.utdanning.kodeverk.Fullfortkode", NONE_TO_ONE, null), + BREVTYPE("brevtype", "no.novari.fint.model.utdanning.kodeverk.Brevtype", NONE_TO_ONE, null), + BEVISTYPE("bevistype", "no.novari.fint.model.utdanning.kodeverk.Bevistype", NONE_TO_ONE, null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private Date provedato; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private Date provedato; + @NotNull private @Valid Identifikator systemId; } 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 8c48046e..632a7fc9 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 @@ -1,81 +1,88 @@ package no.novari.fint.model.utdanning.larling; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -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 @EqualsAndHashCode @ToString -public class Larling implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Larling implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + PERSON("person", "no.novari.fint.model.felles.Person", ONE_TO_ONE, "larling"), + BEDRIFT("bedrift", "no.novari.fint.model.felles.Virksomhet", NONE_TO_ONE, "larling"), + PROGRAMOMRADE( + "programomrade", + "no.novari.fint.model.utdanning.utdanningsprogram.Programomrade", + NONE_TO_ONE, + null), + AVLAGTPROVE( + "avlagtprove", + "no.novari.fint.model.utdanning.larling.AvlagtProve", + NONE_TO_MANY, + "larling"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private String kontraktstype; - private @Valid Periode laretid; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private String kontraktstype; + private @Valid Periode laretid; + @NotNull private @Valid Identifikator systemId; } diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/LarlingActions.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/LarlingActions.java index a2f2ea74..6376a0ad 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/LarlingActions.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/larling/LarlingActions.java @@ -4,26 +4,22 @@ import java.util.List; public enum LarlingActions { - - GET_AVLAGTPROVE, - GET_ALL_AVLAGTPROVE, - UPDATE_AVLAGTPROVE, - GET_LARLING, - GET_ALL_LARLING, - UPDATE_LARLING - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(LarlingActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_AVLAGTPROVE, + GET_ALL_AVLAGTPROVE, + UPDATE_AVLAGTPROVE, + GET_LARLING, + GET_ALL_LARLING, + UPDATE_LARLING; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(LarlingActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/ot/OtActions.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/ot/OtActions.java index ffa40776..4b8a14d6 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/ot/OtActions.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/ot/OtActions.java @@ -4,23 +4,17 @@ import java.util.List; public enum OtActions { - - GET_OTUNGDOM, - GET_ALL_OTUNGDOM, - UPDATE_OTUNGDOM - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(OtActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_OTUNGDOM, + GET_ALL_OTUNGDOM, + UPDATE_OTUNGDOM; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(OtActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new)); + } } - 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 44084967..27f25e3d 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 @@ -1,78 +1,80 @@ package no.novari.fint.model.utdanning.ot; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class OtUngdom implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class OtUngdom implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + PERSON("person", "no.novari.fint.model.felles.Person", ONE_TO_ONE, "otungdom"), + STATUS("status", "no.novari.fint.model.utdanning.kodeverk.OtStatus", NONE_TO_ONE, null), + ENHET("enhet", "no.novari.fint.model.utdanning.kodeverk.OtEnhet", NONE_TO_ONE, null), + PROGRAMOMRADE( + "programomrade", + "no.novari.fint.model.utdanning.utdanningsprogram.Programomrade", + NONE_TO_ONE, + null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Identifikator systemId; } 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 9779806b..305cee7d 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 @@ -1,86 +1,83 @@ package no.novari.fint.model.utdanning.timeplan; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; -import java.util.Date; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; - -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 @EqualsAndHashCode @ToString -public class Eksamen implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Eksamen implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ROM("rom", "no.novari.fint.model.utdanning.timeplan.Rom", NONE_TO_MANY, "eksamen"), + EKSAMENSGRUPPE( + "eksamensgruppe", + "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", + NONE_TO_MANY, + "eksamen"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private String beskrivelse; - @NotBlank - private String navn; - private @Valid Date oppmotetidspunkt; - @NotNull - private @Valid Identifikator systemId; - @NotNull - private @Valid Periode tidsrom; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private String beskrivelse; + @NotBlank private String navn; + private Date oppmotetidspunkt; + @NotNull private @Valid Identifikator systemId; + @NotNull private @Valid Periode tidsrom; } 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 f922f683..2668db42 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 @@ -1,78 +1,103 @@ package no.novari.fint.model.utdanning.timeplan; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Fag extends Gruppe implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Fag extends Gruppe implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + GREPREFERANSE( + "grepreferanse", + "no.novari.fint.model.utdanning.kodeverk.Grepreferanse", + NONE_TO_ONE, + null), + PROGRAMOMRADE( + "programomrade", + "no.novari.fint.model.utdanning.utdanningsprogram.Programomrade", + NONE_TO_MANY, + "fag"), + VIGOREFERANSE( + "vigoreferanse", + "no.novari.fint.model.utdanning.kodeverk.Vigoreferanse", + NONE_TO_ONE, + null), + TILRETTELEGGING( + "tilrettelegging", + "no.novari.fint.model.utdanning.elev.Elevtilrettelegging", + NONE_TO_MANY, + "fag"), + FAGGRUPPE( + "faggruppe", "no.novari.fint.model.utdanning.timeplan.Faggruppe", NONE_TO_MANY, "fag"), + SKOLE("skole", "no.novari.fint.model.utdanning.utdanningsprogram.Skole", NONE_TO_MANY, "fag"), + UNDERVISNINGSGRUPPE( + "undervisningsgruppe", + "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppe", + NONE_TO_MANY, + "fag"), + EKSAMENSGRUPPE( + "eksamensgruppe", + "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", + NONE_TO_MANY, + "fag"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 1697f304..78ae5201 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 @@ -1,76 +1,83 @@ package no.novari.fint.model.utdanning.timeplan; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Faggruppe extends Gruppe implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Faggruppe extends Gruppe implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + FAG("fag", "no.novari.fint.model.utdanning.timeplan.Fag", ONE_TO_ONE, "faggruppe"), + SKOLE( + "skole", + "no.novari.fint.model.utdanning.utdanningsprogram.Skole", + NONE_TO_ONE, + "faggruppe"), + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE, null), + FAGGRUPPEMEDLEMSKAP( + "faggruppemedlemskap", + "no.novari.fint.model.utdanning.timeplan.Faggruppemedlemskap", + NONE_TO_MANY, + "faggruppe"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 b9dd5452..fdf753f2 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 @@ -1,76 +1,85 @@ package no.novari.fint.model.utdanning.timeplan; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Faggruppemedlemskap extends Gruppemedlemskap implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Faggruppemedlemskap extends Gruppemedlemskap implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + FAGMERKNAD( + "fagmerknad", "no.novari.fint.model.utdanning.kodeverk.Fagmerknad", NONE_TO_ONE, null), + FAGSTATUS("fagstatus", "no.novari.fint.model.utdanning.kodeverk.Fagstatus", NONE_TO_ONE, null), + ELEVFORHOLD("elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE, null), + VARSEL( + "varsel", + "no.novari.fint.model.utdanning.elev.Varsel", + NONE_TO_MANY, + "faggruppemedlemskap"), + FAGGRUPPE( + "faggruppe", + "no.novari.fint.model.utdanning.timeplan.Faggruppe", + ONE_TO_ONE, + "faggruppemedlemskap"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 0e3cddf2..dd7de956 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 @@ -1,77 +1,74 @@ package no.novari.fint.model.utdanning.timeplan; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Rom implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Rom implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + TIME("time", "no.novari.fint.model.utdanning.timeplan.Time", NONE_TO_MANY, "rom"), + EKSAMEN("eksamen", "no.novari.fint.model.utdanning.timeplan.Eksamen", NONE_TO_MANY, "rom"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private String navn; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private String navn; + @NotNull private @Valid Identifikator systemId; } 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 bc62556d..e7f4f47c 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 @@ -1,83 +1,87 @@ package no.novari.fint.model.utdanning.timeplan; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -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 @EqualsAndHashCode @ToString -public class Time implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Time implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + UNDERVISNINGSGRUPPE( + "undervisningsgruppe", + "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppe", + ONE_TO_MANY, + "time"), + UNDERVISNINGSFORHOLD( + "undervisningsforhold", + "no.novari.fint.model.utdanning.elev.Undervisningsforhold", + ONE_TO_MANY, + "time"), + ROM("rom", "no.novari.fint.model.utdanning.timeplan.Rom", NONE_TO_MANY, "time"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private String beskrivelse; - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator systemId; - @NotNull - private @Valid Periode tidsrom; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private String beskrivelse; + @NotBlank private String navn; + @NotNull private @Valid Identifikator systemId; + @NotNull private @Valid Periode tidsrom; } diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/TimeplanActions.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/TimeplanActions.java index 385bd608..422162f7 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/TimeplanActions.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/timeplan/TimeplanActions.java @@ -4,44 +4,40 @@ import java.util.List; public enum TimeplanActions { - - GET_EKSAMEN, - GET_ALL_EKSAMEN, - UPDATE_EKSAMEN, - GET_FAG, - GET_ALL_FAG, - UPDATE_FAG, - GET_FAGGRUPPE, - GET_ALL_FAGGRUPPE, - UPDATE_FAGGRUPPE, - GET_FAGGRUPPEMEDLEMSKAP, - GET_ALL_FAGGRUPPEMEDLEMSKAP, - UPDATE_FAGGRUPPEMEDLEMSKAP, - GET_ROM, - GET_ALL_ROM, - UPDATE_ROM, - GET_TIME, - GET_ALL_TIME, - UPDATE_TIME, - GET_UNDERVISNINGSGRUPPE, - GET_ALL_UNDERVISNINGSGRUPPE, - UPDATE_UNDERVISNINGSGRUPPE, - GET_UNDERVISNINGSGRUPPEMEDLEMSKAP, - GET_ALL_UNDERVISNINGSGRUPPEMEDLEMSKAP, - UPDATE_UNDERVISNINGSGRUPPEMEDLEMSKAP - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(TimeplanActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_EKSAMEN, + GET_ALL_EKSAMEN, + UPDATE_EKSAMEN, + GET_FAG, + GET_ALL_FAG, + UPDATE_FAG, + GET_FAGGRUPPE, + GET_ALL_FAGGRUPPE, + UPDATE_FAGGRUPPE, + GET_FAGGRUPPEMEDLEMSKAP, + GET_ALL_FAGGRUPPEMEDLEMSKAP, + UPDATE_FAGGRUPPEMEDLEMSKAP, + GET_ROM, + GET_ALL_ROM, + UPDATE_ROM, + GET_TIME, + GET_ALL_TIME, + UPDATE_TIME, + GET_UNDERVISNINGSGRUPPE, + GET_ALL_UNDERVISNINGSGRUPPE, + UPDATE_UNDERVISNINGSGRUPPE, + GET_UNDERVISNINGSGRUPPEMEDLEMSKAP, + GET_ALL_UNDERVISNINGSGRUPPEMEDLEMSKAP, + UPDATE_UNDERVISNINGSGRUPPEMEDLEMSKAP; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(TimeplanActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 4ee777cc..2df8a533 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 @@ -1,80 +1,95 @@ package no.novari.fint.model.utdanning.timeplan; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Undervisningsgruppe extends Gruppe implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Undervisningsgruppe extends Gruppe implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + FAG("fag", "no.novari.fint.model.utdanning.timeplan.Fag", ONE_TO_MANY, "undervisningsgruppe"), + TERMIN("termin", "no.novari.fint.model.utdanning.kodeverk.Termin", NONE_TO_MANY, null), + SKOLE( + "skole", + "no.novari.fint.model.utdanning.utdanningsprogram.Skole", + ONE_TO_ONE, + "undervisningsgruppe"), + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE, null), + UNDERVISNINGSFORHOLD( + "undervisningsforhold", + "no.novari.fint.model.utdanning.elev.Undervisningsforhold", + NONE_TO_MANY, + "undervisningsgruppe"), + TIME( + "time", + "no.novari.fint.model.utdanning.timeplan.Time", + NONE_TO_MANY, + "undervisningsgruppe"), + GRUPPEMEDLEMSKAP( + "gruppemedlemskap", + "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppemedlemskap", + NONE_TO_MANY, + "undervisningsgruppe"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 23d344da..5e031cd1 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 @@ -1,73 +1,79 @@ package no.novari.fint.model.utdanning.timeplan; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Undervisningsgruppemedlemskap extends Gruppemedlemskap implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Undervisningsgruppemedlemskap extends Gruppemedlemskap implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ELEVFORHOLD( + "elevforhold", + "no.novari.fint.model.utdanning.elev.Elevforhold", + ONE_TO_ONE, + "undervisningsgruppemedlemskap"), + UNDERVISNINGSGRUPPE( + "undervisningsgruppe", + "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppe", + ONE_TO_ONE, + "gruppemedlemskap"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 e7dbc768..888a4ff3 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 @@ -1,74 +1,86 @@ package no.novari.fint.model.utdanning.utdanningsprogram; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Arstrinn extends Gruppe implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Arstrinn extends Gruppe implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + VIGOREFERANSE( + "vigoreferanse", + "no.novari.fint.model.utdanning.kodeverk.Vigoreferanse", + NONE_TO_ONE, + null), + GREPREFERANSE( + "grepreferanse", + "no.novari.fint.model.utdanning.kodeverk.Grepreferanse", + NONE_TO_ONE, + null), + PROGRAMOMRADE( + "programomrade", + "no.novari.fint.model.utdanning.utdanningsprogram.Programomrade", + NONE_TO_MANY, + "trinn"), + KLASSE("klasse", "no.novari.fint.model.utdanning.elev.Klasse", NONE_TO_MANY, "trinn"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 0210cc51..13e69d10 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 @@ -1,77 +1,97 @@ package no.novari.fint.model.utdanning.utdanningsprogram; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_MANY; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Programomrade extends Gruppe implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Programomrade extends Gruppe implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + GREPREFERANSE( + "grepreferanse", + "no.novari.fint.model.utdanning.kodeverk.Grepreferanse", + NONE_TO_ONE, + null), + UTDANNINGSPROGRAM( + "utdanningsprogram", + "no.novari.fint.model.utdanning.utdanningsprogram.Utdanningsprogram", + ONE_TO_MANY, + "programomrade"), + VIGOREFERANSE( + "vigoreferanse", + "no.novari.fint.model.utdanning.kodeverk.Vigoreferanse", + NONE_TO_ONE, + null), + FAG("fag", "no.novari.fint.model.utdanning.timeplan.Fag", NONE_TO_MANY, "programomrade"), + TRINN( + "trinn", + "no.novari.fint.model.utdanning.utdanningsprogram.Arstrinn", + NONE_TO_MANY, + "programomrade"), + GRUPPEMEDLEMSKAP( + "gruppemedlemskap", + "no.novari.fint.model.utdanning.utdanningsprogram.Programomrademedlemskap", + NONE_TO_MANY, + "programomrade"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 5e87faae..e30e3663 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 @@ -1,73 +1,79 @@ package no.novari.fint.model.utdanning.utdanningsprogram; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Programomrademedlemskap extends Gruppemedlemskap implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Programomrademedlemskap extends Gruppemedlemskap implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ELEVFORHOLD( + "elevforhold", + "no.novari.fint.model.utdanning.elev.Elevforhold", + ONE_TO_ONE, + "programomrademedlemskap"), + PROGRAMOMRADE( + "programomrade", + "no.novari.fint.model.utdanning.utdanningsprogram.Programomrade", + ONE_TO_ONE, + "gruppemedlemskap"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 df4f67bf..330278c6 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 @@ -1,96 +1,127 @@ package no.novari.fint.model.utdanning.utdanningsprogram; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Enhet; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Skole extends Enhet implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Skole extends Enhet implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ORGANISASJON( + "organisasjon", + "no.novari.fint.model.administrasjon.organisasjon.Organisasjonselement", + NONE_TO_ONE, + "skole"), + FAG("fag", "no.novari.fint.model.utdanning.timeplan.Fag", NONE_TO_MANY, "skole"), + SKOLEEIERTYPE( + "skoleeierType", + "no.novari.fint.model.utdanning.kodeverk.Skoleeiertype", + NONE_TO_ONE, + null), + VIGOREFERANSE( + "vigoreferanse", + "no.novari.fint.model.utdanning.kodeverk.Vigoreferanse", + NONE_TO_ONE, + null), + ELEVFORHOLD( + "elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", NONE_TO_MANY, "skole"), + KLASSE("klasse", "no.novari.fint.model.utdanning.elev.Klasse", NONE_TO_MANY, "skole"), + KONTAKTLARERGRUPPE( + "kontaktlarergruppe", + "no.novari.fint.model.utdanning.elev.Kontaktlarergruppe", + NONE_TO_MANY, + "skole"), + SKOLERESSURS( + "skoleressurs", "no.novari.fint.model.utdanning.elev.Skoleressurs", NONE_TO_MANY, "skole"), + UNDERVISNINGSFORHOLD( + "undervisningsforhold", + "no.novari.fint.model.utdanning.elev.Undervisningsforhold", + NONE_TO_MANY, + "skole"), + FAGGRUPPE( + "faggruppe", "no.novari.fint.model.utdanning.timeplan.Faggruppe", NONE_TO_MANY, "skole"), + UNDERVISNINGSGRUPPE( + "undervisningsgruppe", + "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppe", + NONE_TO_MANY, + "skole"), + EKSAMENSGRUPPE( + "eksamensgruppe", + "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", + NONE_TO_MANY, + "skole"), + UTDANNINGSPROGRAM( + "utdanningsprogram", + "no.novari.fint.model.utdanning.utdanningsprogram.Utdanningsprogram", + NONE_TO_MANY, + "skole"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - identifikators.put("skolenummer", this.skolenummer); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + identifikators.put("skolenummer", this.skolenummer); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private String domenenavn; - private String juridiskNavn; - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator skolenummer; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private String domenenavn; + private String juridiskNavn; + @NotBlank private String navn; + @NotNull private @Valid Identifikator skolenummer; + @NotNull private @Valid Identifikator systemId; } 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 a05c6386..27626dc1 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 @@ -1,74 +1,90 @@ package no.novari.fint.model.utdanning.utdanningsprogram; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Utdanningsprogram extends Gruppe implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Utdanningsprogram extends Gruppe implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + SKOLE( + "skole", + "no.novari.fint.model.utdanning.utdanningsprogram.Skole", + NONE_TO_MANY, + "utdanningsprogram"), + GREPREFERANSE( + "grepreferanse", + "no.novari.fint.model.utdanning.kodeverk.Grepreferanse", + NONE_TO_ONE, + null), + VIGOREFERANSE( + "vigoreferanse", + "no.novari.fint.model.utdanning.kodeverk.Vigoreferanse", + NONE_TO_ONE, + null), + PROGRAMOMRADE( + "programomrade", + "no.novari.fint.model.utdanning.utdanningsprogram.Programomrade", + NONE_TO_MANY, + "utdanningsprogram"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/UtdanningsprogramActions.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/UtdanningsprogramActions.java index 03b9eb7b..56181339 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/UtdanningsprogramActions.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/utdanningsprogram/UtdanningsprogramActions.java @@ -4,35 +4,31 @@ import java.util.List; public enum UtdanningsprogramActions { - - GET_ARSTRINN, - GET_ALL_ARSTRINN, - UPDATE_ARSTRINN, - GET_PROGRAMOMRADE, - GET_ALL_PROGRAMOMRADE, - UPDATE_PROGRAMOMRADE, - GET_PROGRAMOMRADEMEDLEMSKAP, - GET_ALL_PROGRAMOMRADEMEDLEMSKAP, - UPDATE_PROGRAMOMRADEMEDLEMSKAP, - GET_SKOLE, - GET_ALL_SKOLE, - UPDATE_SKOLE, - GET_UTDANNINGSPROGRAM, - GET_ALL_UTDANNINGSPROGRAM, - UPDATE_UTDANNINGSPROGRAM - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(UtdanningsprogramActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_ARSTRINN, + GET_ALL_ARSTRINN, + UPDATE_ARSTRINN, + GET_PROGRAMOMRADE, + GET_ALL_PROGRAMOMRADE, + UPDATE_PROGRAMOMRADE, + GET_PROGRAMOMRADEMEDLEMSKAP, + GET_ALL_PROGRAMOMRADEMEDLEMSKAP, + UPDATE_PROGRAMOMRADEMEDLEMSKAP, + GET_SKOLE, + GET_ALL_SKOLE, + UPDATE_SKOLE, + GET_UTDANNINGSPROGRAM, + GET_ALL_UTDANNINGSPROGRAM, + UPDATE_UTDANNINGSPROGRAM; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(UtdanningsprogramActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - 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 017eacd3..a3806827 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 @@ -1,79 +1,74 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Anmerkninger implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +public class Anmerkninger implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE, null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private Integer atferd; - @NotNull - private Integer orden; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private Integer atferd; + @NotNull private Integer orden; + @NotNull private @Valid Identifikator systemId; } 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 473ec1aa..955cc580 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 @@ -1,85 +1,104 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; -import java.util.Date; import no.novari.fint.model.utdanning.basisklasser.Gruppe; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Eksamensgruppe extends Gruppe implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Eksamensgruppe extends Gruppe implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + EKSAMEN( + "eksamen", + "no.novari.fint.model.utdanning.timeplan.Eksamen", + NONE_TO_ONE, + "eksamensgruppe"), + FAG("fag", "no.novari.fint.model.utdanning.timeplan.Fag", ONE_TO_ONE, "eksamensgruppe"), + SKOLE( + "skole", + "no.novari.fint.model.utdanning.utdanningsprogram.Skole", + ONE_TO_ONE, + "eksamensgruppe"), + TERMIN("termin", "no.novari.fint.model.utdanning.kodeverk.Termin", ONE_TO_ONE, null), + EKSAMENSFORM( + "eksamensform", "no.novari.fint.model.utdanning.kodeverk.Eksamensform", NONE_TO_ONE, null), + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE, null), + UNDERVISNINGSFORHOLD( + "undervisningsforhold", + "no.novari.fint.model.utdanning.elev.Undervisningsforhold", + NONE_TO_MANY, + "eksamensgruppe"), + GRUPPEMEDLEMSKAP( + "gruppemedlemskap", + "no.novari.fint.model.utdanning.vurdering.Eksamensgruppemedlemskap", + NONE_TO_MANY, + "eksamensgruppe"), + SENSOR( + "sensor", + "no.novari.fint.model.utdanning.vurdering.Sensor", + NONE_TO_MANY, + "eksamensgruppe"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = true; - @JsonIgnore - private final List relations = createRelations(); - private @Valid Date eksamensdato; + @JsonIgnore private final boolean writeable = true; + @JsonIgnore private final List relations = createRelations(); + private @Valid Date eksamensdato; } 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 cb61dff9..c13e9ebd 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 @@ -1,80 +1,96 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Eksamensgruppemedlemskap extends Gruppemedlemskap implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Eksamensgruppemedlemskap extends Gruppemedlemskap implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + DELEGERTTIL("delegertTil", "no.novari.fint.model.felles.kodeverk.Fylke", NONE_TO_ONE, null), + ELEVFORHOLD( + "elevforhold", + "no.novari.fint.model.utdanning.elev.Elevforhold", + ONE_TO_ONE, + "eksamensgruppemedlemskap"), + FORETRUKKETSKOLE( + "foretrukketSkole", + "no.novari.fint.model.utdanning.utdanningsprogram.Skole", + NONE_TO_ONE, + null), + EKSAMENSGRUPPE( + "eksamensgruppe", + "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", + ONE_TO_ONE, + "gruppemedlemskap"), + NUS("nus", "no.novari.fint.model.utdanning.kodeverk.Karakterstatus", NONE_TO_ONE, null), + BETALINGSSTATUS( + "betalingsstatus", + "no.novari.fint.model.utdanning.kodeverk.Betalingsstatus", + NONE_TO_ONE, + null), + FORETRUKKETSENSOR( + "foretrukketSensor", "no.novari.fint.model.utdanning.vurdering.Sensor", NONE_TO_ONE, null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - private Boolean delegert; - private String kandidatnummer; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + private Boolean delegert; + private String kandidatnummer; } 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 54590fd1..c0f5b1b0 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 @@ -1,74 +1,85 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Eksamensvurdering extends Fagvurdering implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Eksamensvurdering extends Fagvurdering implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + EKSAMENSGRUPPE( + "eksamensgruppe", + "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", + ONE_TO_ONE, + null), + KARAKTERHISTORIE( + "karakterhistorie", + "no.novari.fint.model.utdanning.vurdering.Karakterhistorie", + NONE_TO_ONE, + null), + ELEVVURDERING( + "elevvurdering", + "no.novari.fint.model.utdanning.vurdering.Elevvurdering", + ONE_TO_ONE, + "eksamensvurdering"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); + relations.addAll(super.getRelations()); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 0039ff9f..54bfa1f7 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 @@ -1,76 +1,82 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Elevfravar implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Elevfravar implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + FRAVARSREGISTRERING( + "fravarsregistrering", + "no.novari.fint.model.utdanning.vurdering.Fravarsregistrering", + NONE_TO_MANY, + "elevfravar"), + ELEVFORHOLD( + "elevforhold", + "no.novari.fint.model.utdanning.elev.Elevforhold", + ONE_TO_ONE, + "fravarsregistreringer"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Identifikator systemId; } 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 c7747c03..a5a989b1 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 @@ -1,83 +1,117 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Elevvurdering implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Elevvurdering implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ELEVFORHOLD( + "elevforhold", + "no.novari.fint.model.utdanning.elev.Elevforhold", + ONE_TO_ONE, + "elevvurdering"), + SLUTTFAGVURDERING( + "sluttfagvurdering", + "no.novari.fint.model.utdanning.vurdering.Sluttfagvurdering", + NONE_TO_MANY, + "elevvurdering"), + UNDERVEISORDENSVURDERING( + "underveisordensvurdering", + "no.novari.fint.model.utdanning.vurdering.Underveisordensvurdering", + NONE_TO_MANY, + "elevvurdering"), + VITNEMALSMERKNAD( + "vitnemalsmerknad", + "no.novari.fint.model.utdanning.kodeverk.Vitnemalsmerknad", + NONE_TO_MANY, + null), + UNDERVEISFAGVURDERING( + "underveisfagvurdering", + "no.novari.fint.model.utdanning.vurdering.Underveisfagvurdering", + NONE_TO_MANY, + "elevvurdering"), + HALVARSORDENSVURDERING( + "halvarsordensvurdering", + "no.novari.fint.model.utdanning.vurdering.Halvarsordensvurdering", + NONE_TO_MANY, + "elevvurdering"), + HALVARSFAGVURDERING( + "halvarsfagvurdering", + "no.novari.fint.model.utdanning.vurdering.Halvarsfagvurdering", + NONE_TO_MANY, + "elevvurdering"), + SLUTTORDENSVURDERING( + "sluttordensvurdering", + "no.novari.fint.model.utdanning.vurdering.Sluttordensvurdering", + NONE_TO_MANY, + "elevvurdering"), + EKSAMENSVURDERING( + "eksamensvurdering", + "no.novari.fint.model.utdanning.vurdering.Eksamensvurdering", + NONE_TO_MANY, + "elevvurdering"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Identifikator systemId; } 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 c07025fd..4789dd04 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 @@ -1,84 +1,79 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintAbstractObject; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; - -import java.util.Date; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public abstract class Fagvurdering implements FintAbstractObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public abstract class Fagvurdering implements FintAbstractObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + FAG("fag", "no.novari.fint.model.utdanning.timeplan.Fag", ONE_TO_ONE, null), + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE, null), + KARAKTER( + "karakter", "no.novari.fint.model.utdanning.vurdering.Karakterverdi", NONE_TO_ONE, null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotBlank - private String kommentar; - @NotNull - private @Valid Identifikator systemId; - @NotNull - private Date vurderingsdato; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotBlank private String kommentar; + @NotNull private @Valid Identifikator systemId; + @NotNull private Date vurderingsdato; } 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 deleted file mode 100644 index e217b701..00000000 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Fravar.java +++ /dev/null @@ -1,90 +0,0 @@ -package no.novari.fint.model.utdanning.vurdering; - -import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -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.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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.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 -@EqualsAndHashCode -@ToString -@Deprecated -public class Fravar implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; - - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } - } - - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - - relations.addAll(Arrays.asList(Relasjonsnavn.values())); - - return Collections.unmodifiableList(relations); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @Deprecated - @NotNull - private Boolean dokumentert; - @NotNull - private Boolean foresPaVitnemal; - @NotNull - private @Valid Periode gjelderPeriode; - @NotBlank - private String kommentar; - @NotNull - private @Valid Identifikator systemId; -} 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 ad1fc11a..2d47da51 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 @@ -1,80 +1,76 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Fravarsoversikt implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Fravarsoversikt implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ELEVFORHOLD( + "elevforhold", "no.novari.fint.model.utdanning.elev.Elevforhold", ONE_TO_ONE, "elevfravar"), + FAG("fag", "no.novari.fint.model.utdanning.timeplan.Fag", ONE_TO_ONE, null); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Fravarsprosent halvar; - @NotNull - private @Valid Fravarsprosent skolear; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Fravarsprosent halvar; + @NotNull private @Valid Fravarsprosent skolear; + @NotNull private @Valid Identifikator systemId; } 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 dd34da97..de7462e2 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 @@ -1,39 +1,25 @@ package no.novari.fint.model.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - +import javax.validation.constraints.*; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.ToString; - -import javax.validation.constraints.*; -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.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 @EqualsAndHashCode @ToString -public class Fravarsprosent implements FintComplexDatatypeObject { +public class Fravarsprosent implements FintComplexDatatypeObject { - public boolean isWriteable() { - return this.writeable; - } + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @NotNull - private Integer fravarstimer; - @NotNull - private Integer prosent; - @NotNull - private Integer undervisningstimer; + @JsonIgnore private final boolean writeable = false; + @NotNull private Integer fravarstimer; + @NotNull private Integer prosent; + @NotNull private Integer undervisningstimer; } 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 989c6150..dbdac9e7 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 @@ -1,85 +1,91 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; -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 @EqualsAndHashCode @ToString -public class Fravarsregistrering implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Fravarsregistrering implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + REGISTRERTAV( + "registrertAv", "no.novari.fint.model.utdanning.elev.Skoleressurs", NONE_TO_ONE, null), + FAGGRUPPE("faggruppe", "no.novari.fint.model.utdanning.timeplan.Faggruppe", NONE_TO_ONE, null), + UNDERVISNINGSGRUPPE( + "undervisningsgruppe", + "no.novari.fint.model.utdanning.timeplan.Undervisningsgruppe", + ONE_TO_ONE, + null), + FRAVARSTYPE( + "fravarstype", "no.novari.fint.model.utdanning.kodeverk.Fravarstype", ONE_TO_ONE, null), + ELEVFRAVAR( + "elevfravar", + "no.novari.fint.model.utdanning.vurdering.Elevfravar", + ONE_TO_ONE, + "fravarsregistrering"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private Boolean foresPaVitnemal; - private String kommentar; - @NotNull - private @Valid Periode periode; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private Boolean foresPaVitnemal; + private String kommentar; + @NotNull private @Valid Periode periode; + @NotNull private @Valid Identifikator systemId; } 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 06ad071d..ae6432d3 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 @@ -1,73 +1,74 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Halvarsfagvurdering extends Fagvurdering implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Halvarsfagvurdering extends Fagvurdering implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ELEVVURDERING( + "elevvurdering", + "no.novari.fint.model.utdanning.vurdering.Elevvurdering", + ONE_TO_ONE, + "halvarsfagvurdering"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); + relations.addAll(super.getRelations()); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 f48b4262..2c1dce1b 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 @@ -1,73 +1,74 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Halvarsordensvurdering extends Ordensvurdering implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Halvarsordensvurdering extends Ordensvurdering implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ELEVVURDERING( + "elevvurdering", + "no.novari.fint.model.utdanning.vurdering.Elevvurdering", + ONE_TO_ONE, + "halvarsordensvurdering"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); + relations.addAll(super.getRelations()); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 f488f362..a12d56b5 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 @@ -1,82 +1,95 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; -import java.util.Date; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Karakterhistorie implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Karakterhistorie implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + OPPDATERTAV( + "oppdatertAv", "no.novari.fint.model.utdanning.elev.Skoleressurs", NONE_TO_ONE, null), + OPPRINNELIGKARAKTERVERDI( + "opprinneligKarakterverdi", + "no.novari.fint.model.utdanning.vurdering.Karakterverdi", + NONE_TO_ONE, + null), + OPPRINNELIGKARAKTERSTATUS( + "opprinneligKarakterstatus", + "no.novari.fint.model.utdanning.kodeverk.Karakterstatus", + NONE_TO_ONE, + null), + KARAKTERVERDI( + "karakterverdi", + "no.novari.fint.model.utdanning.vurdering.Karakterverdi", + NONE_TO_ONE, + null), + KARAKTERSTATUS( + "karakterstatus", + "no.novari.fint.model.utdanning.kodeverk.Karakterstatus", + NONE_TO_ONE, + null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private @Valid Date endretDato; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private @Valid Date endretDato; + @NotNull private @Valid Identifikator systemId; } 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 f7c50044..215e0ed9 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 @@ -1,72 +1,70 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; import no.novari.fint.model.felles.basisklasser.Begrep; -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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Karakterverdi extends Begrep implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - SKALA("skala", "no.novari.fint.model.utdanning.kodeverk.Karakterskala", ONE_TO_ONE); - - private final String name; - private final String packageName; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Karakterverdi extends Begrep implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + SKALA("skala", "no.novari.fint.model.utdanning.kodeverk.Karakterskala", ONE_TO_ONE, "verdi"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 1609ecba..a6be85bd 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 @@ -1,83 +1,78 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintAbstractObject; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintMultiplicity; import no.novari.fint.model.FintRelation; - -import java.util.Date; - -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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public abstract class Ordensvurdering implements FintAbstractObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public abstract class Ordensvurdering implements FintAbstractObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ATFERD("atferd", "no.novari.fint.model.utdanning.vurdering.Karakterverdi", ONE_TO_ONE, null), + ORDEN("orden", "no.novari.fint.model.utdanning.vurdering.Karakterverdi", ONE_TO_ONE, null), + SKOLEAR("skolear", "no.novari.fint.model.utdanning.kodeverk.Skolear", NONE_TO_ONE, null); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotBlank - private String kommentar; - @NotNull - private @Valid Identifikator systemId; - @NotNull - private Date vurderingsdato; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotBlank private String kommentar; + @NotNull private @Valid Identifikator systemId; + @NotNull private Date vurderingsdato; } 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 a13428c0..963dda44 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 @@ -1,79 +1,80 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.FintModelObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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; +import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; @Data @NoArgsConstructor @EqualsAndHashCode @ToString -public class Sensor implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +public class Sensor implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + SKOLERESSURS( + "skoleressurs", "no.novari.fint.model.utdanning.elev.Skoleressurs", ONE_TO_ONE, "sensor"), + EKSAMENSGRUPPE( + "eksamensgruppe", + "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", + ONE_TO_ONE, + "sensor"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private Boolean aktiv; - private Integer sensornummer; - @NotNull - private @Valid Identifikator systemId; + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); + @NotNull private Boolean aktiv; + private Integer sensornummer; + @NotNull private @Valid Identifikator systemId; } 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 539d8b9c..0db562e4 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 @@ -1,75 +1,86 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_MANY; +import static no.novari.fint.model.FintMultiplicity.NONE_TO_ONE; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Sluttfagvurdering extends Fagvurdering implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Sluttfagvurdering extends Fagvurdering implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + EKSAMENSGRUPPE( + "eksamensgruppe", + "no.novari.fint.model.utdanning.vurdering.Eksamensgruppe", + NONE_TO_ONE, + null), + KARAKTERHISTORIE( + "karakterhistorie", + "no.novari.fint.model.utdanning.vurdering.Karakterhistorie", + NONE_TO_MANY, + null), + ELEVVURDERING( + "elevvurdering", + "no.novari.fint.model.utdanning.vurdering.Elevvurdering", + ONE_TO_ONE, + "sluttfagvurdering"); + + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); + relations.addAll(super.getRelations()); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 c8ab7312..1567c12f 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 @@ -1,73 +1,74 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Sluttordensvurdering extends Ordensvurdering implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Sluttordensvurdering extends Ordensvurdering implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ELEVVURDERING( + "elevvurdering", + "no.novari.fint.model.utdanning.vurdering.Elevvurdering", + ONE_TO_ONE, + "sluttordensvurdering"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); + relations.addAll(super.getRelations()); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 d8ec393a..6d65ee8d 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 @@ -1,73 +1,74 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Underveisfagvurdering extends Fagvurdering implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Underveisfagvurdering extends Fagvurdering implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ELEVVURDERING( + "elevvurdering", + "no.novari.fint.model.utdanning.vurdering.Elevvurdering", + ONE_TO_ONE, + "underveisfagvurdering"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); + relations.addAll(super.getRelations()); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 ecaa83c5..2ee6a89e 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 @@ -1,73 +1,74 @@ package no.novari.fint.model.utdanning.vurdering; -import com.fasterxml.jackson.annotation.JsonIgnore; +import static no.novari.fint.model.FintMultiplicity.ONE_TO_ONE; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.Getter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.FintModelObject; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.FintModelObject; +import no.novari.fint.model.FintMultiplicity; 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 -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class Underveisordensvurdering extends Ordensvurdering implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class Underveisordensvurdering extends Ordensvurdering implements FintModelObject { + @Getter + public enum Relasjonsnavn implements FintRelation { + ELEVVURDERING( + "elevvurdering", + "no.novari.fint.model.utdanning.vurdering.Elevvurdering", + ONE_TO_ONE, + "underveisordensvurdering"); - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } + private final String name; + private final String packageName; + private final FintMultiplicity multiplicity; + private final String inverseName; + + private Relasjonsnavn( + String name, String packageName, FintMultiplicity multiplicity, String inverseName) { + this.name = name; + this.packageName = packageName; + this.multiplicity = multiplicity; + this.inverseName = inverseName; } + } - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - relations.addAll(super.getRelations()); + return Collections.unmodifiableMap(identifikators); + } - relations.addAll(Arrays.asList(Relasjonsnavn.values())); + @JsonIgnore + private List createRelations() { + List relations = new ArrayList<>(); + relations.addAll(super.getRelations()); - return Collections.unmodifiableList(relations); - } + relations.addAll(Arrays.asList(Relasjonsnavn.values())); - public boolean isWriteable() { - return this.writeable; - } + return Collections.unmodifiableList(relations); + } + + public boolean isWriteable() { + return this.writeable; + } - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); + @JsonIgnore private final boolean writeable = false; + @JsonIgnore private final List relations = createRelations(); } 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 deleted file mode 100644 index f8697962..00000000 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/Vurdering.java +++ /dev/null @@ -1,84 +0,0 @@ -package no.novari.fint.model.utdanning.vurdering; - -import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -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.novari.fint.model.FintMultiplicity; -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 -@EqualsAndHashCode -@ToString -@Deprecated -public class Vurdering implements FintModelObject { - @Getter - public enum Relasjonsnavn implements FintRelation { - 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; - private final FintMultiplicity multiplicity; - - private Relasjonsnavn(String name, String packageName, FintMultiplicity multiplicity) { - this.name = name; - this.packageName = packageName; - this.multiplicity = multiplicity; - } - } - - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - @JsonIgnore - private List createRelations() { - List relations = new ArrayList<>(); - - relations.addAll(Arrays.asList(Relasjonsnavn.values())); - - return Collections.unmodifiableList(relations); - } - - public boolean isWriteable() { - return this.writeable; - } - - @JsonIgnore - private final boolean writeable = false; - @JsonIgnore - private final List relations = createRelations(); - @NotNull - private Boolean endelig; - @NotBlank - private String kommentar; - @NotNull - private @Valid Identifikator systemId; -} diff --git a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/VurderingActions.java b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/VurderingActions.java index 6b89c36f..9f8f0269 100644 --- a/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/VurderingActions.java +++ b/fint-utdanning-model-java/src/main/java/no/novari/fint/model/utdanning/vurdering/VurderingActions.java @@ -4,77 +4,67 @@ import java.util.List; public enum VurderingActions { - - GET_ANMERKNINGER, - GET_ALL_ANMERKNINGER, - UPDATE_ANMERKNINGER, - GET_EKSAMENSGRUPPE, - GET_ALL_EKSAMENSGRUPPE, - UPDATE_EKSAMENSGRUPPE, - GET_EKSAMENSGRUPPEMEDLEMSKAP, - GET_ALL_EKSAMENSGRUPPEMEDLEMSKAP, - UPDATE_EKSAMENSGRUPPEMEDLEMSKAP, - GET_EKSAMENSVURDERING, - GET_ALL_EKSAMENSVURDERING, - UPDATE_EKSAMENSVURDERING, - GET_ELEVFRAVAR, - GET_ALL_ELEVFRAVAR, - UPDATE_ELEVFRAVAR, - GET_ELEVVURDERING, - GET_ALL_ELEVVURDERING, - UPDATE_ELEVVURDERING, - GET_FRAVAR, - GET_ALL_FRAVAR, - UPDATE_FRAVAR, - GET_FRAVARSOVERSIKT, - GET_ALL_FRAVARSOVERSIKT, - UPDATE_FRAVARSOVERSIKT, - GET_FRAVARSREGISTRERING, - GET_ALL_FRAVARSREGISTRERING, - UPDATE_FRAVARSREGISTRERING, - GET_HALVARSFAGVURDERING, - GET_ALL_HALVARSFAGVURDERING, - UPDATE_HALVARSFAGVURDERING, - GET_HALVARSORDENSVURDERING, - GET_ALL_HALVARSORDENSVURDERING, - UPDATE_HALVARSORDENSVURDERING, - GET_KARAKTERHISTORIE, - GET_ALL_KARAKTERHISTORIE, - UPDATE_KARAKTERHISTORIE, - GET_KARAKTERVERDI, - GET_ALL_KARAKTERVERDI, - UPDATE_KARAKTERVERDI, - GET_SENSOR, - GET_ALL_SENSOR, - UPDATE_SENSOR, - GET_SLUTTFAGVURDERING, - GET_ALL_SLUTTFAGVURDERING, - UPDATE_SLUTTFAGVURDERING, - GET_SLUTTORDENSVURDERING, - GET_ALL_SLUTTORDENSVURDERING, - UPDATE_SLUTTORDENSVURDERING, - GET_UNDERVEISFAGVURDERING, - GET_ALL_UNDERVEISFAGVURDERING, - UPDATE_UNDERVEISFAGVURDERING, - GET_UNDERVEISORDENSVURDERING, - GET_ALL_UNDERVEISORDENSVURDERING, - UPDATE_UNDERVEISORDENSVURDERING, - GET_VURDERING, - GET_ALL_VURDERING, - UPDATE_VURDERING - ; - - - /** - * Gets a list of all enums as string - * - * @return A string list of all enums - */ - public static List getActions() { - return Arrays.asList( - Arrays.stream(VurderingActions.class.getEnumConstants()).map(Enum::name).toArray(String[]::new) - ); - } + GET_ANMERKNINGER, + GET_ALL_ANMERKNINGER, + UPDATE_ANMERKNINGER, + GET_EKSAMENSGRUPPE, + GET_ALL_EKSAMENSGRUPPE, + UPDATE_EKSAMENSGRUPPE, + GET_EKSAMENSGRUPPEMEDLEMSKAP, + GET_ALL_EKSAMENSGRUPPEMEDLEMSKAP, + UPDATE_EKSAMENSGRUPPEMEDLEMSKAP, + GET_EKSAMENSVURDERING, + GET_ALL_EKSAMENSVURDERING, + UPDATE_EKSAMENSVURDERING, + GET_ELEVFRAVAR, + GET_ALL_ELEVFRAVAR, + UPDATE_ELEVFRAVAR, + GET_ELEVVURDERING, + GET_ALL_ELEVVURDERING, + UPDATE_ELEVVURDERING, + GET_FRAVARSOVERSIKT, + GET_ALL_FRAVARSOVERSIKT, + UPDATE_FRAVARSOVERSIKT, + GET_FRAVARSREGISTRERING, + GET_ALL_FRAVARSREGISTRERING, + UPDATE_FRAVARSREGISTRERING, + GET_HALVARSFAGVURDERING, + GET_ALL_HALVARSFAGVURDERING, + UPDATE_HALVARSFAGVURDERING, + GET_HALVARSORDENSVURDERING, + GET_ALL_HALVARSORDENSVURDERING, + UPDATE_HALVARSORDENSVURDERING, + GET_KARAKTERHISTORIE, + GET_ALL_KARAKTERHISTORIE, + UPDATE_KARAKTERHISTORIE, + GET_KARAKTERVERDI, + GET_ALL_KARAKTERVERDI, + UPDATE_KARAKTERVERDI, + GET_SENSOR, + GET_ALL_SENSOR, + UPDATE_SENSOR, + GET_SLUTTFAGVURDERING, + GET_ALL_SLUTTFAGVURDERING, + UPDATE_SLUTTFAGVURDERING, + GET_SLUTTORDENSVURDERING, + GET_ALL_SLUTTORDENSVURDERING, + UPDATE_SLUTTORDENSVURDERING, + GET_UNDERVEISFAGVURDERING, + GET_ALL_UNDERVEISFAGVURDERING, + UPDATE_UNDERVEISFAGVURDERING, + GET_UNDERVEISORDENSVURDERING, + GET_ALL_UNDERVEISORDENSVURDERING, + UPDATE_UNDERVEISORDENSVURDERING; + /** + * Gets a list of all enums as string + * + * @return A string list of all enums + */ + public static List getActions() { + return Arrays.asList( + Arrays.stream(VurderingActions.class.getEnumConstants()) + .map(Enum::name) + .toArray(String[]::new)); + } } - diff --git a/fint-utdanning-resource-model-java-tests/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 index 98594f18..c9adfe0e 100644 --- a/fint-utdanning-resource-model-java-tests/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 @@ -7,5 +7,4 @@ @EnableHypermediaSupport(type = EnableHypermediaSupport.HypermediaType.HAL) @SpringBootApplication @Import(TestConfiguration.class) -public class TestApplication { -} +public class TestApplication {} diff --git a/fint-utdanning-resource-model-java-tests/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 index f318f21b..e7aaabd5 100644 --- a/fint-utdanning-resource-model-java-tests/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 @@ -10,11 +10,9 @@ @Configuration public class TestConfiguration { - @Bean - @Primary - public ObjectMapper objectMapper() { - return Jackson2ObjectMapperBuilder.json() - .modules(new Jackson2HalModule()) - .build(); - } + @Bean + @Primary + public ObjectMapper objectMapper() { + return Jackson2ObjectMapperBuilder.json().modules(new Jackson2HalModule()).build(); + } } 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 df0b0aca..7073feb3 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 @@ -1,74 +1,41 @@ package no.novari.fint.model.resource.utdanning.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; 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 @NoArgsConstructor @EqualsAndHashCode @ToString public abstract class GruppeResource implements FintAbstractObject, FintLinks { - // Attributes - @NotBlank - private String beskrivelse; - @NotBlank - private String navn; - @Deprecated - private List<@Valid Periode> periode; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotBlank private String beskrivelse; + @NotBlank private String navn; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getGrepreferanse() { - return getLinks().getOrDefault("grepreferanse", Collections.emptyList()); - } - public void addGrepreferanse(Link link) { - addLink("grepreferanse", link); - } - @JsonIgnore - public List getVigoreferanse() { - return getLinks().getOrDefault("vigoreferanse", Collections.emptyList()); - } - public void addVigoreferanse(Link link) { - addLink("vigoreferanse", link); - } - @Deprecated - @JsonIgnore - public List getMedlemskap() { - return getLinks().getOrDefault("medlemskap", Collections.emptyList()); - } - @Deprecated - public void addMedlemskap(Link link) { - addLink("medlemskap", link); - } + // Relations + @Getter private final Map> links = createLinks(); } 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 89d3cc73..677b19f6 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class GruppeResources extends AbstractCollectionResources { - public GruppeResources(Collection input) { - super(input); - } + public GruppeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 cae6366e..8918a78c 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 @@ -1,45 +1,41 @@ package no.novari.fint.model.resource.utdanning.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - -import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; 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.Identifikator; import no.novari.fint.model.felles.kompleksedatatyper.Periode; +import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public abstract class GruppemedlemskapResource implements FintAbstractObject, FintLinks { - // Attributes - private @Valid Periode gyldighetsperiode; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + private @Valid Periode gyldighetsperiode; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 6f305c01..21de57f7 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class GruppemedlemskapResources extends AbstractCollectionResources { +public class GruppemedlemskapResources + extends AbstractCollectionResources { - public GruppemedlemskapResources(Collection input) { - super(input); - } + public GruppemedlemskapResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 2f0f9c19..7a91b816 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 @@ -1,55 +1,40 @@ package no.novari.fint.model.resource.utdanning.basisklasser; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; 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 @EqualsAndHashCode @ToString public abstract class UtdanningsforholdResource implements FintAbstractObject, FintLinks { - // Attributes - @NotBlank - private String beskrivelse; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotBlank private String beskrivelse; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @Deprecated - @JsonIgnore - public List getMedlemskap() { - return getLinks().getOrDefault("medlemskap", Collections.emptyList()); - } - @Deprecated - public void addMedlemskap(Link link) { - addLink("medlemskap", link); - } + // Relations + @Getter private final Map> links = createLinks(); } 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 91eeaf89..24b4f46c 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class UtdanningsforholdResources extends AbstractCollectionResources { +public class UtdanningsforholdResources + extends AbstractCollectionResources { - public UtdanningsforholdResources(Collection input) { - super(input); - } + public UtdanningsforholdResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 deleted file mode 100644 index df3d95a2..00000000 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppeResource.java +++ /dev/null @@ -1,97 +0,0 @@ -package no.novari.fint.model.resource.utdanning.elev; - -import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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 -@NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class BasisgruppeResource extends GruppeResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getSkolear() { - return getLinks().getOrDefault("skolear", Collections.emptyList()); - } - public void addSkolear(Link link) { - addLink("skolear", link); - } - @Deprecated - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - @Deprecated - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getTermin() { - return getLinks().getOrDefault("termin", Collections.emptyList()); - } - public void addTermin(Link link) { - addLink("termin", link); - } - @JsonIgnore - public List getTrinn() { - return getLinks().getOrDefault("trinn", Collections.emptyList()); - } - public void addTrinn(Link link) { - addLink("trinn", link); - } - @JsonIgnore - public List getSkole() { - return getLinks().getOrDefault("skole", Collections.emptyList()); - } - public void addSkole(Link link) { - addLink("skole", link); - } - @JsonIgnore - public List getUndervisningsforhold() { - return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); - } - public void addUndervisningsforhold(Link link) { - addLink("undervisningsforhold", link); - } - @JsonIgnore - public List getGruppemedlemskap() { - return getLinks().getOrDefault("gruppemedlemskap", Collections.emptyList()); - } - public void addGruppemedlemskap(Link link) { - addLink("gruppemedlemskap", link); - } - @JsonIgnore - public List getKontaktlarergruppe() { - return getLinks().getOrDefault("kontaktlarergruppe", Collections.emptyList()); - } - public void addKontaktlarergruppe(Link link) { - addLink("kontaktlarergruppe", link); - } -} 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 deleted file mode 100644 index 50a5bdb6..00000000 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppeResources.java +++ /dev/null @@ -1,25 +0,0 @@ -package no.novari.fint.model.resource.utdanning.elev; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.util.Collection; -import java.util.List; - -import lombok.NoArgsConstructor; -import no.novari.fint.model.resource.AbstractCollectionResources; - -@NoArgsConstructor -public class BasisgruppeResources extends AbstractCollectionResources { - - public BasisgruppeResources(Collection input) { - super(input); - } - - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } -} 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 deleted file mode 100644 index 8c8cd8bc..00000000 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResource.java +++ /dev/null @@ -1,53 +0,0 @@ -package no.novari.fint.model.resource.utdanning.elev; - -import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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 -@NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class BasisgruppemedlemskapResource extends Gruppemedlemskap implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getBasisgruppe() { - return getLinks().getOrDefault("basisgruppe", Collections.emptyList()); - } - public void addBasisgruppe(Link link) { - addLink("basisgruppe", link); - } - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } -} 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 deleted file mode 100644 index 8345fc04..00000000 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/BasisgruppemedlemskapResources.java +++ /dev/null @@ -1,25 +0,0 @@ -package no.novari.fint.model.resource.utdanning.elev; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.util.Collection; -import java.util.List; - -import lombok.NoArgsConstructor; -import no.novari.fint.model.resource.AbstractCollectionResources; - -@NoArgsConstructor -public class BasisgruppemedlemskapResources extends AbstractCollectionResources { - - public BasisgruppemedlemskapResources(Collection input) { - super(input); - } - - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } -} 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 77ff49b4..13a73c98 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 @@ -1,78 +1,78 @@ package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Kontaktinformasjon; 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; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class ElevResource implements FintResource { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = FintResource.super.getNestedResources(); - if (hybeladresse != null) { - result.add(hybeladresse); - } - return result; + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = FintResource.super.getNestedResources(); + if (hybeladresse != null) { + result.add(hybeladresse); } - private @Valid Identifikator brukernavn; - private @Valid Identifikator elevnummer; - private @Valid Identifikator feidenavn; - private Boolean gjest; - private @Valid AdresseResource hybeladresse; - private @Valid Kontaktinformasjon kontaktinformasjon; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("brukernavn", this.brukernavn); - identifikators.put("elevnummer", this.elevnummer); - identifikators.put("feidenavn", this.feidenavn); - identifikators.put("systemId", this.systemId); + return result; + } - return Collections.unmodifiableMap(identifikators); - } + private @Valid Identifikator brukernavn; + private @Valid Identifikator elevnummer; + private @Valid Identifikator feidenavn; + private Boolean gjest; + private @Valid AdresseResource hybeladresse; + private @Valid Kontaktinformasjon kontaktinformasjon; + @NotNull private @Valid Identifikator systemId; - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getPerson() { - return getLinks().getOrDefault("person", Collections.emptyList()); - } - public void addPerson(Link link) { - addLink("person", link); - } - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("brukernavn", this.brukernavn); + identifikators.put("elevnummer", this.elevnummer); + identifikators.put("feidenavn", this.feidenavn); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getPerson() { + return getLinks().getOrDefault("person", Collections.emptyList()); + } + + public void addPerson(Link link) { + addLink("person", link); + } + + @JsonIgnore + public List getElevforhold() { + return getLinks().getOrDefault("elevforhold", Collections.emptyList()); + } + + public void addElevforhold(Link link) { + addLink("elevforhold", link); + } } 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 ef5e6c9d..a76e53c7 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ElevResources extends AbstractCollectionResources { - public ElevResources(Collection input) { - super(input); - } + public ElevResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 d8c72913..dcc06912 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 @@ -1,305 +1,200 @@ package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.Valid; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; 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 no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; 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; -import no.novari.fint.model.resource.utdanning.basisklasser.UtdanningsforholdResource; +import no.novari.fint.model.utdanning.basisklasser.Utdanningsforhold; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class ElevforholdResource extends UtdanningsforholdResource implements FintResource { - // Attributes - @JsonIgnore - @Override - public List getNestedResources() { - List result = super.getNestedResources(); - if (anmerkninger != null) { - result.addAll(anmerkninger); - } - return result; - } - private List<@Valid AnmerkningerResource> anmerkninger; - private Date avbruddsdato; - private @Valid Periode gyldighetsperiode; - private Boolean hovedskole; - private Boolean tosprakligFagopplaring; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ElevforholdResource extends Utdanningsforhold implements FintResource { + // Attributes + @JsonIgnore + @Override + public List getNestedResources() { + List result = FintResource.super.getNestedResources(); + if (anmerkninger != null) { + result.addAll(anmerkninger); + } + return result; + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getElev() { - return getLinks().getOrDefault("elev", Collections.emptyList()); - } - public void addElev(Link link) { - addLink("elev", link); - } - @Deprecated - @JsonIgnore - public List getSidemal() { - return getLinks().getOrDefault("sidemal", Collections.emptyList()); - } - @Deprecated - public void addSidemal(Link link) { - addLink("sidemal", link); - } - @JsonIgnore - public List getKategori() { - return getLinks().getOrDefault("kategori", Collections.emptyList()); - } - public void addKategori(Link link) { - addLink("kategori", link); - } - @Deprecated - @JsonIgnore - public List getKroppsoving() { - return getLinks().getOrDefault("kroppsoving", Collections.emptyList()); - } - @Deprecated - public void addKroppsoving(Link link) { - addLink("kroppsoving", link); - } - @JsonIgnore - public List getSkole() { - return getLinks().getOrDefault("skole", Collections.emptyList()); - } - public void addSkole(Link link) { - addLink("skole", link); - } - @JsonIgnore - public List getAvbruddsarsak() { - return getLinks().getOrDefault("avbruddsarsak", Collections.emptyList()); - } - public void addAvbruddsarsak(Link link) { - addLink("avbruddsarsak", link); - } - @JsonIgnore - public List getFravarsregistreringer() { - return getLinks().getOrDefault("fravarsregistreringer", Collections.emptyList()); - } - public void addFravarsregistreringer(Link link) { - addLink("fravarsregistreringer", link); - } - @JsonIgnore - public List getFaggruppemedlemskap() { - return getLinks().getOrDefault("faggruppemedlemskap", Collections.emptyList()); - } - public void addFaggruppemedlemskap(Link link) { - addLink("faggruppemedlemskap", link); - } - @JsonIgnore - public List getSkolear() { - return getLinks().getOrDefault("skolear", Collections.emptyList()); - } - public void addSkolear(Link link) { - addLink("skolear", link); - } - @Deprecated - @JsonIgnore - public List getBasisgruppe() { - return getLinks().getOrDefault("basisgruppe", Collections.emptyList()); - } - @Deprecated - public void addBasisgruppe(Link link) { - addLink("basisgruppe", link); - } - @JsonIgnore - public List getBasisgruppemedlemskap() { - return getLinks().getOrDefault("basisgruppemedlemskap", Collections.emptyList()); - } - public void addBasisgruppemedlemskap(Link link) { - addLink("basisgruppemedlemskap", link); - } - @JsonIgnore - public List getUndervisningsgruppemedlemskap() { - return getLinks().getOrDefault("undervisningsgruppemedlemskap", Collections.emptyList()); - } - public void addUndervisningsgruppemedlemskap(Link link) { - addLink("undervisningsgruppemedlemskap", link); - } - @Deprecated - @JsonIgnore - public List getVurdering() { - return getLinks().getOrDefault("vurdering", Collections.emptyList()); - } - @Deprecated - public void addVurdering(Link link) { - addLink("vurdering", link); - } - @Deprecated - @JsonIgnore - public List getSluttordensvurdering() { - return getLinks().getOrDefault("sluttordensvurdering", Collections.emptyList()); - } - @Deprecated - public void addSluttordensvurdering(Link link) { - addLink("sluttordensvurdering", link); - } - @Deprecated - @JsonIgnore - public List getKontaktlarergruppe() { - return getLinks().getOrDefault("kontaktlarergruppe", Collections.emptyList()); - } - @Deprecated - public void addKontaktlarergruppe(Link link) { - addLink("kontaktlarergruppe", link); - } - @Deprecated - @JsonIgnore - public List getUnderveisfagvurdering() { - return getLinks().getOrDefault("underveisfagvurdering", Collections.emptyList()); - } - @Deprecated - public void addUnderveisfagvurdering(Link link) { - addLink("underveisfagvurdering", link); - } - @Deprecated - @JsonIgnore - public List getHalvarsfagvurdering() { - return getLinks().getOrDefault("halvarsfagvurdering", Collections.emptyList()); - } - @Deprecated - public void addHalvarsfagvurdering(Link link) { - addLink("halvarsfagvurdering", link); - } - @Deprecated - @JsonIgnore - public List getSluttfagvurdering() { - return getLinks().getOrDefault("sluttfagvurdering", Collections.emptyList()); - } - @Deprecated - public void addSluttfagvurdering(Link link) { - addLink("sluttfagvurdering", link); - } - @JsonIgnore - public List getPersongruppemedlemskap() { - return getLinks().getOrDefault("persongruppemedlemskap", Collections.emptyList()); - } - public void addPersongruppemedlemskap(Link link) { - addLink("persongruppemedlemskap", link); - } - @JsonIgnore - public List getEksamensgruppemedlemskap() { - return getLinks().getOrDefault("eksamensgruppemedlemskap", Collections.emptyList()); - } - public void addEksamensgruppemedlemskap(Link link) { - addLink("eksamensgruppemedlemskap", link); - } - @JsonIgnore - public List getKontaktlarergruppemedlemskap() { - return getLinks().getOrDefault("kontaktlarergruppemedlemskap", Collections.emptyList()); - } - public void addKontaktlarergruppemedlemskap(Link link) { - addLink("kontaktlarergruppemedlemskap", link); - } - @JsonIgnore - public List getElevfravar() { - return getLinks().getOrDefault("elevfravar", Collections.emptyList()); - } - public void addElevfravar(Link link) { - addLink("elevfravar", link); - } - @JsonIgnore - public List getTilrettelegging() { - return getLinks().getOrDefault("tilrettelegging", Collections.emptyList()); - } - public void addTilrettelegging(Link link) { - addLink("tilrettelegging", link); - } - @Deprecated - @JsonIgnore - public List getHalvarsordensvurdering() { - return getLinks().getOrDefault("halvarsordensvurdering", Collections.emptyList()); - } - @Deprecated - public void addHalvarsordensvurdering(Link link) { - addLink("halvarsordensvurdering", link); - } - @Deprecated - @JsonIgnore - public List getProgramomrade() { - return getLinks().getOrDefault("programomrade", Collections.emptyList()); - } - @Deprecated - public void addProgramomrade(Link link) { - addLink("programomrade", link); - } - @JsonIgnore - public List getElevvurdering() { - return getLinks().getOrDefault("elevvurdering", Collections.emptyList()); - } - public void addElevvurdering(Link link) { - addLink("elevvurdering", link); - } - @Deprecated - @JsonIgnore - public List getFravar() { - return getLinks().getOrDefault("fravar", Collections.emptyList()); - } - @Deprecated - public void addFravar(Link link) { - addLink("fravar", link); - } - @JsonIgnore - public List getProgramomrademedlemskap() { - return getLinks().getOrDefault("programomrademedlemskap", Collections.emptyList()); - } - public void addProgramomrademedlemskap(Link link) { - addLink("programomrademedlemskap", link); - } - @Deprecated - @JsonIgnore - public List getUnderveisordensvurdering() { - return getLinks().getOrDefault("underveisordensvurdering", Collections.emptyList()); - } - @Deprecated - public void addUnderveisordensvurdering(Link link) { - addLink("underveisordensvurdering", link); - } - @Deprecated - @JsonIgnore - public List getEksamensgruppe() { - return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); - } - @Deprecated - public void addEksamensgruppe(Link link) { - addLink("eksamensgruppe", link); - } - @Deprecated - @JsonIgnore - public List getUndervisningsgruppe() { - return getLinks().getOrDefault("undervisningsgruppe", Collections.emptyList()); - } - @Deprecated - public void addUndervisningsgruppe(Link link) { - addLink("undervisningsgruppe", link); - } + private List<@Valid AnmerkningerResource> anmerkninger; + private Date avbruddsdato; + private @Valid Periode gyldighetsperiode; + private Boolean hovedskole; + private Boolean tosprakligFagopplaring; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getElev() { + return getLinks().getOrDefault("elev", Collections.emptyList()); + } + + public void addElev(Link link) { + addLink("elev", link); + } + + @JsonIgnore + public List getKategori() { + return getLinks().getOrDefault("kategori", Collections.emptyList()); + } + + public void addKategori(Link link) { + addLink("kategori", link); + } + + @JsonIgnore + public List getSkole() { + return getLinks().getOrDefault("skole", Collections.emptyList()); + } + + public void addSkole(Link link) { + addLink("skole", link); + } + + @JsonIgnore + public List getAvbruddsarsak() { + return getLinks().getOrDefault("avbruddsarsak", Collections.emptyList()); + } + + public void addAvbruddsarsak(Link link) { + addLink("avbruddsarsak", link); + } + + @JsonIgnore + public List getFravarsregistreringer() { + return getLinks().getOrDefault("fravarsregistreringer", Collections.emptyList()); + } + + public void addFravarsregistreringer(Link link) { + addLink("fravarsregistreringer", link); + } + + @JsonIgnore + public List getFaggruppemedlemskap() { + return getLinks().getOrDefault("faggruppemedlemskap", Collections.emptyList()); + } + + public void addFaggruppemedlemskap(Link link) { + addLink("faggruppemedlemskap", link); + } + + @JsonIgnore + public List getSkolear() { + return getLinks().getOrDefault("skolear", Collections.emptyList()); + } + + public void addSkolear(Link link) { + addLink("skolear", link); + } + + @JsonIgnore + public List getUndervisningsgruppemedlemskap() { + return getLinks().getOrDefault("undervisningsgruppemedlemskap", Collections.emptyList()); + } + + public void addUndervisningsgruppemedlemskap(Link link) { + addLink("undervisningsgruppemedlemskap", link); + } + + @JsonIgnore + public List getPersongruppemedlemskap() { + return getLinks().getOrDefault("persongruppemedlemskap", Collections.emptyList()); + } + + public void addPersongruppemedlemskap(Link link) { + addLink("persongruppemedlemskap", link); + } + + @JsonIgnore + public List getEksamensgruppemedlemskap() { + return getLinks().getOrDefault("eksamensgruppemedlemskap", Collections.emptyList()); + } + + public void addEksamensgruppemedlemskap(Link link) { + addLink("eksamensgruppemedlemskap", link); + } + + @JsonIgnore + public List getKontaktlarergruppemedlemskap() { + return getLinks().getOrDefault("kontaktlarergruppemedlemskap", Collections.emptyList()); + } + + public void addKontaktlarergruppemedlemskap(Link link) { + addLink("kontaktlarergruppemedlemskap", link); + } + + @JsonIgnore + public List getElevfravar() { + return getLinks().getOrDefault("elevfravar", Collections.emptyList()); + } + + public void addElevfravar(Link link) { + addLink("elevfravar", link); + } + + @JsonIgnore + public List getTilrettelegging() { + return getLinks().getOrDefault("tilrettelegging", Collections.emptyList()); + } + + public void addTilrettelegging(Link link) { + addLink("tilrettelegging", link); + } + + @JsonIgnore + public List getElevvurdering() { + return getLinks().getOrDefault("elevvurdering", Collections.emptyList()); + } + + public void addElevvurdering(Link link) { + addLink("elevvurdering", link); + } + + @JsonIgnore + public List getProgramomrademedlemskap() { + return getLinks().getOrDefault("programomrademedlemskap", Collections.emptyList()); + } + + public void addProgramomrademedlemskap(Link link) { + addLink("programomrademedlemskap", link); + } + + @JsonIgnore + public List getKlassemedlemskap() { + return getLinks().getOrDefault("klassemedlemskap", Collections.emptyList()); + } + + public void addKlassemedlemskap(Link link) { + addLink("klassemedlemskap", link); + } } 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 4662b594..5158b838 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ElevforholdResources extends AbstractCollectionResources { - public ElevforholdResources(Collection input) { - super(input); - } + public ElevforholdResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 6d13235d..a89c165c 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 @@ -1,72 +1,74 @@ package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class ElevtilretteleggingResource implements FintResource { - // Attributes - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getElev() { + return getLinks().getOrDefault("elev", Collections.emptyList()); + } + + public void addElev(Link link) { + addLink("elev", link); + } + + @JsonIgnore + public List getFag() { + return getLinks().getOrDefault("fag", Collections.emptyList()); + } + + public void addFag(Link link) { + addLink("fag", link); + } + + @JsonIgnore + public List getTilrettelegging() { + return getLinks().getOrDefault("tilrettelegging", Collections.emptyList()); + } + + public void addTilrettelegging(Link link) { + addLink("tilrettelegging", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getEksamensform() { + return getLinks().getOrDefault("eksamensform", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getElev() { - return getLinks().getOrDefault("elev", Collections.emptyList()); - } - public void addElev(Link link) { - addLink("elev", link); - } - @JsonIgnore - public List getFag() { - return getLinks().getOrDefault("fag", Collections.emptyList()); - } - public void addFag(Link link) { - addLink("fag", link); - } - @JsonIgnore - public List getTilrettelegging() { - return getLinks().getOrDefault("tilrettelegging", Collections.emptyList()); - } - public void addTilrettelegging(Link link) { - addLink("tilrettelegging", link); - } - @JsonIgnore - public List getEksamensform() { - return getLinks().getOrDefault("eksamensform", Collections.emptyList()); - } - public void addEksamensform(Link link) { - addLink("eksamensform", link); - } + public void addEksamensform(Link link) { + addLink("eksamensform", link); + } } 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 f0d11e03..2a0ed4bb 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class ElevtilretteleggingResources extends AbstractCollectionResources { +public class ElevtilretteleggingResources + extends AbstractCollectionResources { - public ElevtilretteleggingResources(Collection input) { - super(input); - } + public ElevtilretteleggingResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KlasseResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KlasseResource.java new file mode 100644 index 00000000..2a2855f6 --- /dev/null +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KlasseResource.java @@ -0,0 +1,97 @@ +package no.novari.fint.model.resource.utdanning.elev; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class KlasseResource extends Gruppe implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getSkolear() { + return getLinks().getOrDefault("skolear", Collections.emptyList()); + } + + public void addSkolear(Link link) { + addLink("skolear", link); + } + + @JsonIgnore + public List getTermin() { + return getLinks().getOrDefault("termin", Collections.emptyList()); + } + + public void addTermin(Link link) { + addLink("termin", link); + } + + @JsonIgnore + public List getTrinn() { + return getLinks().getOrDefault("trinn", Collections.emptyList()); + } + + public void addTrinn(Link link) { + addLink("trinn", link); + } + + @JsonIgnore + public List getSkole() { + return getLinks().getOrDefault("skole", Collections.emptyList()); + } + + public void addSkole(Link link) { + addLink("skole", link); + } + + @JsonIgnore + public List getUndervisningsforhold() { + return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); + } + + public void addUndervisningsforhold(Link link) { + addLink("undervisningsforhold", link); + } + + @JsonIgnore + public List getKlassemedlemskap() { + return getLinks().getOrDefault("klassemedlemskap", Collections.emptyList()); + } + + public void addKlassemedlemskap(Link link) { + addLink("klassemedlemskap", link); + } + + @JsonIgnore + public List getKontaktlarergruppe() { + return getLinks().getOrDefault("kontaktlarergruppe", Collections.emptyList()); + } + + public void addKontaktlarergruppe(Link link) { + addLink("kontaktlarergruppe", link); + } +} diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KlasseResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KlasseResources.java new file mode 100644 index 00000000..20928b1a --- /dev/null +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KlasseResources.java @@ -0,0 +1,23 @@ +package no.novari.fint.model.resource.utdanning.elev; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.core.type.TypeReference; +import java.util.Collection; +import java.util.List; +import lombok.NoArgsConstructor; +import no.novari.fint.model.resource.AbstractCollectionResources; + +@NoArgsConstructor +public class KlasseResources extends AbstractCollectionResources { + + public KlasseResources(Collection input) { + super(input); + } + + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } +} diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KlassemedlemskapResource.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KlassemedlemskapResource.java new file mode 100644 index 00000000..e8485e55 --- /dev/null +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KlassemedlemskapResource.java @@ -0,0 +1,52 @@ +package no.novari.fint.model.resource.utdanning.elev; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; +import no.novari.fint.model.utdanning.basisklasser.Gruppemedlemskap; + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class KlassemedlemskapResource extends Gruppemedlemskap implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getElevforhold() { + return getLinks().getOrDefault("elevforhold", Collections.emptyList()); + } + + public void addElevforhold(Link link) { + addLink("elevforhold", link); + } + + @JsonIgnore + public List getKlasse() { + return getLinks().getOrDefault("klasse", Collections.emptyList()); + } + + public void addKlasse(Link link) { + addLink("klasse", link); + } +} diff --git a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KlassemedlemskapResources.java b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KlassemedlemskapResources.java new file mode 100644 index 00000000..95224455 --- /dev/null +++ b/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/KlassemedlemskapResources.java @@ -0,0 +1,24 @@ +package no.novari.fint.model.resource.utdanning.elev; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.core.type.TypeReference; +import java.util.Collection; +import java.util.List; +import lombok.NoArgsConstructor; +import no.novari.fint.model.resource.AbstractCollectionResources; + +@NoArgsConstructor +public class KlassemedlemskapResources + extends AbstractCollectionResources { + + public KlassemedlemskapResources(Collection input) { + super(input); + } + + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } +} 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 6eda2369..46191c3e 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 @@ -1,90 +1,88 @@ package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; 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; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class KontaktlarergruppeResource extends GruppeResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getBasisgruppe() { - return getLinks().getOrDefault("basisgruppe", Collections.emptyList()); - } - public void addBasisgruppe(Link link) { - addLink("basisgruppe", link); - } - @Deprecated - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - @Deprecated - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getTermin() { - return getLinks().getOrDefault("termin", Collections.emptyList()); - } - public void addTermin(Link link) { - addLink("termin", link); - } - @JsonIgnore - public List getSkole() { - return getLinks().getOrDefault("skole", Collections.emptyList()); - } - public void addSkole(Link link) { - addLink("skole", link); - } - @JsonIgnore - public List getSkolear() { - return getLinks().getOrDefault("skolear", Collections.emptyList()); - } - public void addSkolear(Link link) { - addLink("skolear", link); - } - @JsonIgnore - public List getUndervisningsforhold() { - return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); - } - public void addUndervisningsforhold(Link link) { - addLink("undervisningsforhold", link); - } - @JsonIgnore - public List getGruppemedlemskap() { - return getLinks().getOrDefault("gruppemedlemskap", Collections.emptyList()); - } - public void addGruppemedlemskap(Link link) { - addLink("gruppemedlemskap", link); - } +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class KontaktlarergruppeResource extends Gruppe implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getKlasse() { + return getLinks().getOrDefault("klasse", Collections.emptyList()); + } + + public void addKlasse(Link link) { + addLink("klasse", link); + } + + @JsonIgnore + public List getTermin() { + return getLinks().getOrDefault("termin", Collections.emptyList()); + } + + public void addTermin(Link link) { + addLink("termin", link); + } + + @JsonIgnore + public List getSkole() { + return getLinks().getOrDefault("skole", Collections.emptyList()); + } + + public void addSkole(Link link) { + addLink("skole", link); + } + + @JsonIgnore + public List getSkolear() { + return getLinks().getOrDefault("skolear", Collections.emptyList()); + } + + public void addSkolear(Link link) { + addLink("skolear", link); + } + + @JsonIgnore + public List getUndervisningsforhold() { + return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); + } + + public void addUndervisningsforhold(Link link) { + addLink("undervisningsforhold", link); + } + + @JsonIgnore + public List getGruppemedlemskap() { + return getLinks().getOrDefault("gruppemedlemskap", Collections.emptyList()); + } + + public void addGruppemedlemskap(Link link) { + addLink("gruppemedlemskap", link); + } } 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 6373bc9b..3b2888f4 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class KontaktlarergruppeResources extends AbstractCollectionResources { +public class KontaktlarergruppeResources + extends AbstractCollectionResources { - public KontaktlarergruppeResources(Collection input) { - super(input); - } + public KontaktlarergruppeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 e8be27e4..250d6ad2 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 @@ -1,53 +1,52 @@ package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; 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 @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class KontaktlarergruppemedlemskapResource extends Gruppemedlemskap implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getKontaktlarergruppe() { - return getLinks().getOrDefault("kontaktlarergruppe", Collections.emptyList()); - } - public void addKontaktlarergruppe(Link link) { - addLink("kontaktlarergruppe", link); - } + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getElevforhold() { + return getLinks().getOrDefault("elevforhold", Collections.emptyList()); + } + + public void addElevforhold(Link link) { + addLink("elevforhold", link); + } + + @JsonIgnore + public List getKontaktlarergruppe() { + return getLinks().getOrDefault("kontaktlarergruppe", Collections.emptyList()); + } + + public void addKontaktlarergruppe(Link link) { + addLink("kontaktlarergruppe", link); + } } 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 496f8011..bc6fa38b 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 @@ -2,24 +2,24 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class KontaktlarergruppemedlemskapResources extends AbstractCollectionResources { +public class KontaktlarergruppemedlemskapResources + extends AbstractCollectionResources { - public KontaktlarergruppemedlemskapResources(Collection input) { - super(input); - } + public KontaktlarergruppemedlemskapResources( + Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 deleted file mode 100644 index 2ae8d1a5..00000000 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/MedlemskapResource.java +++ /dev/null @@ -1,91 +0,0 @@ -package no.novari.fint.model.resource.utdanning.elev; - -import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -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.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 -@EqualsAndHashCode -@ToString -@Deprecated -public class MedlemskapResource implements FintResource { - // Attributes - @Deprecated - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @Deprecated - @JsonIgnore - public List getMedlem() { - return getLinks().getOrDefault("medlem", Collections.emptyList()); - } - @Deprecated - public void addMedlem(Link link) { - addLink("medlem", link); - } - @Deprecated - @JsonIgnore - public List getFortlopendeVurdering() { - return getLinks().getOrDefault("fortlopendeVurdering", Collections.emptyList()); - } - @Deprecated - public void addFortlopendeVurdering(Link link) { - addLink("fortlopendeVurdering", link); - } - @Deprecated - @JsonIgnore - public List getGruppe() { - return getLinks().getOrDefault("gruppe", Collections.emptyList()); - } - @Deprecated - public void addGruppe(Link link) { - addLink("gruppe", link); - } - @Deprecated - @JsonIgnore - public List getEndeligVurdering() { - return getLinks().getOrDefault("endeligVurdering", Collections.emptyList()); - } - @Deprecated - public void addEndeligVurdering(Link link) { - addLink("endeligVurdering", link); - } - @Deprecated - @JsonIgnore - public List getFravar() { - return getLinks().getOrDefault("fravar", Collections.emptyList()); - } - @Deprecated - public void addFravar(Link link) { - addLink("fravar", link); - } -} 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 deleted file mode 100644 index 7e158ba0..00000000 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/elev/MedlemskapResources.java +++ /dev/null @@ -1,26 +0,0 @@ -package no.novari.fint.model.resource.utdanning.elev; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.util.Collection; -import java.util.List; - -import lombok.NoArgsConstructor; -import no.novari.fint.model.resource.AbstractCollectionResources; - -@NoArgsConstructor -@Deprecated -public class MedlemskapResources extends AbstractCollectionResources { - - public MedlemskapResources(Collection input) { - super(input); - } - - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } -} 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 fb5f2e20..f415c69d 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 @@ -1,88 +1,97 @@ package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; 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; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class PersongruppeResource extends GruppeResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getElev() { - return getLinks().getOrDefault("elev", Collections.emptyList()); - } - public void addElev(Link link) { - addLink("elev", link); - } - @JsonIgnore - public List getPersongruppemedlemskap() { - return getLinks().getOrDefault("persongruppemedlemskap", Collections.emptyList()); - } - public void addPersongruppemedlemskap(Link link) { - addLink("persongruppemedlemskap", link); - } - @JsonIgnore - public List getTermin() { - return getLinks().getOrDefault("termin", Collections.emptyList()); - } - public void addTermin(Link link) { - addLink("termin", link); - } - @JsonIgnore - public List getUndervisningsforhold() { - return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); - } - public void addUndervisningsforhold(Link link) { - addLink("undervisningsforhold", link); - } - @JsonIgnore - public List getSkole() { - return getLinks().getOrDefault("skole", Collections.emptyList()); - } - public void addSkole(Link link) { - addLink("skole", link); - } - @JsonIgnore - public List getSkoleressurs() { - return getLinks().getOrDefault("skoleressurs", Collections.emptyList()); - } - public void addSkoleressurs(Link link) { - addLink("skoleressurs", link); - } - @JsonIgnore - public List getSkolear() { - return getLinks().getOrDefault("skolear", Collections.emptyList()); - } - public void addSkolear(Link link) { - addLink("skolear", link); - } +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PersongruppeResource extends Gruppe implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getElev() { + return getLinks().getOrDefault("elev", Collections.emptyList()); + } + + public void addElev(Link link) { + addLink("elev", link); + } + + @JsonIgnore + public List getPersongruppemedlemskap() { + return getLinks().getOrDefault("persongruppemedlemskap", Collections.emptyList()); + } + + public void addPersongruppemedlemskap(Link link) { + addLink("persongruppemedlemskap", link); + } + + @JsonIgnore + public List getTermin() { + return getLinks().getOrDefault("termin", Collections.emptyList()); + } + + public void addTermin(Link link) { + addLink("termin", link); + } + + @JsonIgnore + public List getUndervisningsforhold() { + return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); + } + + public void addUndervisningsforhold(Link link) { + addLink("undervisningsforhold", link); + } + + @JsonIgnore + public List getSkole() { + return getLinks().getOrDefault("skole", Collections.emptyList()); + } + + public void addSkole(Link link) { + addLink("skole", link); + } + + @JsonIgnore + public List getSkoleressurs() { + return getLinks().getOrDefault("skoleressurs", Collections.emptyList()); + } + + public void addSkoleressurs(Link link) { + addLink("skoleressurs", link); + } + + @JsonIgnore + public List getSkolear() { + return getLinks().getOrDefault("skolear", Collections.emptyList()); + } + + public void addSkolear(Link link) { + addLink("skolear", link); + } } 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 bc56bcc7..f102f602 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class PersongruppeResources extends AbstractCollectionResources { - public PersongruppeResources(Collection input) { - super(input); - } + public PersongruppeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 4b26f729..a52ea6e9 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 @@ -1,53 +1,52 @@ package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; 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 @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class PersongruppemedlemskapResource extends Gruppemedlemskap implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getPersongruppe() { - return getLinks().getOrDefault("persongruppe", Collections.emptyList()); - } - public void addPersongruppe(Link link) { - addLink("persongruppe", link); - } + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getElevforhold() { + return getLinks().getOrDefault("elevforhold", Collections.emptyList()); + } + + public void addElevforhold(Link link) { + addLink("elevforhold", link); + } + + @JsonIgnore + public List getPersongruppe() { + return getLinks().getOrDefault("persongruppe", Collections.emptyList()); + } + + public void addPersongruppe(Link link) { + addLink("persongruppe", link); + } } 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 3c5a45fa..3130b108 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class PersongruppemedlemskapResources extends AbstractCollectionResources { +public class PersongruppemedlemskapResources + extends AbstractCollectionResources { - public PersongruppemedlemskapResources(Collection input) { - super(input); - } + public PersongruppemedlemskapResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 e5561313..5395be93 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 @@ -1,81 +1,85 @@ package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class SkoleressursResource implements FintResource { - // Attributes - private @Valid Identifikator feidenavn; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("feidenavn", this.feidenavn); - identifikators.put("systemId", this.systemId); + // Attributes + private @Valid Identifikator feidenavn; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("feidenavn", this.feidenavn); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getPerson() { + return getLinks().getOrDefault("person", Collections.emptyList()); + } + + public void addPerson(Link link) { + addLink("person", link); + } + + @JsonIgnore + public List getPersonalressurs() { + return getLinks().getOrDefault("personalressurs", Collections.emptyList()); + } + + public void addPersonalressurs(Link link) { + addLink("personalressurs", link); + } + + @JsonIgnore + public List getUndervisningsforhold() { + return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); + } + + public void addUndervisningsforhold(Link link) { + addLink("undervisningsforhold", link); + } + + @JsonIgnore + public List getSkole() { + return getLinks().getOrDefault("skole", Collections.emptyList()); + } + + public void addSkole(Link link) { + addLink("skole", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getSensor() { + return getLinks().getOrDefault("sensor", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getPerson() { - return getLinks().getOrDefault("person", Collections.emptyList()); - } - public void addPerson(Link link) { - addLink("person", link); - } - @JsonIgnore - public List getPersonalressurs() { - return getLinks().getOrDefault("personalressurs", Collections.emptyList()); - } - public void addPersonalressurs(Link link) { - addLink("personalressurs", link); - } - @JsonIgnore - public List getUndervisningsforhold() { - return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); - } - public void addUndervisningsforhold(Link link) { - addLink("undervisningsforhold", link); - } - @JsonIgnore - public List getSkole() { - return getLinks().getOrDefault("skole", Collections.emptyList()); - } - public void addSkole(Link link) { - addLink("skole", link); - } - @JsonIgnore - public List getSensor() { - return getLinks().getOrDefault("sensor", Collections.emptyList()); - } - public void addSensor(Link link) { - addLink("sensor", link); - } + public void addSensor(Link link) { + addLink("sensor", link); + } } 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 e8acb6a8..56cad782 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SkoleressursResources extends AbstractCollectionResources { - public SkoleressursResources(Collection input) { - super(input); - } + public SkoleressursResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 c400d71e..4d1a3e43 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 @@ -1,97 +1,109 @@ package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; 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; +import no.novari.fint.model.utdanning.basisklasser.Utdanningsforhold; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class UndervisningsforholdResource extends UtdanningsforholdResource implements FintResource { - // Attributes - private Boolean hovedskole; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getArbeidsforhold() { - return getLinks().getOrDefault("arbeidsforhold", Collections.emptyList()); - } - public void addArbeidsforhold(Link link) { - addLink("arbeidsforhold", link); - } - @JsonIgnore - public List getBasisgruppe() { - return getLinks().getOrDefault("basisgruppe", Collections.emptyList()); - } - public void addBasisgruppe(Link link) { - addLink("basisgruppe", link); - } - @JsonIgnore - public List getKontaktlarergruppe() { - return getLinks().getOrDefault("kontaktlarergruppe", Collections.emptyList()); - } - public void addKontaktlarergruppe(Link link) { - addLink("kontaktlarergruppe", link); - } - @JsonIgnore - public List getUndervisningsgruppe() { - return getLinks().getOrDefault("undervisningsgruppe", Collections.emptyList()); - } - public void addUndervisningsgruppe(Link link) { - addLink("undervisningsgruppe", link); - } - @JsonIgnore - public List getEksamensgruppe() { - return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); - } - public void addEksamensgruppe(Link link) { - addLink("eksamensgruppe", link); - } - @JsonIgnore - public List getTime() { - return getLinks().getOrDefault("time", Collections.emptyList()); - } - public void addTime(Link link) { - addLink("time", link); - } - @JsonIgnore - public List getSkole() { - return getLinks().getOrDefault("skole", Collections.emptyList()); - } - public void addSkole(Link link) { - addLink("skole", link); - } - @JsonIgnore - public List getSkoleressurs() { - return getLinks().getOrDefault("skoleressurs", Collections.emptyList()); - } - public void addSkoleressurs(Link link) { - addLink("skoleressurs", link); - } +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class UndervisningsforholdResource extends Utdanningsforhold implements FintResource { + // Attributes + private Boolean hovedskole; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getArbeidsforhold() { + return getLinks().getOrDefault("arbeidsforhold", Collections.emptyList()); + } + + public void addArbeidsforhold(Link link) { + addLink("arbeidsforhold", link); + } + + @JsonIgnore + public List getKlasse() { + return getLinks().getOrDefault("klasse", Collections.emptyList()); + } + + public void addKlasse(Link link) { + addLink("klasse", link); + } + + @JsonIgnore + public List getKontaktlarergruppe() { + return getLinks().getOrDefault("kontaktlarergruppe", Collections.emptyList()); + } + + public void addKontaktlarergruppe(Link link) { + addLink("kontaktlarergruppe", link); + } + + @JsonIgnore + public List getUndervisningsgruppe() { + return getLinks().getOrDefault("undervisningsgruppe", Collections.emptyList()); + } + + public void addUndervisningsgruppe(Link link) { + addLink("undervisningsgruppe", link); + } + + @JsonIgnore + public List getEksamensgruppe() { + return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); + } + + public void addEksamensgruppe(Link link) { + addLink("eksamensgruppe", link); + } + + @JsonIgnore + public List getTime() { + return getLinks().getOrDefault("time", Collections.emptyList()); + } + + public void addTime(Link link) { + addLink("time", link); + } + + @JsonIgnore + public List getSkole() { + return getLinks().getOrDefault("skole", Collections.emptyList()); + } + + public void addSkole(Link link) { + addLink("skole", link); + } + + @JsonIgnore + public List getSkoleressurs() { + return getLinks().getOrDefault("skoleressurs", Collections.emptyList()); + } + + public void addSkoleressurs(Link link) { + addLink("skoleressurs", link); + } } 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 86b2cb03..48f75e6a 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class UndervisningsforholdResources extends AbstractCollectionResources { +public class UndervisningsforholdResources + extends AbstractCollectionResources { - public UndervisningsforholdResources(Collection input) { - super(input); - } + public UndervisningsforholdResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 94c7cfa2..a9720725 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 @@ -1,79 +1,78 @@ package no.novari.fint.model.resource.utdanning.elev; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @NoArgsConstructor @EqualsAndHashCode @ToString public class VarselResource implements FintResource { - // Attributes - @NotNull - private Long fravarsprosent; - @NotNull - private Date sendt; - @NotNull - private @Valid Identifikator systemId; - @NotBlank - private String tekst; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotNull private Long fravarsprosent; + @NotNull private Date sendt; + @NotNull private @Valid Identifikator systemId; + @NotBlank private String tekst; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getUtsteder() { + return getLinks().getOrDefault("utsteder", Collections.emptyList()); + } + + public void addUtsteder(Link link) { + addLink("utsteder", link); + } + + @JsonIgnore + public List getKarakteransvarlig() { + return getLinks().getOrDefault("karakteransvarlig", Collections.emptyList()); + } + + public void addKarakteransvarlig(Link link) { + addLink("karakteransvarlig", link); + } + + @JsonIgnore + public List getType() { + return getLinks().getOrDefault("type", Collections.emptyList()); + } + + public void addType(Link link) { + addLink("type", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getFaggruppemedlemskap() { + return getLinks().getOrDefault("faggruppemedlemskap", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getUtsteder() { - return getLinks().getOrDefault("utsteder", Collections.emptyList()); - } - public void addUtsteder(Link link) { - addLink("utsteder", link); - } - @JsonIgnore - public List getKarakteransvarlig() { - return getLinks().getOrDefault("karakteransvarlig", Collections.emptyList()); - } - public void addKarakteransvarlig(Link link) { - addLink("karakteransvarlig", link); - } - @JsonIgnore - public List getType() { - return getLinks().getOrDefault("type", Collections.emptyList()); - } - public void addType(Link link) { - addLink("type", link); - } - @JsonIgnore - public List getFaggruppemedlemskap() { - return getLinks().getOrDefault("faggruppemedlemskap", Collections.emptyList()); - } - public void addFaggruppemedlemskap(Link link) { - addLink("faggruppemedlemskap", link); - } + public void addFaggruppemedlemskap(Link link) { + addLink("faggruppemedlemskap", link); + } } 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 e53c3388..226b2486 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class VarselResources extends AbstractCollectionResources { - public VarselResources(Collection input) { - super(input); - } + public VarselResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 4e3a71c8..c4663f58 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class AvbruddsarsakResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 08d85e1e..6755de0b 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AvbruddsarsakResources extends AbstractCollectionResources { - public AvbruddsarsakResources(Collection input) { - super(input); - } + public AvbruddsarsakResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 05f195ea..ff2749cc 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class BetalingsstatusResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 25e59abb..dcc988da 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class BetalingsstatusResources extends AbstractCollectionResources { - public BetalingsstatusResources(Collection input) { - super(input); - } + public BetalingsstatusResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 58869666..4e102e2f 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class BevistypeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 db1f9aab..b2eefc77 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class BevistypeResources extends AbstractCollectionResources { - public BevistypeResources(Collection input) { - super(input); - } + public BevistypeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 9b9dbe8e..c08d87be 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class BrevtypeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 069d98c7..aad53785 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class BrevtypeResources extends AbstractCollectionResources { - public BrevtypeResources(Collection input) { - super(input); - } + public BrevtypeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 4f66e246..f39ef3fd 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class EksamensformResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 e95c9256..4b22bd39 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class EksamensformResources extends AbstractCollectionResources { - public EksamensformResources(Collection input) { - super(input); - } + public EksamensformResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 75fcf0e0..aecc4799 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class ElevkategoriResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 dcf1de45..ac5255a6 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ElevkategoriResources extends AbstractCollectionResources { - public ElevkategoriResources(Collection input) { - super(input); - } + public ElevkategoriResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 4d47c832..d0e799c4 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class FagmerknadResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 dbf4fc88..efaa962c 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FagmerknadResources extends AbstractCollectionResources { - public FagmerknadResources(Collection input) { - super(input); - } + public FagmerknadResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 4fb5af9f..db2d56e2 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class FagstatusResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 500211b9..15b3114f 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FagstatusResources extends AbstractCollectionResources { - public FagstatusResources(Collection input) { - super(input); - } + public FagstatusResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 e89d7a69..2dfea2df 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class FravarstypeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 99648545..c9e8390e 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FravarstypeResources extends AbstractCollectionResources { - public FravarstypeResources(Collection input) { - super(input); - } + public FravarstypeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 66dc4783..bf6f3464 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class FullfortkodeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 c1509e2a..0d9260c8 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FullfortkodeResources extends AbstractCollectionResources { - public FullfortkodeResources(Collection input) { - super(input); - } + public FullfortkodeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 2e47f242..eef5261f 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 @@ -1,53 +1,52 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class KarakterskalaResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getVigoreferanse() { - return getLinks().getOrDefault("vigoreferanse", Collections.emptyList()); - } - public void addVigoreferanse(Link link) { - addLink("vigoreferanse", link); - } - @JsonIgnore - public List getVerdi() { - return getLinks().getOrDefault("verdi", Collections.emptyList()); - } - public void addVerdi(Link link) { - addLink("verdi", link); - } + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getVigoreferanse() { + return getLinks().getOrDefault("vigoreferanse", Collections.emptyList()); + } + + public void addVigoreferanse(Link link) { + addLink("vigoreferanse", link); + } + + @JsonIgnore + public List getVerdi() { + return getLinks().getOrDefault("verdi", Collections.emptyList()); + } + + public void addVerdi(Link link) { + addLink("verdi", link); + } } 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 52aae2dd..3493a91a 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KarakterskalaResources extends AbstractCollectionResources { - public KarakterskalaResources(Collection input) { - super(input); - } + public KarakterskalaResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 907faefb..6a2ed44a 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class KarakterstatusResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 d3754017..af5b5a77 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KarakterstatusResources extends AbstractCollectionResources { - public KarakterstatusResources(Collection input) { - super(input); - } + public KarakterstatusResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 81834954..144de48e 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 @@ -1,46 +1,43 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class OtEnhetResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getKommune() { + return getLinks().getOrDefault("kommune", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getKommune() { - return getLinks().getOrDefault("kommune", Collections.emptyList()); - } - public void addKommune(Link link) { - addLink("kommune", link); - } + public void addKommune(Link link) { + addLink("kommune", link); + } } 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 7e8d8a4d..dbc5ea69 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class OtEnhetResources extends AbstractCollectionResources { - public OtEnhetResources(Collection input) { - super(input); - } + public OtEnhetResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 cecc17cc..edd4b076 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 @@ -1,43 +1,38 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; 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.constraints.*; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class OtStatusResource extends Begrep implements FintResource { - // Attributes - private String beskrivelse; - @NotBlank - private String type; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + // Attributes + private String beskrivelse; + @NotBlank private String type; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 c7615dcd..aff376de 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class OtStatusResources extends AbstractCollectionResources { - public OtStatusResources(Collection input) { - super(input); - } + public OtStatusResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 3a47bded..bed10754 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class ProvestatusResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 a67efc97..a5ae847f 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ProvestatusResources extends AbstractCollectionResources { - public ProvestatusResources(Collection input) { - super(input); - } + public ProvestatusResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 9267f35d..c16838b9 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class SkolearResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 c2e0abd3..57a794dd 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SkolearResources extends AbstractCollectionResources { - public SkolearResources(Collection input) { - super(input); - } + public SkolearResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 066d4286..8e25ea7c 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class SkoleeiertypeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 e00f54ab..a75d0eb2 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SkoleeiertypeResources extends AbstractCollectionResources { - public SkoleeiertypeResources(Collection input) { - super(input); - } + public SkoleeiertypeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 4492d0bf..3041551d 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class TerminResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 ea5ba917..1ef38733 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TerminResources extends AbstractCollectionResources { - public TerminResources(Collection input) { - super(input); - } + public TerminResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 1afe5228..9f3c0f28 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class TilretteleggingResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 df56cb87..1b65e8df 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TilretteleggingResources extends AbstractCollectionResources { - public TilretteleggingResources(Collection input) { - super(input); - } + public TilretteleggingResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 b11d8cea..4c93655a 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class VarseltypeResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 ca572c81..d4ae6f93 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class VarseltypeResources extends AbstractCollectionResources { - public VarseltypeResources(Collection input) { - super(input); - } + public VarseltypeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 baf838e9..cdde04a7 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 @@ -1,38 +1,34 @@ package no.novari.fint.model.resource.utdanning.kodeverk; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class VitnemalsmerknadResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); - return Collections.unmodifiableMap(identifikators); - } + return Collections.unmodifiableMap(identifikators); + } - // Relations - @Getter - private final Map> links = createLinks(); + // Relations + @Getter private final Map> links = createLinks(); } 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 44cde6b4..e6d1a07b 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class VitnemalsmerknadResources extends AbstractCollectionResources { +public class VitnemalsmerknadResources + extends AbstractCollectionResources { - public VitnemalsmerknadResources(Collection input) { - super(input); - } + public VitnemalsmerknadResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 ed418df0..4a460c7a 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 @@ -1,81 +1,85 @@ package no.novari.fint.model.resource.utdanning.larling; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @NoArgsConstructor @EqualsAndHashCode @ToString public class AvlagtProveResource implements FintResource { - // Attributes - private Date provedato; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + private Date provedato; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getProvestatus() { + return getLinks().getOrDefault("provestatus", Collections.emptyList()); + } + + public void addProvestatus(Link link) { + addLink("provestatus", link); + } + + @JsonIgnore + public List getLarling() { + return getLinks().getOrDefault("larling", Collections.emptyList()); + } + + public void addLarling(Link link) { + addLink("larling", link); + } + + @JsonIgnore + public List getFullfortkode() { + return getLinks().getOrDefault("fullfortkode", Collections.emptyList()); + } + + public void addFullfortkode(Link link) { + addLink("fullfortkode", link); + } + + @JsonIgnore + public List getBrevtype() { + return getLinks().getOrDefault("brevtype", Collections.emptyList()); + } + + public void addBrevtype(Link link) { + addLink("brevtype", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getBevistype() { + return getLinks().getOrDefault("bevistype", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getProvestatus() { - return getLinks().getOrDefault("provestatus", Collections.emptyList()); - } - public void addProvestatus(Link link) { - addLink("provestatus", link); - } - @JsonIgnore - public List getLarling() { - return getLinks().getOrDefault("larling", Collections.emptyList()); - } - public void addLarling(Link link) { - addLink("larling", link); - } - @JsonIgnore - public List getFullfortkode() { - return getLinks().getOrDefault("fullfortkode", Collections.emptyList()); - } - public void addFullfortkode(Link link) { - addLink("fullfortkode", link); - } - @JsonIgnore - public List getBrevtype() { - return getLinks().getOrDefault("brevtype", Collections.emptyList()); - } - public void addBrevtype(Link link) { - addLink("brevtype", link); - } - @JsonIgnore - public List getBevistype() { - return getLinks().getOrDefault("bevistype", Collections.emptyList()); - } - public void addBevistype(Link link) { - addLink("bevistype", link); - } + public void addBevistype(Link link) { + addLink("bevistype", link); + } } 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 c6e03ca9..ff1284ff 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AvlagtProveResources extends AbstractCollectionResources { - public AvlagtProveResources(Collection input) { - super(input); - } + public AvlagtProveResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 919b172b..da74908f 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 @@ -1,75 +1,77 @@ package no.novari.fint.model.resource.utdanning.larling; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; 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 @NoArgsConstructor @EqualsAndHashCode @ToString public class LarlingResource implements FintResource { - // Attributes - private String kontraktstype; - private @Valid Periode laretid; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + private String kontraktstype; + private @Valid Periode laretid; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getPerson() { + return getLinks().getOrDefault("person", Collections.emptyList()); + } + + public void addPerson(Link link) { + addLink("person", link); + } + + @JsonIgnore + public List getBedrift() { + return getLinks().getOrDefault("bedrift", Collections.emptyList()); + } + + public void addBedrift(Link link) { + addLink("bedrift", link); + } + + @JsonIgnore + public List getProgramomrade() { + return getLinks().getOrDefault("programomrade", Collections.emptyList()); + } + + public void addProgramomrade(Link link) { + addLink("programomrade", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getAvlagtprove() { + return getLinks().getOrDefault("avlagtprove", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getPerson() { - return getLinks().getOrDefault("person", Collections.emptyList()); - } - public void addPerson(Link link) { - addLink("person", link); - } - @JsonIgnore - public List getBedrift() { - return getLinks().getOrDefault("bedrift", Collections.emptyList()); - } - public void addBedrift(Link link) { - addLink("bedrift", link); - } - @JsonIgnore - public List getProgramomrade() { - return getLinks().getOrDefault("programomrade", Collections.emptyList()); - } - public void addProgramomrade(Link link) { - addLink("programomrade", link); - } - @JsonIgnore - public List getAvlagtprove() { - return getLinks().getOrDefault("avlagtprove", Collections.emptyList()); - } - public void addAvlagtprove(Link link) { - addLink("avlagtprove", link); - } + public void addAvlagtprove(Link link) { + addLink("avlagtprove", link); + } } 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 d021f7b4..aa693716 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class LarlingResources extends AbstractCollectionResources { - public LarlingResources(Collection input) { - super(input); - } + public LarlingResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 ab444058..771d65fe 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 @@ -1,72 +1,74 @@ package no.novari.fint.model.resource.utdanning.ot; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class OtUngdomResource implements FintResource { - // Attributes - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getPerson() { + return getLinks().getOrDefault("person", Collections.emptyList()); + } + + public void addPerson(Link link) { + addLink("person", link); + } + + @JsonIgnore + public List getStatus() { + return getLinks().getOrDefault("status", Collections.emptyList()); + } + + public void addStatus(Link link) { + addLink("status", link); + } + + @JsonIgnore + public List getEnhet() { + return getLinks().getOrDefault("enhet", Collections.emptyList()); + } + + public void addEnhet(Link link) { + addLink("enhet", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getProgramomrade() { + return getLinks().getOrDefault("programomrade", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getPerson() { - return getLinks().getOrDefault("person", Collections.emptyList()); - } - public void addPerson(Link link) { - addLink("person", link); - } - @JsonIgnore - public List getStatus() { - return getLinks().getOrDefault("status", Collections.emptyList()); - } - public void addStatus(Link link) { - addLink("status", link); - } - @JsonIgnore - public List getEnhet() { - return getLinks().getOrDefault("enhet", Collections.emptyList()); - } - public void addEnhet(Link link) { - addLink("enhet", link); - } - @JsonIgnore - public List getProgramomrade() { - return getLinks().getOrDefault("programomrade", Collections.emptyList()); - } - public void addProgramomrade(Link link) { - addLink("programomrade", link); - } + public void addProgramomrade(Link link) { + addLink("programomrade", link); + } } 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 bca69f15..4e632bfd 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class OtUngdomResources extends AbstractCollectionResources { - public OtUngdomResources(Collection input) { - super(input); - } + public OtUngdomResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 4880c9b7..e49e9934 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 @@ -1,66 +1,62 @@ package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; 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; @Data @NoArgsConstructor @EqualsAndHashCode @ToString public class EksamenResource implements FintResource { - // Attributes - private String beskrivelse; - @NotBlank - private String navn; - private @Valid Date oppmotetidspunkt; - @NotNull - private @Valid Identifikator systemId; - @NotNull - private @Valid Periode tidsrom; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + private String beskrivelse; + @NotBlank private String navn; + private Date oppmotetidspunkt; + @NotNull private @Valid Identifikator systemId; + @NotNull private @Valid Periode tidsrom; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getRom() { + return getLinks().getOrDefault("rom", Collections.emptyList()); + } + + public void addRom(Link link) { + addLink("rom", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getEksamensgruppe() { + return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getRom() { - return getLinks().getOrDefault("rom", Collections.emptyList()); - } - public void addRom(Link link) { - addLink("rom", link); - } - @JsonIgnore - public List getEksamensgruppe() { - return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); - } - public void addEksamensgruppe(Link link) { - addLink("eksamensgruppe", link); - } + public void addEksamensgruppe(Link link) { + addLink("eksamensgruppe", link); + } } 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 5d82aa10..e098bad0 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class EksamenResources extends AbstractCollectionResources { - public EksamenResources(Collection input) { - super(input); - } + public EksamenResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 f2932a5a..4bcae435 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 @@ -1,81 +1,106 @@ package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; 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; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class FagResource extends GruppeResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getProgramomrade() { - return getLinks().getOrDefault("programomrade", Collections.emptyList()); - } - public void addProgramomrade(Link link) { - addLink("programomrade", link); - } - @JsonIgnore - public List getTilrettelegging() { - return getLinks().getOrDefault("tilrettelegging", Collections.emptyList()); - } - public void addTilrettelegging(Link link) { - addLink("tilrettelegging", link); - } - @JsonIgnore - public List getFaggruppe() { - return getLinks().getOrDefault("faggruppe", Collections.emptyList()); - } - public void addFaggruppe(Link link) { - addLink("faggruppe", link); - } - @JsonIgnore - public List getSkole() { - return getLinks().getOrDefault("skole", Collections.emptyList()); - } - public void addSkole(Link link) { - addLink("skole", link); - } - @JsonIgnore - public List getUndervisningsgruppe() { - return getLinks().getOrDefault("undervisningsgruppe", Collections.emptyList()); - } - public void addUndervisningsgruppe(Link link) { - addLink("undervisningsgruppe", link); - } - @JsonIgnore - public List getEksamensgruppe() { - return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); - } - public void addEksamensgruppe(Link link) { - addLink("eksamensgruppe", link); - } +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class FagResource extends Gruppe implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getGrepreferanse() { + return getLinks().getOrDefault("grepreferanse", Collections.emptyList()); + } + + public void addGrepreferanse(Link link) { + addLink("grepreferanse", link); + } + + @JsonIgnore + public List getProgramomrade() { + return getLinks().getOrDefault("programomrade", Collections.emptyList()); + } + + public void addProgramomrade(Link link) { + addLink("programomrade", link); + } + + @JsonIgnore + public List getVigoreferanse() { + return getLinks().getOrDefault("vigoreferanse", Collections.emptyList()); + } + + public void addVigoreferanse(Link link) { + addLink("vigoreferanse", link); + } + + @JsonIgnore + public List getTilrettelegging() { + return getLinks().getOrDefault("tilrettelegging", Collections.emptyList()); + } + + public void addTilrettelegging(Link link) { + addLink("tilrettelegging", link); + } + + @JsonIgnore + public List getFaggruppe() { + return getLinks().getOrDefault("faggruppe", Collections.emptyList()); + } + + public void addFaggruppe(Link link) { + addLink("faggruppe", link); + } + + @JsonIgnore + public List getSkole() { + return getLinks().getOrDefault("skole", Collections.emptyList()); + } + + public void addSkole(Link link) { + addLink("skole", link); + } + + @JsonIgnore + public List getUndervisningsgruppe() { + return getLinks().getOrDefault("undervisningsgruppe", Collections.emptyList()); + } + + public void addUndervisningsgruppe(Link link) { + addLink("undervisningsgruppe", link); + } + + @JsonIgnore + public List getEksamensgruppe() { + return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); + } + + public void addEksamensgruppe(Link link) { + addLink("eksamensgruppe", link); + } } 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 ca9fb969..1a301e1d 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FagResources extends AbstractCollectionResources { - public FagResources(Collection input) { - super(input); - } + public FagResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 8373f94d..68e716c8 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 @@ -1,67 +1,70 @@ package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; 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; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class FaggruppeResource extends GruppeResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class FaggruppeResource extends Gruppe implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getFag() { + return getLinks().getOrDefault("fag", Collections.emptyList()); + } + + public void addFag(Link link) { + addLink("fag", link); + } + + @JsonIgnore + public List getSkole() { + return getLinks().getOrDefault("skole", Collections.emptyList()); + } + + public void addSkole(Link link) { + addLink("skole", link); + } + + @JsonIgnore + public List getSkolear() { + return getLinks().getOrDefault("skolear", Collections.emptyList()); + } + + public void addSkolear(Link link) { + addLink("skolear", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getFaggruppemedlemskap() { + return getLinks().getOrDefault("faggruppemedlemskap", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getFag() { - return getLinks().getOrDefault("fag", Collections.emptyList()); - } - public void addFag(Link link) { - addLink("fag", link); - } - @JsonIgnore - public List getSkole() { - return getLinks().getOrDefault("skole", Collections.emptyList()); - } - public void addSkole(Link link) { - addLink("skole", link); - } - @JsonIgnore - public List getSkolear() { - return getLinks().getOrDefault("skolear", Collections.emptyList()); - } - public void addSkolear(Link link) { - addLink("skolear", link); - } - @JsonIgnore - public List getFaggruppemedlemskap() { - return getLinks().getOrDefault("faggruppemedlemskap", Collections.emptyList()); - } - public void addFaggruppemedlemskap(Link link) { - addLink("faggruppemedlemskap", link); - } + public void addFaggruppemedlemskap(Link link) { + addLink("faggruppemedlemskap", link); + } } 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 fd746291..919830f2 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FaggruppeResources extends AbstractCollectionResources { - public FaggruppeResources(Collection input) { - super(input); - } + public FaggruppeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 ed9cea93..ddbb94a1 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 @@ -1,74 +1,79 @@ package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; 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 @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class FaggruppemedlemskapResource extends Gruppemedlemskap implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getFagmerknad() { + return getLinks().getOrDefault("fagmerknad", Collections.emptyList()); + } + + public void addFagmerknad(Link link) { + addLink("fagmerknad", link); + } + + @JsonIgnore + public List getFagstatus() { + return getLinks().getOrDefault("fagstatus", Collections.emptyList()); + } + + public void addFagstatus(Link link) { + addLink("fagstatus", link); + } + + @JsonIgnore + public List getElevforhold() { + return getLinks().getOrDefault("elevforhold", Collections.emptyList()); + } + + public void addElevforhold(Link link) { + addLink("elevforhold", link); + } + + @JsonIgnore + public List getVarsel() { + return getLinks().getOrDefault("varsel", Collections.emptyList()); + } + + public void addVarsel(Link link) { + addLink("varsel", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getFaggruppe() { + return getLinks().getOrDefault("faggruppe", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getFagmerknad() { - return getLinks().getOrDefault("fagmerknad", Collections.emptyList()); - } - public void addFagmerknad(Link link) { - addLink("fagmerknad", link); - } - @JsonIgnore - public List getFagstatus() { - return getLinks().getOrDefault("fagstatus", Collections.emptyList()); - } - public void addFagstatus(Link link) { - addLink("fagstatus", link); - } - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getVarsel() { - return getLinks().getOrDefault("varsel", Collections.emptyList()); - } - public void addVarsel(Link link) { - addLink("varsel", link); - } - @JsonIgnore - public List getFaggruppe() { - return getLinks().getOrDefault("faggruppe", Collections.emptyList()); - } - public void addFaggruppe(Link link) { - addLink("faggruppe", link); - } + public void addFaggruppe(Link link) { + addLink("faggruppe", link); + } } 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 1f14cde7..730be8a5 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class FaggruppemedlemskapResources extends AbstractCollectionResources { +public class FaggruppemedlemskapResources + extends AbstractCollectionResources { - public FaggruppemedlemskapResources(Collection input) { - super(input); - } + public FaggruppemedlemskapResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 61836864..922a8998 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 @@ -1,59 +1,57 @@ package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class RomResource implements FintResource { - // Attributes - private String navn; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getTime() { - return getLinks().getOrDefault("time", Collections.emptyList()); - } - public void addTime(Link link) { - addLink("time", link); - } - @JsonIgnore - public List getEksamen() { - return getLinks().getOrDefault("eksamen", Collections.emptyList()); - } - public void addEksamen(Link link) { - addLink("eksamen", link); - } + // Attributes + private String navn; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getTime() { + return getLinks().getOrDefault("time", Collections.emptyList()); + } + + public void addTime(Link link) { + addLink("time", link); + } + + @JsonIgnore + public List getEksamen() { + return getLinks().getOrDefault("eksamen", Collections.emptyList()); + } + + public void addEksamen(Link link) { + addLink("eksamen", link); + } } 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 41bfbb5b..3a6f1dd3 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class RomResources extends AbstractCollectionResources { - public RomResources(Collection input) { - super(input); - } + public RomResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 e3ed00bd..698a55e8 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 @@ -1,71 +1,69 @@ package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; 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 @NoArgsConstructor @EqualsAndHashCode @ToString public class TimeResource implements FintResource { - // Attributes - private String beskrivelse; - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator systemId; - @NotNull - private @Valid Periode tidsrom; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + private String beskrivelse; + @NotBlank private String navn; + @NotNull private @Valid Identifikator systemId; + @NotNull private @Valid Periode tidsrom; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getUndervisningsgruppe() { + return getLinks().getOrDefault("undervisningsgruppe", Collections.emptyList()); + } + + public void addUndervisningsgruppe(Link link) { + addLink("undervisningsgruppe", link); + } + + @JsonIgnore + public List getUndervisningsforhold() { + return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); + } + + public void addUndervisningsforhold(Link link) { + addLink("undervisningsforhold", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getRom() { + return getLinks().getOrDefault("rom", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getUndervisningsgruppe() { - return getLinks().getOrDefault("undervisningsgruppe", Collections.emptyList()); - } - public void addUndervisningsgruppe(Link link) { - addLink("undervisningsgruppe", link); - } - @JsonIgnore - public List getUndervisningsforhold() { - return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); - } - public void addUndervisningsforhold(Link link) { - addLink("undervisningsforhold", link); - } - @JsonIgnore - public List getRom() { - return getLinks().getOrDefault("rom", Collections.emptyList()); - } - public void addRom(Link link) { - addLink("rom", link); - } + public void addRom(Link link) { + addLink("rom", link); + } } 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 d710459a..81d9c4e6 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class TimeResources extends AbstractCollectionResources { - public TimeResources(Collection input) { - super(input); - } + public TimeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 d986d671..8209cae1 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 @@ -1,97 +1,97 @@ package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; 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; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class UndervisningsgruppeResource extends GruppeResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @Deprecated - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - @Deprecated - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getFag() { - return getLinks().getOrDefault("fag", Collections.emptyList()); - } - public void addFag(Link link) { - addLink("fag", link); - } - @JsonIgnore - public List getTermin() { - return getLinks().getOrDefault("termin", Collections.emptyList()); - } - public void addTermin(Link link) { - addLink("termin", link); - } - @JsonIgnore - public List getSkole() { - return getLinks().getOrDefault("skole", Collections.emptyList()); - } - public void addSkole(Link link) { - addLink("skole", link); - } - @JsonIgnore - public List getSkolear() { - return getLinks().getOrDefault("skolear", Collections.emptyList()); - } - public void addSkolear(Link link) { - addLink("skolear", link); - } - @JsonIgnore - public List getUndervisningsforhold() { - return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); - } - public void addUndervisningsforhold(Link link) { - addLink("undervisningsforhold", link); - } - @JsonIgnore - public List getTime() { - return getLinks().getOrDefault("time", Collections.emptyList()); - } - public void addTime(Link link) { - addLink("time", link); - } - @JsonIgnore - public List getGruppemedlemskap() { - return getLinks().getOrDefault("gruppemedlemskap", Collections.emptyList()); - } - public void addGruppemedlemskap(Link link) { - addLink("gruppemedlemskap", link); - } +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class UndervisningsgruppeResource extends Gruppe implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getFag() { + return getLinks().getOrDefault("fag", Collections.emptyList()); + } + + public void addFag(Link link) { + addLink("fag", link); + } + + @JsonIgnore + public List getTermin() { + return getLinks().getOrDefault("termin", Collections.emptyList()); + } + + public void addTermin(Link link) { + addLink("termin", link); + } + + @JsonIgnore + public List getSkole() { + return getLinks().getOrDefault("skole", Collections.emptyList()); + } + + public void addSkole(Link link) { + addLink("skole", link); + } + + @JsonIgnore + public List getSkolear() { + return getLinks().getOrDefault("skolear", Collections.emptyList()); + } + + public void addSkolear(Link link) { + addLink("skolear", link); + } + + @JsonIgnore + public List getUndervisningsforhold() { + return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); + } + + public void addUndervisningsforhold(Link link) { + addLink("undervisningsforhold", link); + } + + @JsonIgnore + public List getTime() { + return getLinks().getOrDefault("time", Collections.emptyList()); + } + + public void addTime(Link link) { + addLink("time", link); + } + + @JsonIgnore + public List getGruppemedlemskap() { + return getLinks().getOrDefault("gruppemedlemskap", Collections.emptyList()); + } + + public void addGruppemedlemskap(Link link) { + addLink("gruppemedlemskap", link); + } } 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 0ea2083a..c6ef9b8a 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class UndervisningsgruppeResources extends AbstractCollectionResources { +public class UndervisningsgruppeResources + extends AbstractCollectionResources { - public UndervisningsgruppeResources(Collection input) { - super(input); - } + public UndervisningsgruppeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 6cdbb74c..a9f5195f 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 @@ -1,53 +1,53 @@ package no.novari.fint.model.resource.utdanning.timeplan; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; 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 @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class UndervisningsgruppemedlemskapResource extends Gruppemedlemskap implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getUndervisningsgruppe() { - return getLinks().getOrDefault("undervisningsgruppe", Collections.emptyList()); - } - public void addUndervisningsgruppe(Link link) { - addLink("undervisningsgruppe", link); - } +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class UndervisningsgruppemedlemskapResource extends Gruppemedlemskap + implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getElevforhold() { + return getLinks().getOrDefault("elevforhold", Collections.emptyList()); + } + + public void addElevforhold(Link link) { + addLink("elevforhold", link); + } + + @JsonIgnore + public List getUndervisningsgruppe() { + return getLinks().getOrDefault("undervisningsgruppe", Collections.emptyList()); + } + + public void addUndervisningsgruppe(Link link) { + addLink("undervisningsgruppe", link); + } } 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 555bd00d..7ef36a82 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 @@ -2,24 +2,24 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class UndervisningsgruppemedlemskapResources extends AbstractCollectionResources { +public class UndervisningsgruppemedlemskapResources + extends AbstractCollectionResources { - public UndervisningsgruppemedlemskapResources(Collection input) { - super(input); - } + public UndervisningsgruppemedlemskapResources( + Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 68cfea27..a2cc45fb 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 @@ -1,53 +1,70 @@ package no.novari.fint.model.resource.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; 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; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class ArstrinnResource extends GruppeResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getProgramomrade() { - return getLinks().getOrDefault("programomrade", Collections.emptyList()); - } - public void addProgramomrade(Link link) { - addLink("programomrade", link); - } - @JsonIgnore - public List getBasisgruppe() { - return getLinks().getOrDefault("basisgruppe", Collections.emptyList()); - } - public void addBasisgruppe(Link link) { - addLink("basisgruppe", link); - } +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ArstrinnResource extends Gruppe implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getVigoreferanse() { + return getLinks().getOrDefault("vigoreferanse", Collections.emptyList()); + } + + public void addVigoreferanse(Link link) { + addLink("vigoreferanse", link); + } + + @JsonIgnore + public List getGrepreferanse() { + return getLinks().getOrDefault("grepreferanse", Collections.emptyList()); + } + + public void addGrepreferanse(Link link) { + addLink("grepreferanse", link); + } + + @JsonIgnore + public List getProgramomrade() { + return getLinks().getOrDefault("programomrade", Collections.emptyList()); + } + + public void addProgramomrade(Link link) { + addLink("programomrade", link); + } + + @JsonIgnore + public List getKlasse() { + return getLinks().getOrDefault("klasse", Collections.emptyList()); + } + + public void addKlasse(Link link) { + addLink("klasse", link); + } } 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 abe1d702..ba2dafaa 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ArstrinnResources extends AbstractCollectionResources { - public ArstrinnResources(Collection input) { - super(input); - } + public ArstrinnResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 1dcf6960..1ffd2d28 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 @@ -1,76 +1,88 @@ package no.novari.fint.model.resource.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; 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; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class ProgramomradeResource extends GruppeResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @Deprecated - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - @Deprecated - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getUtdanningsprogram() { - return getLinks().getOrDefault("utdanningsprogram", Collections.emptyList()); - } - public void addUtdanningsprogram(Link link) { - addLink("utdanningsprogram", link); - } - @JsonIgnore - public List getFag() { - return getLinks().getOrDefault("fag", Collections.emptyList()); - } - public void addFag(Link link) { - addLink("fag", link); - } - @JsonIgnore - public List getTrinn() { - return getLinks().getOrDefault("trinn", Collections.emptyList()); - } - public void addTrinn(Link link) { - addLink("trinn", link); - } - @JsonIgnore - public List getGruppemedlemskap() { - return getLinks().getOrDefault("gruppemedlemskap", Collections.emptyList()); - } - public void addGruppemedlemskap(Link link) { - addLink("gruppemedlemskap", link); - } +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ProgramomradeResource extends Gruppe implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getGrepreferanse() { + return getLinks().getOrDefault("grepreferanse", Collections.emptyList()); + } + + public void addGrepreferanse(Link link) { + addLink("grepreferanse", link); + } + + @JsonIgnore + public List getUtdanningsprogram() { + return getLinks().getOrDefault("utdanningsprogram", Collections.emptyList()); + } + + public void addUtdanningsprogram(Link link) { + addLink("utdanningsprogram", link); + } + + @JsonIgnore + public List getVigoreferanse() { + return getLinks().getOrDefault("vigoreferanse", Collections.emptyList()); + } + + public void addVigoreferanse(Link link) { + addLink("vigoreferanse", link); + } + + @JsonIgnore + public List getFag() { + return getLinks().getOrDefault("fag", Collections.emptyList()); + } + + public void addFag(Link link) { + addLink("fag", link); + } + + @JsonIgnore + public List getTrinn() { + return getLinks().getOrDefault("trinn", Collections.emptyList()); + } + + public void addTrinn(Link link) { + addLink("trinn", link); + } + + @JsonIgnore + public List getGruppemedlemskap() { + return getLinks().getOrDefault("gruppemedlemskap", Collections.emptyList()); + } + + public void addGruppemedlemskap(Link link) { + addLink("gruppemedlemskap", link); + } } 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 ce0735c8..0b921835 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ProgramomradeResources extends AbstractCollectionResources { - public ProgramomradeResources(Collection input) { - super(input); - } + public ProgramomradeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 6e1b7ed3..3102c0c2 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 @@ -1,53 +1,52 @@ package no.novari.fint.model.resource.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; 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 @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class ProgramomrademedlemskapResource extends Gruppemedlemskap implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getProgramomrade() { - return getLinks().getOrDefault("programomrade", Collections.emptyList()); - } - public void addProgramomrade(Link link) { - addLink("programomrade", link); - } + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getElevforhold() { + return getLinks().getOrDefault("elevforhold", Collections.emptyList()); + } + + public void addElevforhold(Link link) { + addLink("elevforhold", link); + } + + @JsonIgnore + public List getProgramomrade() { + return getLinks().getOrDefault("programomrade", Collections.emptyList()); + } + + public void addProgramomrade(Link link) { + addLink("programomrade", link); + } } 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 de42d232..a7d6c02b 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class ProgramomrademedlemskapResources extends AbstractCollectionResources { +public class ProgramomrademedlemskapResources + extends AbstractCollectionResources { - public ProgramomrademedlemskapResources(Collection input) { - super(input); - } + public ProgramomrademedlemskapResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 420e9493..4eb7374d 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 @@ -1,144 +1,162 @@ package no.novari.fint.model.resource.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class SkoleResource extends EnhetResource implements FintResource { - // Attributes - private String domenenavn; - private String juridiskNavn; - @NotBlank - private String navn; - @NotNull - private @Valid Identifikator skolenummer; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - identifikators.put("skolenummer", this.skolenummer); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getOrganisasjon() { - return getLinks().getOrDefault("organisasjon", Collections.emptyList()); - } - public void addOrganisasjon(Link link) { - addLink("organisasjon", link); - } - @JsonIgnore - public List getFag() { - return getLinks().getOrDefault("fag", Collections.emptyList()); - } - public void addFag(Link link) { - addLink("fag", link); - } - @JsonIgnore - public List getSkoleeierType() { - return getLinks().getOrDefault("skoleeierType", Collections.emptyList()); - } - public void addSkoleeierType(Link link) { - addLink("skoleeierType", link); - } - @JsonIgnore - public List getVigoreferanse() { - return getLinks().getOrDefault("vigoreferanse", Collections.emptyList()); - } - public void addVigoreferanse(Link link) { - addLink("vigoreferanse", link); - } - @JsonIgnore - public List getBasisgruppe() { - return getLinks().getOrDefault("basisgruppe", Collections.emptyList()); - } - public void addBasisgruppe(Link link) { - addLink("basisgruppe", link); - } - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getKontaktlarergruppe() { - return getLinks().getOrDefault("kontaktlarergruppe", Collections.emptyList()); - } - public void addKontaktlarergruppe(Link link) { - addLink("kontaktlarergruppe", link); - } - @JsonIgnore - public List getSkoleressurs() { - return getLinks().getOrDefault("skoleressurs", Collections.emptyList()); - } - public void addSkoleressurs(Link link) { - addLink("skoleressurs", link); - } - @JsonIgnore - public List getUndervisningsforhold() { - return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); - } - public void addUndervisningsforhold(Link link) { - addLink("undervisningsforhold", link); - } - @JsonIgnore - public List getFaggruppe() { - return getLinks().getOrDefault("faggruppe", Collections.emptyList()); - } - public void addFaggruppe(Link link) { - addLink("faggruppe", link); - } - @JsonIgnore - public List getUndervisningsgruppe() { - return getLinks().getOrDefault("undervisningsgruppe", Collections.emptyList()); - } - public void addUndervisningsgruppe(Link link) { - addLink("undervisningsgruppe", link); - } - @JsonIgnore - public List getEksamensgruppe() { - return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); - } - public void addEksamensgruppe(Link link) { - addLink("eksamensgruppe", link); - } - @JsonIgnore - public List getUtdanningsprogram() { - return getLinks().getOrDefault("utdanningsprogram", Collections.emptyList()); - } - public void addUtdanningsprogram(Link link) { - addLink("utdanningsprogram", link); - } + // Attributes + private String domenenavn; + private String juridiskNavn; + @NotBlank private String navn; + @NotNull private @Valid Identifikator skolenummer; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + identifikators.put("skolenummer", this.skolenummer); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getOrganisasjon() { + return getLinks().getOrDefault("organisasjon", Collections.emptyList()); + } + + public void addOrganisasjon(Link link) { + addLink("organisasjon", link); + } + + @JsonIgnore + public List getFag() { + return getLinks().getOrDefault("fag", Collections.emptyList()); + } + + public void addFag(Link link) { + addLink("fag", link); + } + + @JsonIgnore + public List getSkoleeierType() { + return getLinks().getOrDefault("skoleeierType", Collections.emptyList()); + } + + public void addSkoleeierType(Link link) { + addLink("skoleeierType", link); + } + + @JsonIgnore + public List getVigoreferanse() { + return getLinks().getOrDefault("vigoreferanse", Collections.emptyList()); + } + + public void addVigoreferanse(Link link) { + addLink("vigoreferanse", link); + } + + @JsonIgnore + public List getElevforhold() { + return getLinks().getOrDefault("elevforhold", Collections.emptyList()); + } + + public void addElevforhold(Link link) { + addLink("elevforhold", link); + } + + @JsonIgnore + public List getKlasse() { + return getLinks().getOrDefault("klasse", Collections.emptyList()); + } + + public void addKlasse(Link link) { + addLink("klasse", link); + } + + @JsonIgnore + public List getKontaktlarergruppe() { + return getLinks().getOrDefault("kontaktlarergruppe", Collections.emptyList()); + } + + public void addKontaktlarergruppe(Link link) { + addLink("kontaktlarergruppe", link); + } + + @JsonIgnore + public List getSkoleressurs() { + return getLinks().getOrDefault("skoleressurs", Collections.emptyList()); + } + + public void addSkoleressurs(Link link) { + addLink("skoleressurs", link); + } + + @JsonIgnore + public List getUndervisningsforhold() { + return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); + } + + public void addUndervisningsforhold(Link link) { + addLink("undervisningsforhold", link); + } + + @JsonIgnore + public List getFaggruppe() { + return getLinks().getOrDefault("faggruppe", Collections.emptyList()); + } + + public void addFaggruppe(Link link) { + addLink("faggruppe", link); + } + + @JsonIgnore + public List getUndervisningsgruppe() { + return getLinks().getOrDefault("undervisningsgruppe", Collections.emptyList()); + } + + public void addUndervisningsgruppe(Link link) { + addLink("undervisningsgruppe", link); + } + + @JsonIgnore + public List getEksamensgruppe() { + return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); + } + + public void addEksamensgruppe(Link link) { + addLink("eksamensgruppe", link); + } + + @JsonIgnore + public List getUtdanningsprogram() { + return getLinks().getOrDefault("utdanningsprogram", Collections.emptyList()); + } + + public void addUtdanningsprogram(Link link) { + addLink("utdanningsprogram", link); + } } 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 81b1e869..10a88e26 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SkoleResources extends AbstractCollectionResources { - public SkoleResources(Collection input) { - super(input); - } + public SkoleResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 5ec517d1..e6106ebd 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 @@ -1,53 +1,70 @@ package no.novari.fint.model.resource.utdanning.utdanningsprogram; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; 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; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class UtdanningsprogramResource extends GruppeResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getSkole() { - return getLinks().getOrDefault("skole", Collections.emptyList()); - } - public void addSkole(Link link) { - addLink("skole", link); - } - @JsonIgnore - public List getProgramomrade() { - return getLinks().getOrDefault("programomrade", Collections.emptyList()); - } - public void addProgramomrade(Link link) { - addLink("programomrade", link); - } +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class UtdanningsprogramResource extends Gruppe implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getSkole() { + return getLinks().getOrDefault("skole", Collections.emptyList()); + } + + public void addSkole(Link link) { + addLink("skole", link); + } + + @JsonIgnore + public List getGrepreferanse() { + return getLinks().getOrDefault("grepreferanse", Collections.emptyList()); + } + + public void addGrepreferanse(Link link) { + addLink("grepreferanse", link); + } + + @JsonIgnore + public List getVigoreferanse() { + return getLinks().getOrDefault("vigoreferanse", Collections.emptyList()); + } + + public void addVigoreferanse(Link link) { + addLink("vigoreferanse", link); + } + + @JsonIgnore + public List getProgramomrade() { + return getLinks().getOrDefault("programomrade", Collections.emptyList()); + } + + public void addProgramomrade(Link link) { + addLink("programomrade", link); + } } 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 0cf13584..e13a3487 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class UtdanningsprogramResources extends AbstractCollectionResources { +public class UtdanningsprogramResources + extends AbstractCollectionResources { - public UtdanningsprogramResources(Collection input) { - super(input); - } + public UtdanningsprogramResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 0cf9e6a3..bde5cb1d 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 @@ -1,55 +1,49 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class AnmerkningerResource implements FintResource { - // Attributes - @NotNull - private Integer atferd; - @NotNull - private Integer orden; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotNull private Integer atferd; + @NotNull private Integer orden; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getSkolear() { + return getLinks().getOrDefault("skolear", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getSkolear() { - return getLinks().getOrDefault("skolear", Collections.emptyList()); - } - public void addSkolear(Link link) { - addLink("skolear", link); - } + public void addSkolear(Link link) { + addLink("skolear", link); + } } 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 de8ce3b6..a87d7d80 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class AnmerkningerResources extends AbstractCollectionResources { - public AnmerkningerResources(Collection input) { - super(input); - } + public AnmerkningerResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 7b358868..f666f6de 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 @@ -1,115 +1,120 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.Valid; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; 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 no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; 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; +import no.novari.fint.model.utdanning.basisklasser.Gruppe; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class EksamensgruppeResource extends GruppeResource implements FintResource { - // Attributes - private @Valid Date eksamensdato; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @Deprecated - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - @Deprecated - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getEksamen() { - return getLinks().getOrDefault("eksamen", Collections.emptyList()); - } - public void addEksamen(Link link) { - addLink("eksamen", link); - } - @JsonIgnore - public List getFag() { - return getLinks().getOrDefault("fag", Collections.emptyList()); - } - public void addFag(Link link) { - addLink("fag", link); - } - @JsonIgnore - public List getSkole() { - return getLinks().getOrDefault("skole", Collections.emptyList()); - } - public void addSkole(Link link) { - addLink("skole", link); - } - @JsonIgnore - public List getTermin() { - return getLinks().getOrDefault("termin", Collections.emptyList()); - } - public void addTermin(Link link) { - addLink("termin", link); - } - @JsonIgnore - public List getEksamensform() { - return getLinks().getOrDefault("eksamensform", Collections.emptyList()); - } - public void addEksamensform(Link link) { - addLink("eksamensform", link); - } - @JsonIgnore - public List getSkolear() { - return getLinks().getOrDefault("skolear", Collections.emptyList()); - } - public void addSkolear(Link link) { - addLink("skolear", link); - } - @JsonIgnore - public List getUndervisningsforhold() { - return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); - } - public void addUndervisningsforhold(Link link) { - addLink("undervisningsforhold", link); - } - @JsonIgnore - public List getGruppemedlemskap() { - return getLinks().getOrDefault("gruppemedlemskap", Collections.emptyList()); - } - public void addGruppemedlemskap(Link link) { - addLink("gruppemedlemskap", link); - } - @JsonIgnore - public List getSensor() { - return getLinks().getOrDefault("sensor", Collections.emptyList()); - } - public void addSensor(Link link) { - addLink("sensor", link); - } +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class EksamensgruppeResource extends Gruppe implements FintResource { + // Attributes + private @Valid Date eksamensdato; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getEksamen() { + return getLinks().getOrDefault("eksamen", Collections.emptyList()); + } + + public void addEksamen(Link link) { + addLink("eksamen", link); + } + + @JsonIgnore + public List getFag() { + return getLinks().getOrDefault("fag", Collections.emptyList()); + } + + public void addFag(Link link) { + addLink("fag", link); + } + + @JsonIgnore + public List getSkole() { + return getLinks().getOrDefault("skole", Collections.emptyList()); + } + + public void addSkole(Link link) { + addLink("skole", link); + } + + @JsonIgnore + public List getTermin() { + return getLinks().getOrDefault("termin", Collections.emptyList()); + } + + public void addTermin(Link link) { + addLink("termin", link); + } + + @JsonIgnore + public List getEksamensform() { + return getLinks().getOrDefault("eksamensform", Collections.emptyList()); + } + + public void addEksamensform(Link link) { + addLink("eksamensform", link); + } + + @JsonIgnore + public List getSkolear() { + return getLinks().getOrDefault("skolear", Collections.emptyList()); + } + + public void addSkolear(Link link) { + addLink("skolear", link); + } + + @JsonIgnore + public List getUndervisningsforhold() { + return getLinks().getOrDefault("undervisningsforhold", Collections.emptyList()); + } + + public void addUndervisningsforhold(Link link) { + addLink("undervisningsforhold", link); + } + + @JsonIgnore + public List getGruppemedlemskap() { + return getLinks().getOrDefault("gruppemedlemskap", Collections.emptyList()); + } + + public void addGruppemedlemskap(Link link) { + addLink("gruppemedlemskap", link); + } + + @JsonIgnore + public List getSensor() { + return getLinks().getOrDefault("sensor", Collections.emptyList()); + } + + public void addSensor(Link link) { + addLink("sensor", link); + } } 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 1fc37604..a06bb98f 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class EksamensgruppeResources extends AbstractCollectionResources { - public EksamensgruppeResources(Collection input) { - super(input); - } + public EksamensgruppeResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 7f7a23ea..0170d95f 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 @@ -1,91 +1,101 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; 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 @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class EksamensgruppemedlemskapResource extends Gruppemedlemskap implements FintResource { - // Attributes - private Boolean delegert; - private String kandidatnummer; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getDelegertTil() { - return getLinks().getOrDefault("delegertTil", Collections.emptyList()); - } - public void addDelegertTil(Link link) { - addLink("delegertTil", link); - } - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getForetrukketSkole() { - return getLinks().getOrDefault("foretrukketSkole", Collections.emptyList()); - } - public void addForetrukketSkole(Link link) { - addLink("foretrukketSkole", link); - } - @JsonIgnore - public List getEksamensgruppe() { - return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); - } - public void addEksamensgruppe(Link link) { - addLink("eksamensgruppe", link); - } - @JsonIgnore - public List getNus() { - return getLinks().getOrDefault("nus", Collections.emptyList()); - } - public void addNus(Link link) { - addLink("nus", link); - } - @JsonIgnore - public List getBetalingsstatus() { - return getLinks().getOrDefault("betalingsstatus", Collections.emptyList()); - } - public void addBetalingsstatus(Link link) { - addLink("betalingsstatus", link); - } - @JsonIgnore - public List getForetrukketSensor() { - return getLinks().getOrDefault("foretrukketSensor", Collections.emptyList()); - } - public void addForetrukketSensor(Link link) { - addLink("foretrukketSensor", link); - } + // Attributes + private Boolean delegert; + private String kandidatnummer; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getDelegertTil() { + return getLinks().getOrDefault("delegertTil", Collections.emptyList()); + } + + public void addDelegertTil(Link link) { + addLink("delegertTil", link); + } + + @JsonIgnore + public List getElevforhold() { + return getLinks().getOrDefault("elevforhold", Collections.emptyList()); + } + + public void addElevforhold(Link link) { + addLink("elevforhold", link); + } + + @JsonIgnore + public List getForetrukketSkole() { + return getLinks().getOrDefault("foretrukketSkole", Collections.emptyList()); + } + + public void addForetrukketSkole(Link link) { + addLink("foretrukketSkole", link); + } + + @JsonIgnore + public List getEksamensgruppe() { + return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); + } + + public void addEksamensgruppe(Link link) { + addLink("eksamensgruppe", link); + } + + @JsonIgnore + public List getNus() { + return getLinks().getOrDefault("nus", Collections.emptyList()); + } + + public void addNus(Link link) { + addLink("nus", link); + } + + @JsonIgnore + public List getBetalingsstatus() { + return getLinks().getOrDefault("betalingsstatus", Collections.emptyList()); + } + + public void addBetalingsstatus(Link link) { + addLink("betalingsstatus", link); + } + + @JsonIgnore + public List getForetrukketSensor() { + return getLinks().getOrDefault("foretrukketSensor", Collections.emptyList()); + } + + public void addForetrukketSensor(Link link) { + addLink("foretrukketSensor", link); + } } 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 a52aec71..99674d75 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class EksamensgruppemedlemskapResources extends AbstractCollectionResources { +public class EksamensgruppemedlemskapResources + extends AbstractCollectionResources { - public EksamensgruppemedlemskapResources(Collection input) { - super(input); - } + public EksamensgruppemedlemskapResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 0233863c..7f0f83ca 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 @@ -1,59 +1,60 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class EksamensvurderingResource extends FagvurderingResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getEksamensgruppe() { - return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); - } - public void addEksamensgruppe(Link link) { - addLink("eksamensgruppe", link); - } - @JsonIgnore - public List getKarakterhistorie() { - return getLinks().getOrDefault("karakterhistorie", Collections.emptyList()); - } - public void addKarakterhistorie(Link link) { - addLink("karakterhistorie", link); - } - @JsonIgnore - public List getElevvurdering() { - return getLinks().getOrDefault("elevvurdering", Collections.emptyList()); - } - public void addElevvurdering(Link link) { - addLink("elevvurdering", link); - } + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getEksamensgruppe() { + return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); + } + + public void addEksamensgruppe(Link link) { + addLink("eksamensgruppe", link); + } + + @JsonIgnore + public List getKarakterhistorie() { + return getLinks().getOrDefault("karakterhistorie", Collections.emptyList()); + } + + public void addKarakterhistorie(Link link) { + addLink("karakterhistorie", link); + } + + @JsonIgnore + public List getElevvurdering() { + return getLinks().getOrDefault("elevvurdering", Collections.emptyList()); + } + + public void addElevvurdering(Link link) { + addLink("elevvurdering", link); + } } 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 bd682778..1f8467ac 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class EksamensvurderingResources extends AbstractCollectionResources { +public class EksamensvurderingResources + extends AbstractCollectionResources { - public EksamensvurderingResources(Collection input) { - super(input); - } + public EksamensvurderingResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 8288d06e..e621f608 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 @@ -1,58 +1,56 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class ElevfravarResource implements FintResource { - // Attributes - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getFravarsregistrering() { - return getLinks().getOrDefault("fravarsregistrering", Collections.emptyList()); - } - public void addFravarsregistrering(Link link) { - addLink("fravarsregistrering", link); - } - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } + // Attributes + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getFravarsregistrering() { + return getLinks().getOrDefault("fravarsregistrering", Collections.emptyList()); + } + + public void addFravarsregistrering(Link link) { + addLink("fravarsregistrering", link); + } + + @JsonIgnore + public List getElevforhold() { + return getLinks().getOrDefault("elevforhold", Collections.emptyList()); + } + + public void addElevforhold(Link link) { + addLink("elevforhold", link); + } } 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 5d523fd4..95d26f66 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ElevfravarResources extends AbstractCollectionResources { - public ElevfravarResources(Collection input) { - super(input); - } + public ElevfravarResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 19d24898..7a9247a5 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 @@ -1,107 +1,119 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class ElevvurderingResource implements FintResource { - // Attributes - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getSluttfagvurdering() { - return getLinks().getOrDefault("sluttfagvurdering", Collections.emptyList()); - } - public void addSluttfagvurdering(Link link) { - addLink("sluttfagvurdering", link); - } - @JsonIgnore - public List getUnderveisordensvurdering() { - return getLinks().getOrDefault("underveisordensvurdering", Collections.emptyList()); - } - public void addUnderveisordensvurdering(Link link) { - addLink("underveisordensvurdering", link); - } - @JsonIgnore - public List getVitnemalsmerknad() { - return getLinks().getOrDefault("vitnemalsmerknad", Collections.emptyList()); - } - public void addVitnemalsmerknad(Link link) { - addLink("vitnemalsmerknad", link); - } - @JsonIgnore - public List getUnderveisfagvurdering() { - return getLinks().getOrDefault("underveisfagvurdering", Collections.emptyList()); - } - public void addUnderveisfagvurdering(Link link) { - addLink("underveisfagvurdering", link); - } - @JsonIgnore - public List getHalvarsordensvurdering() { - return getLinks().getOrDefault("halvarsordensvurdering", Collections.emptyList()); - } - public void addHalvarsordensvurdering(Link link) { - addLink("halvarsordensvurdering", link); - } - @JsonIgnore - public List getHalvarsfagvurdering() { - return getLinks().getOrDefault("halvarsfagvurdering", Collections.emptyList()); - } - public void addHalvarsfagvurdering(Link link) { - addLink("halvarsfagvurdering", link); - } - @JsonIgnore - public List getSluttordensvurdering() { - return getLinks().getOrDefault("sluttordensvurdering", Collections.emptyList()); - } - public void addSluttordensvurdering(Link link) { - addLink("sluttordensvurdering", link); - } - @JsonIgnore - public List getEksamensvurdering() { - return getLinks().getOrDefault("eksamensvurdering", Collections.emptyList()); - } - public void addEksamensvurdering(Link link) { - addLink("eksamensvurdering", link); - } + // Attributes + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getElevforhold() { + return getLinks().getOrDefault("elevforhold", Collections.emptyList()); + } + + public void addElevforhold(Link link) { + addLink("elevforhold", link); + } + + @JsonIgnore + public List getSluttfagvurdering() { + return getLinks().getOrDefault("sluttfagvurdering", Collections.emptyList()); + } + + public void addSluttfagvurdering(Link link) { + addLink("sluttfagvurdering", link); + } + + @JsonIgnore + public List getUnderveisordensvurdering() { + return getLinks().getOrDefault("underveisordensvurdering", Collections.emptyList()); + } + + public void addUnderveisordensvurdering(Link link) { + addLink("underveisordensvurdering", link); + } + + @JsonIgnore + public List getVitnemalsmerknad() { + return getLinks().getOrDefault("vitnemalsmerknad", Collections.emptyList()); + } + + public void addVitnemalsmerknad(Link link) { + addLink("vitnemalsmerknad", link); + } + + @JsonIgnore + public List getUnderveisfagvurdering() { + return getLinks().getOrDefault("underveisfagvurdering", Collections.emptyList()); + } + + public void addUnderveisfagvurdering(Link link) { + addLink("underveisfagvurdering", link); + } + + @JsonIgnore + public List getHalvarsordensvurdering() { + return getLinks().getOrDefault("halvarsordensvurdering", Collections.emptyList()); + } + + public void addHalvarsordensvurdering(Link link) { + addLink("halvarsordensvurdering", link); + } + + @JsonIgnore + public List getHalvarsfagvurdering() { + return getLinks().getOrDefault("halvarsfagvurdering", Collections.emptyList()); + } + + public void addHalvarsfagvurdering(Link link) { + addLink("halvarsfagvurdering", link); + } + + @JsonIgnore + public List getSluttordensvurdering() { + return getLinks().getOrDefault("sluttordensvurdering", Collections.emptyList()); + } + + public void addSluttordensvurdering(Link link) { + addLink("sluttordensvurdering", link); + } + + @JsonIgnore + public List getEksamensvurdering() { + return getLinks().getOrDefault("eksamensvurdering", Collections.emptyList()); + } + + public void addEksamensvurdering(Link link) { + addLink("eksamensvurdering", link); + } } 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 9e152697..ed227786 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class ElevvurderingResources extends AbstractCollectionResources { - public ElevvurderingResources(Collection input) { - super(input); - } + public ElevvurderingResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 5414ab5d..98bc3d93 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 @@ -1,80 +1,69 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; 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 @NoArgsConstructor @EqualsAndHashCode @ToString public abstract class FagvurderingResource implements FintAbstractObject, FintLinks { - // Attributes - @NotBlank - private String kommentar; - @NotNull - private @Valid Identifikator systemId; - @NotNull - private Date vurderingsdato; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotBlank private String kommentar; + @NotNull private @Valid Identifikator systemId; + @NotNull private Date vurderingsdato; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getFag() { + return getLinks().getOrDefault("fag", Collections.emptyList()); + } + + public void addFag(Link link) { + addLink("fag", link); + } + + @JsonIgnore + public List getSkolear() { + return getLinks().getOrDefault("skolear", Collections.emptyList()); + } + + public void addSkolear(Link link) { + addLink("skolear", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getKarakter() { + return getLinks().getOrDefault("karakter", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getFag() { - return getLinks().getOrDefault("fag", Collections.emptyList()); - } - public void addFag(Link link) { - addLink("fag", link); - } - @Deprecated - @JsonIgnore - public List getUndervisningsgruppe() { - return getLinks().getOrDefault("undervisningsgruppe", Collections.emptyList()); - } - @Deprecated - public void addUndervisningsgruppe(Link link) { - addLink("undervisningsgruppe", link); - } - @JsonIgnore - public List getSkolear() { - return getLinks().getOrDefault("skolear", Collections.emptyList()); - } - public void addSkolear(Link link) { - addLink("skolear", link); - } - @JsonIgnore - public List getKarakter() { - return getLinks().getOrDefault("karakter", Collections.emptyList()); - } - public void addKarakter(Link link) { - addLink("karakter", link); - } + public void addKarakter(Link link) { + addLink("karakter", link); + } } 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 3ba8b894..fde79ee0 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FagvurderingResources extends AbstractCollectionResources { - public FagvurderingResources(Collection input) { - super(input); - } + public FagvurderingResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 deleted file mode 100644 index 6186cd05..00000000 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarResource.java +++ /dev/null @@ -1,94 +0,0 @@ -package no.novari.fint.model.resource.utdanning.vurdering; - -import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -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.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 -@NoArgsConstructor -@EqualsAndHashCode -@ToString -@Deprecated -public class FravarResource implements FintResource { - // Attributes - @Deprecated - @NotNull - private Boolean dokumentert; - @NotNull - private Boolean foresPaVitnemal; - @NotNull - private @Valid Periode gjelderPeriode; - @NotBlank - private String kommentar; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @Deprecated - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - @Deprecated - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getRegistrertav() { - return getLinks().getOrDefault("registrertav", Collections.emptyList()); - } - public void addRegistrertav(Link link) { - addLink("registrertav", link); - } - @JsonIgnore - public List getUndervisningsgruppe() { - return getLinks().getOrDefault("undervisningsgruppe", Collections.emptyList()); - } - public void addUndervisningsgruppe(Link link) { - addLink("undervisningsgruppe", link); - } - @Deprecated - @JsonIgnore - public List getEksamensgruppe() { - return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); - } - @Deprecated - public void addEksamensgruppe(Link link) { - addLink("eksamensgruppe", link); - } - @JsonIgnore - public List getFravarstype() { - return getLinks().getOrDefault("fravarstype", Collections.emptyList()); - } - public void addFravarstype(Link link) { - addLink("fravarstype", link); - } -} 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 deleted file mode 100644 index 457acd29..00000000 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/FravarResources.java +++ /dev/null @@ -1,26 +0,0 @@ -package no.novari.fint.model.resource.utdanning.vurdering; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.util.Collection; -import java.util.List; - -import lombok.NoArgsConstructor; -import no.novari.fint.model.resource.AbstractCollectionResources; - -@NoArgsConstructor -@Deprecated -public class FravarResources extends AbstractCollectionResources { - - public FravarResources(Collection input) { - super(input); - } - - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } -} 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 c6b3e198..a55e1063 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 @@ -1,25 +1,21 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @@ -27,37 +23,37 @@ @EqualsAndHashCode @ToString public class FravarsoversiktResource implements FintResource { - // Attributes - @NotNull - private @Valid Fravarsprosent halvar; - @NotNull - private @Valid Fravarsprosent skolear; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getFag() { - return getLinks().getOrDefault("fag", Collections.emptyList()); - } - public void addFag(Link link) { - addLink("fag", link); - } + // Attributes + @NotNull private @Valid Fravarsprosent halvar; + @NotNull private @Valid Fravarsprosent skolear; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getElevforhold() { + return getLinks().getOrDefault("elevforhold", Collections.emptyList()); + } + + public void addElevforhold(Link link) { + addLink("elevforhold", link); + } + + @JsonIgnore + public List getFag() { + return getLinks().getOrDefault("fag", Collections.emptyList()); + } + + public void addFag(Link link) { + addLink("fag", link); + } } 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 aed95958..d76170ab 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class FravarsoversiktResources extends AbstractCollectionResources { - public FravarsoversiktResources(Collection input) { - super(input); - } + public FravarsoversiktResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 5f4ed8a2..9b1aa666 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 @@ -1,85 +1,87 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.felles.kompleksedatatyper.Periode; 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 @NoArgsConstructor @EqualsAndHashCode @ToString public class FravarsregistreringResource implements FintResource { - // Attributes - @NotNull - private Boolean foresPaVitnemal; - private String kommentar; - @NotNull - private @Valid Periode periode; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotNull private Boolean foresPaVitnemal; + private String kommentar; + @NotNull private @Valid Periode periode; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getRegistrertAv() { + return getLinks().getOrDefault("registrertAv", Collections.emptyList()); + } + + public void addRegistrertAv(Link link) { + addLink("registrertAv", link); + } + + @JsonIgnore + public List getFaggruppe() { + return getLinks().getOrDefault("faggruppe", Collections.emptyList()); + } + + public void addFaggruppe(Link link) { + addLink("faggruppe", link); + } + + @JsonIgnore + public List getUndervisningsgruppe() { + return getLinks().getOrDefault("undervisningsgruppe", Collections.emptyList()); + } + + public void addUndervisningsgruppe(Link link) { + addLink("undervisningsgruppe", link); + } + + @JsonIgnore + public List getFravarstype() { + return getLinks().getOrDefault("fravarstype", Collections.emptyList()); + } + + public void addFravarstype(Link link) { + addLink("fravarstype", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getElevfravar() { + return getLinks().getOrDefault("elevfravar", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getRegistrertAv() { - return getLinks().getOrDefault("registrertAv", Collections.emptyList()); - } - public void addRegistrertAv(Link link) { - addLink("registrertAv", link); - } - @JsonIgnore - public List getFaggruppe() { - return getLinks().getOrDefault("faggruppe", Collections.emptyList()); - } - public void addFaggruppe(Link link) { - addLink("faggruppe", link); - } - @JsonIgnore - public List getUndervisningsgruppe() { - return getLinks().getOrDefault("undervisningsgruppe", Collections.emptyList()); - } - public void addUndervisningsgruppe(Link link) { - addLink("undervisningsgruppe", link); - } - @JsonIgnore - public List getFravarstype() { - return getLinks().getOrDefault("fravarstype", Collections.emptyList()); - } - public void addFravarstype(Link link) { - addLink("fravarstype", link); - } - @JsonIgnore - public List getElevfravar() { - return getLinks().getOrDefault("elevfravar", Collections.emptyList()); - } - public void addElevfravar(Link link) { - addLink("elevfravar", link); - } + public void addElevfravar(Link link) { + addLink("elevfravar", link); + } } 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 19a75399..01dde389 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class FravarsregistreringResources extends AbstractCollectionResources { +public class FravarsregistreringResources + extends AbstractCollectionResources { - public FravarsregistreringResources(Collection input) { - super(input); - } + public FravarsregistreringResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 d1a79c00..7553d75d 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 @@ -1,54 +1,42 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class HalvarsfagvurderingResource extends FagvurderingResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getElevvurdering() { + return getLinks().getOrDefault("elevvurdering", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @Deprecated - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - @Deprecated - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getElevvurdering() { - return getLinks().getOrDefault("elevvurdering", Collections.emptyList()); - } - public void addElevvurdering(Link link) { - addLink("elevvurdering", link); - } + public void addElevvurdering(Link link) { + addLink("elevvurdering", link); + } } 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 1de230ee..26f0c091 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class HalvarsfagvurderingResources extends AbstractCollectionResources { +public class HalvarsfagvurderingResources + extends AbstractCollectionResources { - public HalvarsfagvurderingResources(Collection input) { - super(input); - } + public HalvarsfagvurderingResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 8064ea00..4c249ad1 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 @@ -1,54 +1,43 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class HalvarsordensvurderingResource extends OrdensvurderingResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class HalvarsordensvurderingResource extends OrdensvurderingResource + implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getElevvurdering() { + return getLinks().getOrDefault("elevvurdering", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @Deprecated - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - @Deprecated - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getElevvurdering() { - return getLinks().getOrDefault("elevvurdering", Collections.emptyList()); - } - public void addElevvurdering(Link link) { - addLink("elevvurdering", link); - } + public void addElevvurdering(Link link) { + addLink("elevvurdering", link); + } } 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 044f6309..315fcf80 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class HalvarsordensvurderingResources extends AbstractCollectionResources { +public class HalvarsordensvurderingResources + extends AbstractCollectionResources { - public HalvarsordensvurderingResources(Collection input) { - super(input); - } + public HalvarsordensvurderingResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 918cf4fd..e76aa325 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 @@ -1,82 +1,85 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @NoArgsConstructor @EqualsAndHashCode @ToString public class KarakterhistorieResource implements FintResource { - // Attributes - @NotNull - private @Valid Date endretDato; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotNull private @Valid Date endretDato; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getOppdatertAv() { + return getLinks().getOrDefault("oppdatertAv", Collections.emptyList()); + } + + public void addOppdatertAv(Link link) { + addLink("oppdatertAv", link); + } + + @JsonIgnore + public List getOpprinneligKarakterverdi() { + return getLinks().getOrDefault("opprinneligKarakterverdi", Collections.emptyList()); + } + + public void addOpprinneligKarakterverdi(Link link) { + addLink("opprinneligKarakterverdi", link); + } + + @JsonIgnore + public List getOpprinneligKarakterstatus() { + return getLinks().getOrDefault("opprinneligKarakterstatus", Collections.emptyList()); + } + + public void addOpprinneligKarakterstatus(Link link) { + addLink("opprinneligKarakterstatus", link); + } + + @JsonIgnore + public List getKarakterverdi() { + return getLinks().getOrDefault("karakterverdi", Collections.emptyList()); + } + + public void addKarakterverdi(Link link) { + addLink("karakterverdi", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getKarakterstatus() { + return getLinks().getOrDefault("karakterstatus", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getOppdatertAv() { - return getLinks().getOrDefault("oppdatertAv", Collections.emptyList()); - } - public void addOppdatertAv(Link link) { - addLink("oppdatertAv", link); - } - @JsonIgnore - public List getOpprinneligKarakterverdi() { - return getLinks().getOrDefault("opprinneligKarakterverdi", Collections.emptyList()); - } - public void addOpprinneligKarakterverdi(Link link) { - addLink("opprinneligKarakterverdi", link); - } - @JsonIgnore - public List getOpprinneligKarakterstatus() { - return getLinks().getOrDefault("opprinneligKarakterstatus", Collections.emptyList()); - } - public void addOpprinneligKarakterstatus(Link link) { - addLink("opprinneligKarakterstatus", link); - } - @JsonIgnore - public List getKarakterverdi() { - return getLinks().getOrDefault("karakterverdi", Collections.emptyList()); - } - public void addKarakterverdi(Link link) { - addLink("karakterverdi", link); - } - @JsonIgnore - public List getKarakterstatus() { - return getLinks().getOrDefault("karakterstatus", Collections.emptyList()); - } - public void addKarakterstatus(Link link) { - addLink("karakterstatus", link); - } + public void addKarakterstatus(Link link) { + addLink("karakterstatus", link); + } } 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 290b36f5..61f38355 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class KarakterhistorieResources extends AbstractCollectionResources { +public class KarakterhistorieResources + extends AbstractCollectionResources { - public KarakterhistorieResources(Collection input) { - super(input); - } + public KarakterhistorieResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 5f8d49f0..07d1ff9b 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 @@ -1,46 +1,43 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -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; +import no.novari.fint.model.resource.FintResource; +import no.novari.fint.model.resource.Link; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class KarakterverdiResource extends Begrep implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getSkala() { + return getLinks().getOrDefault("skala", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getSkala() { - return getLinks().getOrDefault("skala", Collections.emptyList()); - } - public void addSkala(Link link) { - addLink("skala", link); - } + public void addSkala(Link link) { + addLink("skala", link); + } } 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 a60496ab..9d0f9ca3 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class KarakterverdiResources extends AbstractCollectionResources { - public KarakterverdiResources(Collection input) { - super(input); - } + public KarakterverdiResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 7d4184bf..3b97a566 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 @@ -1,71 +1,69 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintAbstractObject; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; 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 @NoArgsConstructor @EqualsAndHashCode @ToString public abstract class OrdensvurderingResource implements FintAbstractObject, FintLinks { - // Attributes - @NotBlank - private String kommentar; - @NotNull - private @Valid Identifikator systemId; - @NotNull - private Date vurderingsdato; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); + // Attributes + @NotBlank private String kommentar; + @NotNull private @Valid Identifikator systemId; + @NotNull private Date vurderingsdato; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getAtferd() { + return getLinks().getOrDefault("atferd", Collections.emptyList()); + } + + public void addAtferd(Link link) { + addLink("atferd", link); + } + + @JsonIgnore + public List getOrden() { + return getLinks().getOrDefault("orden", Collections.emptyList()); + } + + public void addOrden(Link link) { + addLink("orden", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getSkolear() { + return getLinks().getOrDefault("skolear", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getAtferd() { - return getLinks().getOrDefault("atferd", Collections.emptyList()); - } - public void addAtferd(Link link) { - addLink("atferd", link); - } - @JsonIgnore - public List getOrden() { - return getLinks().getOrDefault("orden", Collections.emptyList()); - } - public void addOrden(Link link) { - addLink("orden", link); - } - @JsonIgnore - public List getSkolear() { - return getLinks().getOrDefault("skolear", Collections.emptyList()); - } - public void addSkolear(Link link) { - addLink("skolear", link); - } + public void addSkolear(Link link) { + addLink("skolear", link); + } } 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 0444ef0f..ea92d3f8 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class OrdensvurderingResources extends AbstractCollectionResources { - public OrdensvurderingResources(Collection input) { - super(input); - } + public OrdensvurderingResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 0fb1cb4e..2de0e222 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 @@ -1,61 +1,58 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.validation.Valid; import javax.validation.constraints.*; - +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 @EqualsAndHashCode @ToString public class SensorResource implements FintResource { - // Attributes - @NotNull - private Boolean aktiv; - private Integer sensornummer; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @JsonIgnore - public List getSkoleressurs() { - return getLinks().getOrDefault("skoleressurs", Collections.emptyList()); - } - public void addSkoleressurs(Link link) { - addLink("skoleressurs", link); - } - @JsonIgnore - public List getEksamensgruppe() { - return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); - } - public void addEksamensgruppe(Link link) { - addLink("eksamensgruppe", link); - } + // Attributes + @NotNull private Boolean aktiv; + private Integer sensornummer; + @NotNull private @Valid Identifikator systemId; + + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.put("systemId", this.systemId); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @JsonIgnore + public List getSkoleressurs() { + return getLinks().getOrDefault("skoleressurs", Collections.emptyList()); + } + + public void addSkoleressurs(Link link) { + addLink("skoleressurs", link); + } + + @JsonIgnore + public List getEksamensgruppe() { + return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); + } + + public void addEksamensgruppe(Link link) { + addLink("eksamensgruppe", link); + } } 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 6d26b95d..d9553b97 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 @@ -2,24 +2,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor public class SensorResources extends AbstractCollectionResources { - public SensorResources(Collection input) { - super(input); - } + public SensorResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 8b472d32..1ce45fa8 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 @@ -1,70 +1,62 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class SluttfagvurderingResource extends FagvurderingResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); + + @Deprecated + @JsonIgnore + public List getEksamensgruppe() { + return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); + } + + @Deprecated + public void addEksamensgruppe(Link link) { + addLink("eksamensgruppe", link); + } + + @JsonIgnore + public List getKarakterhistorie() { + return getLinks().getOrDefault("karakterhistorie", Collections.emptyList()); + } + + public void addKarakterhistorie(Link link) { + addLink("karakterhistorie", link); + } - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getElevvurdering() { + return getLinks().getOrDefault("elevvurdering", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @Deprecated - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - @Deprecated - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @Deprecated - @JsonIgnore - public List getEksamensgruppe() { - return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); - } - @Deprecated - public void addEksamensgruppe(Link link) { - addLink("eksamensgruppe", link); - } - @JsonIgnore - public List getKarakterhistorie() { - return getLinks().getOrDefault("karakterhistorie", Collections.emptyList()); - } - public void addKarakterhistorie(Link link) { - addLink("karakterhistorie", link); - } - @JsonIgnore - public List getElevvurdering() { - return getLinks().getOrDefault("elevvurdering", Collections.emptyList()); - } - public void addElevvurdering(Link link) { - addLink("elevvurdering", link); - } + public void addElevvurdering(Link link) { + addLink("elevvurdering", link); + } } 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 61db5cd6..363c8a23 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class SluttfagvurderingResources extends AbstractCollectionResources { +public class SluttfagvurderingResources + extends AbstractCollectionResources { - public SluttfagvurderingResources(Collection input) { - super(input); - } + public SluttfagvurderingResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 54db4a8f..9794f8c7 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 @@ -1,54 +1,42 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class SluttordensvurderingResource extends OrdensvurderingResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getElevvurdering() { + return getLinks().getOrDefault("elevvurdering", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @Deprecated - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - @Deprecated - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getElevvurdering() { - return getLinks().getOrDefault("elevvurdering", Collections.emptyList()); - } - public void addElevvurdering(Link link) { - addLink("elevvurdering", link); - } + public void addElevvurdering(Link link) { + addLink("elevvurdering", link); + } } 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 19cba38a..bb4a8e2e 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class SluttordensvurderingResources extends AbstractCollectionResources { +public class SluttordensvurderingResources + extends AbstractCollectionResources { - public SluttordensvurderingResources(Collection input) { - super(input); - } + public SluttordensvurderingResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 7e5d3497..73431dbf 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 @@ -1,54 +1,42 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class UnderveisfagvurderingResource extends FagvurderingResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getElevvurdering() { + return getLinks().getOrDefault("elevvurdering", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @Deprecated - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - @Deprecated - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getElevvurdering() { - return getLinks().getOrDefault("elevvurdering", Collections.emptyList()); - } - public void addElevvurdering(Link link) { - addLink("elevvurdering", link); - } + public void addElevvurdering(Link link) { + addLink("elevvurdering", link); + } } 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 bd8f0163..a7db71c9 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class UnderveisfagvurderingResources extends AbstractCollectionResources { +public class UnderveisfagvurderingResources + extends AbstractCollectionResources { - public UnderveisfagvurderingResources(Collection input) { - super(input); - } + public UnderveisfagvurderingResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 30044266..26d5ecdf 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 @@ -1,54 +1,43 @@ package no.novari.fint.model.resource.utdanning.vurdering; import com.fasterxml.jackson.annotation.JsonIgnore; - +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import no.novari.fint.model.resource.FintLinks; +import no.novari.fint.model.FintIdentifikator; import no.novari.fint.model.resource.FintResource; import no.novari.fint.model.resource.Link; -import no.novari.fint.model.FintIdentifikator; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper=true) -@ToString(callSuper=true) -public class UnderveisordensvurderingResource extends OrdensvurderingResource implements FintResource { - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.putAll(super.getIdentifikators()); +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class UnderveisordensvurderingResource extends OrdensvurderingResource + implements FintResource { + @JsonIgnore + public Map getIdentifikators() { + Map identifikators = new HashMap<>(); + identifikators.putAll(super.getIdentifikators()); + + return Collections.unmodifiableMap(identifikators); + } + + // Relations + @Getter private final Map> links = createLinks(); - return Collections.unmodifiableMap(identifikators); - } + @JsonIgnore + public List getElevvurdering() { + return getLinks().getOrDefault("elevvurdering", Collections.emptyList()); + } - // Relations - @Getter - private final Map> links = createLinks(); - - @Deprecated - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - @Deprecated - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getElevvurdering() { - return getLinks().getOrDefault("elevvurdering", Collections.emptyList()); - } - public void addElevvurdering(Link link) { - addLink("elevvurdering", link); - } + public void addElevvurdering(Link link) { + addLink("elevvurdering", link); + } } 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 f9799725..77f84a1c 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 @@ -2,24 +2,23 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; - import java.util.Collection; import java.util.List; - import lombok.NoArgsConstructor; import no.novari.fint.model.resource.AbstractCollectionResources; @NoArgsConstructor -public class UnderveisordensvurderingResources extends AbstractCollectionResources { +public class UnderveisordensvurderingResources + extends AbstractCollectionResources { - public UnderveisordensvurderingResources(Collection input) { - super(input); - } + public UnderveisordensvurderingResources(Collection input) { + super(input); + } - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } + @JsonIgnore + @Deprecated + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } } 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 deleted file mode 100644 index 1cef2aa8..00000000 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/VurderingResource.java +++ /dev/null @@ -1,86 +0,0 @@ -package no.novari.fint.model.resource.utdanning.vurdering; - -import com.fasterxml.jackson.annotation.JsonIgnore; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -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.novari.fint.model.felles.kompleksedatatyper.Identifikator; -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 -@EqualsAndHashCode -@ToString -@Deprecated -public class VurderingResource implements FintResource { - // Attributes - @NotNull - private Boolean endelig; - @NotBlank - private String kommentar; - @NotNull - private @Valid Identifikator systemId; - @JsonIgnore - public Map getIdentifikators() { - Map identifikators = new HashMap<>(); - identifikators.put("systemId", this.systemId); - - return Collections.unmodifiableMap(identifikators); - } - - // Relations - @Getter - private final Map> links = createLinks(); - - @Deprecated - @JsonIgnore - public List getElevforhold() { - return getLinks().getOrDefault("elevforhold", Collections.emptyList()); - } - @Deprecated - public void addElevforhold(Link link) { - addLink("elevforhold", link); - } - @JsonIgnore - public List getFag() { - return getLinks().getOrDefault("fag", Collections.emptyList()); - } - public void addFag(Link link) { - addLink("fag", link); - } - @JsonIgnore - public List getUndervisningsgruppe() { - return getLinks().getOrDefault("undervisningsgruppe", Collections.emptyList()); - } - public void addUndervisningsgruppe(Link link) { - addLink("undervisningsgruppe", link); - } - @JsonIgnore - public List getEksamensgruppe() { - return getLinks().getOrDefault("eksamensgruppe", Collections.emptyList()); - } - public void addEksamensgruppe(Link link) { - addLink("eksamensgruppe", link); - } - @JsonIgnore - public List getKarakter() { - return getLinks().getOrDefault("karakter", Collections.emptyList()); - } - public void addKarakter(Link link) { - addLink("karakter", link); - } -} 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 deleted file mode 100644 index 6db7245d..00000000 --- a/fint-utdanning-resource-model-java/src/main/java/no/novari/fint/model/resource/utdanning/vurdering/VurderingResources.java +++ /dev/null @@ -1,26 +0,0 @@ -package no.novari.fint.model.resource.utdanning.vurdering; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.util.Collection; -import java.util.List; - -import lombok.NoArgsConstructor; -import no.novari.fint.model.resource.AbstractCollectionResources; - -@NoArgsConstructor -@Deprecated -public class VurderingResources extends AbstractCollectionResources { - - public VurderingResources(Collection input) { - super(input); - } - - @JsonIgnore - @Deprecated - @Override - public TypeReference> getTypeReference() { - return new TypeReference>() {}; - } -} diff --git a/gradle.properties b/gradle.properties index af735416..f9271a37 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=3.21.10 +version=4.0.0-rc-8 springBootVersion=3.5.9 lombokVersion=1.18.42 spockSpringVersion=2.4-groovy-5.0