Merge pull request #195 from oslomet-arx-as-a-service/refactor/hierar…

…chyPackage Move hierarchy package to top-level with the other service domains
oslomet-arx-as-a-service · May 28, 2019 · e9cb409 · e9cb409
2 parents 417bf44 + 291c2d3
commit e9cb409
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 44 deletions.
diff --git a/src/main/java/no/oslomet/aaas/controller/HierarchyController.java b/src/main/java/no/oslomet/aaas/controller/HierarchyController.java
@@ -1,15 +1,14 @@
 package no.oslomet.aaas.controller;
 
 
-import no.oslomet.aaas.model.hierarchy.Hierarchy;
-import no.oslomet.aaas.model.hierarchy.HierarchyRequest;
+import no.oslomet.aaas.hierarchy.Hierarchy;
+import no.oslomet.aaas.hierarchy.HierarchyRequest;
 
 import no.oslomet.aaas.service.HierarchyService;
 import no.oslomet.aaas.service.LoggerService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;

diff --git a/...lomet/aaas/model/hierarchy/Hierarchy.java → .../no/oslomet/aaas/hierarchy/Hierarchy.java b/...lomet/aaas/model/hierarchy/Hierarchy.java → .../no/oslomet/aaas/hierarchy/Hierarchy.java
@@ -1,4 +1,4 @@
-package no.oslomet.aaas.model.hierarchy;
+package no.oslomet.aaas.hierarchy;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 

