Flytter annotasjon og test til en annen package.

Dette var først tenkt som en validering, men ble noe helt annet.

src/main/java/no/digipost/api/datatypes/validation/ComplementedBy.java → src/main/java/no/digipost/api/datatypes/ComplementedBy.java

@@ -1,4 +1,4 @@
-package no.digipost.api.datatypes.validation;
+package no.digipost.api.datatypes;
 
 import no.digipost.api.datatypes.DataType;
 

src/main/java/no/digipost/api/datatypes/DataTypeIdentifier.java

@@ -10,7 +10,6 @@
 import no.digipost.api.datatypes.types.pickup.PickupNotice;
 import no.digipost.api.datatypes.types.pickup.PickupNoticeStatus;
 import no.digipost.api.datatypes.types.receipt.Receipt;
-import no.digipost.api.datatypes.validation.ComplementedBy;
 
 import java.util.Collections;
 import java.util.Map;

src/main/java/no/digipost/api/datatypes/documentation/DocumentationStructureBuilder.java

@@ -1,12 +1,11 @@
 package no.digipost.api.datatypes.documentation;
 
-import no.digipost.api.datatypes.validation.ComplementedBy;
+import no.digipost.api.datatypes.ComplementedBy;
 
 import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlElement;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -19,7 +18,6 @@
 import static java.util.stream.Collectors.collectingAndThen;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
-import static java.util.stream.Collectors.toSet;
 
 public class DocumentationStructureBuilder {
 

src/main/java/no/digipost/api/datatypes/documentation/MarkdownPrinter.java

@@ -2,9 +2,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import no.digipost.api.datatypes.DataTypeIdentifier;
 import no.digipost.api.datatypes.marshalling.DataTypesJsonMapper;
-import no.digipost.api.datatypes.validation.ComplementedBy;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -13,7 +11,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static java.lang.System.lineSeparator;

src/main/java/no/digipost/api/datatypes/types/pickup/PickupNotice.java

@@ -8,7 +8,7 @@
 import no.digipost.api.datatypes.DataType;
 import no.digipost.api.datatypes.documentation.Description;
 import no.digipost.api.datatypes.types.receipt.Barcode;
-import no.digipost.api.datatypes.validation.ComplementedBy;
+import no.digipost.api.datatypes.ComplementedBy;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;

src/test/java/no/digipost/api/datatypes/validation/ComplementValidationTest.java → src/test/java/no/digipost/api/datatypes/ComplementByTest.java

@@ -1,4 +1,4 @@
-package no.digipost.api.datatypes.validation;
+package no.digipost.api.datatypes;
 
 import no.digipost.api.datatypes.types.Appointment;
 import no.digipost.api.datatypes.types.pickup.PickupNotice;
@@ -9,7 +9,7 @@
 import static co.unruly.matchers.Java8Matchers.whereNot;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-public class ComplementValidationTest {
+public class ComplementByTest {
 
     @Test
     public void kan_komplementere() {

src/test/java/no/digipost/api/datatypes/types/ShortTextMessage.java

@@ -6,7 +6,7 @@
 import lombok.Value;
 import no.digipost.api.datatypes.DataType;
 import no.digipost.api.datatypes.documentation.Description;
-import no.digipost.api.datatypes.validation.ComplementedBy;
+import no.digipost.api.datatypes.ComplementedBy;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.NotNull;