diff --git a/...aas/model/hierarchy/HierarchyBuilder.java → ...omet/aaas/hierarchy/HierarchyBuilder.java b/...aas/model/hierarchy/HierarchyBuilder.java → ...omet/aaas/hierarchy/HierarchyBuilder.java
@@ -1,13 +1,12 @@
-package no.oslomet.aaas.model.hierarchy;
+package no.oslomet.aaas.hierarchy;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import no.oslomet.aaas.model.hierarchy.interval.IntervalBasedHierarchyBuilder;
+import no.oslomet.aaas.hierarchy.interval.IntervalBasedHierarchyBuilder;
 
 
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
-        include = JsonTypeInfo.As.PROPERTY,
         property = "type")
 @JsonSubTypes({
         @JsonSubTypes.Type(value = RedactionBasedHierarchyBuilder.class, name = "redactionBased"),

diff --git a/...aas/model/hierarchy/HierarchyRequest.java → ...omet/aaas/hierarchy/HierarchyRequest.java b/...aas/model/hierarchy/HierarchyRequest.java → ...omet/aaas/hierarchy/HierarchyRequest.java
@@ -1,12 +1,8 @@
-package no.oslomet.aaas.model.hierarchy;
+package no.oslomet.aaas.hierarchy;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 import javax.validation.Valid;
-import java.util.Map;
 
 /**
  * Understands a request to build a generalization hierarchy

diff --git a/...o/oslomet/aaas/model/hierarchy/Level.java → ...java/no/oslomet/aaas/hierarchy/Level.java b/...o/oslomet/aaas/model/hierarchy/Level.java → ...java/no/oslomet/aaas/hierarchy/Level.java
@@ -1,7 +1,6 @@
-package no.oslomet.aaas.model.hierarchy;
+package no.oslomet.aaas.hierarchy;
 
 import org.deidentifier.arx.aggregates.HierarchyBuilderGroupingBased;
-import org.deidentifier.arx.aggregates.HierarchyBuilderIntervalBased;
 
 import javax.validation.constraints.NotNull;
 import java.util.List;

diff --git a/...hierarchy/OrderBasedHierarchyBuilder.java → ...hierarchy/OrderBasedHierarchyBuilder.java b/...hierarchy/OrderBasedHierarchyBuilder.java → ...hierarchy/OrderBasedHierarchyBuilder.java
@@ -1,4 +1,4 @@
-package no.oslomet.aaas.model.hierarchy;
+package no.oslomet.aaas.hierarchy;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import org.deidentifier.arx.DataType;

diff --git a/...archy/RedactionBasedHierarchyBuilder.java → ...archy/RedactionBasedHierarchyBuilder.java b/...archy/RedactionBasedHierarchyBuilder.java → ...archy/RedactionBasedHierarchyBuilder.java
@@ -1,4 +1,4 @@
-package no.oslomet.aaas.model.hierarchy;
+package no.oslomet.aaas.hierarchy;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import org.deidentifier.arx.aggregates.HierarchyBuilderRedactionBased;

diff --git a/...as/model/hierarchy/interval/Interval.java → ...met/aaas/hierarchy/interval/Interval.java b/...as/model/hierarchy/interval/Interval.java → ...met/aaas/hierarchy/interval/Interval.java
@@ -1,4 +1,4 @@
-package no.oslomet.aaas.model.hierarchy.interval;
+package no.oslomet.aaas.hierarchy.interval;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import org.deidentifier.arx.aggregates.HierarchyBuilderIntervalBased;

diff --git a/...terval/IntervalBasedHierarchyBuilder.java → ...terval/IntervalBasedHierarchyBuilder.java b/...terval/IntervalBasedHierarchyBuilder.java → ...terval/IntervalBasedHierarchyBuilder.java
@@ -1,9 +1,9 @@
-package no.oslomet.aaas.model.hierarchy.interval;
+package no.oslomet.aaas.hierarchy.interval;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import no.oslomet.aaas.model.hierarchy.Hierarchy;
-import no.oslomet.aaas.model.hierarchy.HierarchyBuilder;
-import no.oslomet.aaas.model.hierarchy.Level;
+import no.oslomet.aaas.hierarchy.Hierarchy;
+import no.oslomet.aaas.hierarchy.HierarchyBuilder;
+import no.oslomet.aaas.hierarchy.Level;
 import org.deidentifier.arx.DataType;
 import org.deidentifier.arx.aggregates.HierarchyBuilderIntervalBased;
 

diff --git a/.../aaas/model/hierarchy/interval/Range.java → ...slomet/aaas/hierarchy/interval/Range.java b/.../aaas/model/hierarchy/interval/Range.java → ...slomet/aaas/hierarchy/interval/Range.java
@@ -1,4 +1,4 @@
-package no.oslomet.aaas.model.hierarchy.interval;
+package no.oslomet.aaas.hierarchy.interval;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import org.deidentifier.arx.aggregates.HierarchyBuilderIntervalBased;

diff --git a/src/main/java/no/oslomet/aaas/service/HierarchyService.java b/src/main/java/no/oslomet/aaas/service/HierarchyService.java
@@ -1,8 +1,8 @@
 package no.oslomet.aaas.service;
 
-import no.oslomet.aaas.model.hierarchy.Hierarchy;
-import no.oslomet.aaas.model.hierarchy.HierarchyBuilder;
-import no.oslomet.aaas.model.hierarchy.HierarchyRequest;
+import no.oslomet.aaas.hierarchy.Hierarchy;
+import no.oslomet.aaas.hierarchy.HierarchyBuilder;
+import no.oslomet.aaas.hierarchy.HierarchyRequest;
 import org.springframework.stereotype.Service;
 
 

diff --git a/src/test/java/no/oslomet/aaas/controller/HierarchyControllerTest.java b/src/test/java/no/oslomet/aaas/controller/HierarchyControllerTest.java
@@ -1,11 +1,11 @@
 package no.oslomet.aaas.controller;
 
 
-import no.oslomet.aaas.model.hierarchy.*;
-import no.oslomet.aaas.model.hierarchy.interval.Interval;
-import no.oslomet.aaas.model.hierarchy.interval.IntervalBasedHierarchyBuilder;
-import no.oslomet.aaas.model.hierarchy.RedactionBasedHierarchyBuilder.Order;
-import no.oslomet.aaas.model.hierarchy.interval.Range;
+import no.oslomet.aaas.hierarchy.*;
+import no.oslomet.aaas.hierarchy.interval.Interval;
+import no.oslomet.aaas.hierarchy.interval.IntervalBasedHierarchyBuilder;
+import no.oslomet.aaas.hierarchy.RedactionBasedHierarchyBuilder.Order;
+import no.oslomet.aaas.hierarchy.interval.Range;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/src/test/java/no/oslomet/aaas/docs/ApiDocsGenerationTest.java b/src/test/java/no/oslomet/aaas/docs/ApiDocsGenerationTest.java
@@ -4,11 +4,11 @@
 import no.oslomet.aaas.GenerateTestData;
 import no.oslomet.aaas.model.Request;
 
-import no.oslomet.aaas.model.hierarchy.*;
-import no.oslomet.aaas.model.hierarchy.RedactionBasedHierarchyBuilder.Order;
-import no.oslomet.aaas.model.hierarchy.interval.Interval;
-import no.oslomet.aaas.model.hierarchy.interval.IntervalBasedHierarchyBuilder;
-import no.oslomet.aaas.model.hierarchy.interval.Range;
+import no.oslomet.aaas.hierarchy.*;
+import no.oslomet.aaas.hierarchy.RedactionBasedHierarchyBuilder.Order;
+import no.oslomet.aaas.hierarchy.interval.Interval;
+import no.oslomet.aaas.hierarchy.interval.IntervalBasedHierarchyBuilder;
+import no.oslomet.aaas.hierarchy.interval.Range;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/...s/model/hierarchy/HierarchyTestUtils.java → ...et/aaas/hierarchy/HierarchyTestUtils.java b/...s/model/hierarchy/HierarchyTestUtils.java → ...et/aaas/hierarchy/HierarchyTestUtils.java
@@ -1,4 +1,4 @@
-package no.oslomet.aaas.model.hierarchy;
+package no.oslomet.aaas.hierarchy;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/...archy/OrderBasedHierarchyBuilderTest.java → ...archy/OrderBasedHierarchyBuilderTest.java b/...archy/OrderBasedHierarchyBuilderTest.java → ...archy/OrderBasedHierarchyBuilderTest.java
@@ -1,4 +1,4 @@
-package no.oslomet.aaas.model.hierarchy;
+package no.oslomet.aaas.hierarchy;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...al/IntervalBasedHierarchyBuilderTest.java → ...al/IntervalBasedHierarchyBuilderTest.java b/...al/IntervalBasedHierarchyBuilderTest.java → ...al/IntervalBasedHierarchyBuilderTest.java
@@ -1,13 +1,11 @@
-package no.oslomet.aaas.model.hierarchy.interval;
+package no.oslomet.aaas.hierarchy.interval;
 
-import no.oslomet.aaas.model.hierarchy.Hierarchy;
-import no.oslomet.aaas.model.hierarchy.HierarchyTestUtils;
-import no.oslomet.aaas.model.hierarchy.Level;
+import no.oslomet.aaas.hierarchy.Hierarchy;
+import no.oslomet.aaas.hierarchy.Level;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.util.Arrays;
 import java.util.List;
 
 class IntervalBasedHierarchyBuilderTest {
@@ -141,7 +139,7 @@ void build_with_double_type_data_fails_with_no_intervals(){
 
         String[] column = {"3.3", "4.1", "5", "6.2", "7.232", "8.22"};
 
-        Assertions.assertThrows(IllegalArgumentException.class, () -> {basedHierarchyBuilder.build(column);});
+        Assertions.assertThrows(IllegalArgumentException.class, () -> basedHierarchyBuilder.build(column));
     }
 
     @Test
@@ -154,7 +152,7 @@ void build_with_single_interval() {
                 testLevels, null, null, IntervalBasedHierarchyBuilder.BuilderDataType.LONG);
 
         String[] column = {"3", "4", "5", "6", "7", "8"};
-        Assertions.assertThrows(IllegalArgumentException.class, () -> {basedHierarchyBuilder.build(column);});
+        Assertions.assertThrows(IllegalArgumentException.class, () -> basedHierarchyBuilder.build(column));
     }
 
 }