Merge pull request #1523 from cdowding-sl/feature/helix_values

Removed Helix Data Types
finos · Nov 8, 2019 · 761a29d · 761a29d
2 parents ace874e + 47f4804
commit 761a29d
Show file tree

Hide file tree

Showing 121 changed files with 641 additions and 2,207 deletions.
diff --git a/common/src/main/java/com/scottlogic/deg/common/commands/Command.java b/common/src/main/java/com/scottlogic/deg/common/commands/Command.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.scottlogic.deg.common.commands;
 
 import java.lang.reflect.Type;

diff --git a/common/src/main/java/com/scottlogic/deg/common/commands/CommandBus.java b/common/src/main/java/com/scottlogic/deg/common/commands/CommandBus.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.scottlogic.deg.common.commands;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;

diff --git a/common/src/main/java/com/scottlogic/deg/common/commands/CommandHandler.java b/common/src/main/java/com/scottlogic/deg/common/commands/CommandHandler.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.scottlogic.deg.common.commands;
 
 import com.scottlogic.deg.common.validators.ValidationResult;

diff --git a/common/src/main/java/com/scottlogic/deg/common/commands/CommandResult.java b/common/src/main/java/com/scottlogic/deg/common/commands/CommandResult.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.scottlogic.deg.common.commands;
 
 import java.util.ArrayList;

diff --git a/common/src/main/java/com/scottlogic/deg/common/profile/DateTimeGranularity.java b/common/src/main/java/com/scottlogic/deg/common/profile/DateTimeGranularity.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.scottlogic.deg.common.profile;
 
 import com.scottlogic.deg.common.ValidationException;

diff --git a/common/src/main/java/com/scottlogic/deg/common/profile/FieldType.java b/common/src/main/java/com/scottlogic/deg/common/profile/FieldType.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.scottlogic.deg.common.profile;
 
 public enum FieldType

diff --git a/common/src/main/java/com/scottlogic/deg/common/profile/HelixNumber.java b/common/src/main/java/com/scottlogic/deg/common/profile/HelixNumber.java
diff --git a/common/src/main/java/com/scottlogic/deg/common/profile/HelixStringLength.java b/common/src/main/java/com/scottlogic/deg/common/profile/HelixStringLength.java
diff --git a/common/src/main/java/com/scottlogic/deg/common/profile/SpecificFieldType.java b/common/src/main/java/com/scottlogic/deg/common/profile/SpecificFieldType.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.scottlogic.deg.common.profile;
 
 import com.fasterxml.jackson.annotation.JsonValue;

diff --git a/...rc/main/java/com/scottlogic/deg/generator/profile/constraints/atomic/AfterConstraint.java b/...rc/main/java/com/scottlogic/deg/generator/profile/constraints/atomic/AfterConstraint.java
@@ -17,7 +17,6 @@
 package com.scottlogic.deg.generator.profile.constraints.atomic;
 
 import com.scottlogic.deg.common.profile.Field;
-import com.scottlogic.deg.common.profile.HelixDateTime;
 import com.scottlogic.deg.generator.fieldspecs.FieldSpec;
 import com.scottlogic.deg.generator.fieldspecs.FieldSpecFactory;
 import com.scottlogic.deg.generator.restrictions.linear.Limit;
@@ -31,9 +30,9 @@
 
 public class AfterConstraint implements AtomicConstraint {
     public final Field field;
-    public final HelixDateTime referenceValue;
+    public final OffsetDateTime referenceValue;
 
-    public AfterConstraint(Field field, HelixDateTime referenceValue) {
+    public AfterConstraint(Field field, OffsetDateTime referenceValue) {
         this.field = field;
         this.referenceValue = referenceValue;
     }
@@ -50,7 +49,7 @@ public AtomicConstraint negate() {
 
     @Override
     public FieldSpec toFieldSpec() {
-        final LinearRestrictions<OffsetDateTime> dateTimeRestrictions = createDateTimeRestrictions(new Limit<>(referenceValue.getValue(), false), DATETIME_MAX_LIMIT);
+        final LinearRestrictions<OffsetDateTime> dateTimeRestrictions = createDateTimeRestrictions(new Limit<>(referenceValue, false), DATETIME_MAX_LIMIT);
         return FieldSpecFactory.fromRestriction(dateTimeRestrictions);
     }
 

diff --git a/...ain/java/com/scottlogic/deg/generator/profile/constraints/atomic/AfterOrAtConstraint.java b/...ain/java/com/scottlogic/deg/generator/profile/constraints/atomic/AfterOrAtConstraint.java
@@ -17,7 +17,6 @@
 package com.scottlogic.deg.generator.profile.constraints.atomic;
 
 import com.scottlogic.deg.common.profile.Field;
-import com.scottlogic.deg.common.profile.HelixDateTime;
 import com.scottlogic.deg.generator.fieldspecs.FieldSpec;
 import com.scottlogic.deg.generator.fieldspecs.FieldSpecFactory;
 import com.scottlogic.deg.generator.restrictions.linear.Limit;
@@ -32,9 +31,9 @@
 
 public class AfterOrAtConstraint implements AtomicConstraint {
     public final Field field;
-    public final HelixDateTime referenceValue;
+    public final OffsetDateTime referenceValue;
 
-    public AfterOrAtConstraint(Field field, HelixDateTime referenceValue) {
+    public AfterOrAtConstraint(Field field, OffsetDateTime referenceValue) {
         this.field = field;
         this.referenceValue = referenceValue;
     }
@@ -51,7 +50,7 @@ public AtomicConstraint negate() {
 
     @Override
     public FieldSpec toFieldSpec() {
-        final LinearRestrictions<OffsetDateTime> dateTimeRestrictions = createDateTimeRestrictions(new Limit<>(referenceValue.getValue(), true), DATETIME_MAX_LIMIT);
+        final LinearRestrictions<OffsetDateTime> dateTimeRestrictions = createDateTimeRestrictions(new Limit<>(referenceValue, true), DATETIME_MAX_LIMIT);
         return FieldSpecFactory.fromRestriction(dateTimeRestrictions);
     }
 

diff --git a/...c/main/java/com/scottlogic/deg/generator/profile/constraints/atomic/BeforeConstraint.java b/...c/main/java/com/scottlogic/deg/generator/profile/constraints/atomic/BeforeConstraint.java
@@ -17,7 +17,6 @@
 package com.scottlogic.deg.generator.profile.constraints.atomic;
 
 import com.scottlogic.deg.common.profile.Field;
-import com.scottlogic.deg.common.profile.HelixDateTime;
 import com.scottlogic.deg.generator.fieldspecs.FieldSpec;
 import com.scottlogic.deg.generator.fieldspecs.FieldSpecFactory;
 import com.scottlogic.deg.generator.restrictions.linear.Limit;
@@ -31,9 +30,9 @@
 
 public class BeforeConstraint implements AtomicConstraint {
     public final Field field;
-    public final HelixDateTime referenceValue;
+    public final OffsetDateTime referenceValue;
 
-    public BeforeConstraint(Field field, HelixDateTime referenceValue) {
+    public BeforeConstraint(Field field, OffsetDateTime referenceValue) {
         this.field = field;
         this.referenceValue = referenceValue;
     }
@@ -50,7 +49,7 @@ public AtomicConstraint negate() {
 
     @Override
     public FieldSpec toFieldSpec() {
-        final LinearRestrictions<OffsetDateTime> dateTimeRestrictions = createDateTimeRestrictions(DATETIME_MIN_LIMIT, new Limit<>(referenceValue.getValue(), false));
+        final LinearRestrictions<OffsetDateTime> dateTimeRestrictions = createDateTimeRestrictions(DATETIME_MIN_LIMIT, new Limit<>(referenceValue, false));
         return FieldSpecFactory.fromRestriction(dateTimeRestrictions);
     }
 

diff --git a/...in/java/com/scottlogic/deg/generator/profile/constraints/atomic/BeforeOrAtConstraint.java b/...in/java/com/scottlogic/deg/generator/profile/constraints/atomic/BeforeOrAtConstraint.java
@@ -17,7 +17,6 @@
 package com.scottlogic.deg.generator.profile.constraints.atomic;
 
 import com.scottlogic.deg.common.profile.Field;
-import com.scottlogic.deg.common.profile.HelixDateTime;
 import com.scottlogic.deg.generator.fieldspecs.FieldSpec;
 import com.scottlogic.deg.generator.fieldspecs.FieldSpecFactory;
 import com.scottlogic.deg.generator.restrictions.linear.Limit;
@@ -31,9 +30,9 @@
 
 public class BeforeOrAtConstraint implements AtomicConstraint {
     public final Field field;
-    public final HelixDateTime referenceValue;
+    public final OffsetDateTime referenceValue;
 
-    public BeforeOrAtConstraint(Field field, HelixDateTime referenceValue) {
+    public BeforeOrAtConstraint(Field field, OffsetDateTime referenceValue) {
         this.field = field;
         this.referenceValue = referenceValue;
     }
@@ -50,7 +49,7 @@ public AtomicConstraint negate() {
 
     @Override
     public FieldSpec toFieldSpec() {
-        final LinearRestrictions<OffsetDateTime> dateTimeRestrictions = createDateTimeRestrictions(DATETIME_MIN_LIMIT, new Limit<>(referenceValue.getValue(), true));
+        final LinearRestrictions<OffsetDateTime> dateTimeRestrictions = createDateTimeRestrictions(DATETIME_MIN_LIMIT, new Limit<>(referenceValue, true));
         return FieldSpecFactory.fromRestriction(dateTimeRestrictions);
     }
 

diff --git a/...n/java/com/scottlogic/deg/generator/profile/constraints/atomic/GreaterThanConstraint.java b/...n/java/com/scottlogic/deg/generator/profile/constraints/atomic/GreaterThanConstraint.java
@@ -17,7 +17,6 @@
 package com.scottlogic.deg.generator.profile.constraints.atomic;
 
 import com.scottlogic.deg.common.profile.Field;
-import com.scottlogic.deg.common.profile.HelixNumber;
 import com.scottlogic.deg.generator.fieldspecs.FieldSpec;
 import com.scottlogic.deg.generator.fieldspecs.FieldSpecFactory;
 import com.scottlogic.deg.generator.restrictions.linear.Limit;
@@ -31,9 +30,9 @@
 
 public class GreaterThanConstraint implements AtomicConstraint {
     public final Field field;
-    public final HelixNumber referenceValue;
+    public final BigDecimal referenceValue;
 
-    public GreaterThanConstraint(Field field, HelixNumber referenceValue) {
+    public GreaterThanConstraint(Field field, BigDecimal referenceValue) {
         this.referenceValue = referenceValue;
         this.field = field;
     }
@@ -50,7 +49,7 @@ public AtomicConstraint negate() {
 
     @Override
     public FieldSpec toFieldSpec() {
-        LinearRestrictions<BigDecimal> numericRestrictions = createNumericRestrictions(new Limit<>(referenceValue.getValue(), false), NUMERIC_MAX_LIMIT);
+        LinearRestrictions<BigDecimal> numericRestrictions = createNumericRestrictions(new Limit<>(referenceValue, false), NUMERIC_MAX_LIMIT);
         return FieldSpecFactory.fromRestriction(numericRestrictions);
     }
 

diff --git a/...m/scottlogic/deg/generator/profile/constraints/atomic/GreaterThanOrEqualToConstraint.java b/...m/scottlogic/deg/generator/profile/constraints/atomic/GreaterThanOrEqualToConstraint.java
@@ -17,7 +17,6 @@
 package com.scottlogic.deg.generator.profile.constraints.atomic;
 
 import com.scottlogic.deg.common.profile.Field;
-import com.scottlogic.deg.common.profile.HelixNumber;
 import com.scottlogic.deg.generator.fieldspecs.FieldSpec;
 import com.scottlogic.deg.generator.fieldspecs.FieldSpecFactory;
 import com.scottlogic.deg.generator.restrictions.linear.Limit;
@@ -31,9 +30,9 @@
 
 public class GreaterThanOrEqualToConstraint implements AtomicConstraint {
     public final Field field;
-    public final HelixNumber referenceValue;
+    public final BigDecimal referenceValue;
 
-    public GreaterThanOrEqualToConstraint(Field field, HelixNumber referenceValue) {
+    public GreaterThanOrEqualToConstraint(Field field, BigDecimal referenceValue) {
         this.referenceValue = referenceValue;
         this.field = field;
     }
@@ -50,7 +49,7 @@ public AtomicConstraint negate() {
 
     @Override
     public FieldSpec toFieldSpec() {
-        LinearRestrictions<BigDecimal> numericRestrictions = createNumericRestrictions(new Limit<>(referenceValue.getValue(), true), NUMERIC_MAX_LIMIT);
+        LinearRestrictions<BigDecimal> numericRestrictions = createNumericRestrictions(new Limit<>(referenceValue, true), NUMERIC_MAX_LIMIT);
         return FieldSpecFactory.fromRestriction(numericRestrictions);
     }
 

diff --git a/...main/java/com/scottlogic/deg/generator/profile/constraints/atomic/LessThanConstraint.java b/...main/java/com/scottlogic/deg/generator/profile/constraints/atomic/LessThanConstraint.java
@@ -17,7 +17,6 @@
 package com.scottlogic.deg.generator.profile.constraints.atomic;
 
 import com.scottlogic.deg.common.profile.Field;
-import com.scottlogic.deg.common.profile.HelixNumber;
 import com.scottlogic.deg.generator.fieldspecs.FieldSpec;
 import com.scottlogic.deg.generator.fieldspecs.FieldSpecFactory;
 import com.scottlogic.deg.generator.restrictions.linear.Limit;
@@ -31,9 +30,9 @@
 
 public class LessThanConstraint implements AtomicConstraint {
     public final Field field;
-    public final HelixNumber referenceValue;
+    public final BigDecimal referenceValue;
 
-    public LessThanConstraint(Field field, HelixNumber referenceValue) {
+    public LessThanConstraint(Field field, BigDecimal referenceValue) {
         this.referenceValue = referenceValue;
         this.field = field;
     }
@@ -50,7 +49,7 @@ public AtomicConstraint negate() {
 
     @Override
     public FieldSpec toFieldSpec() {
-        final LinearRestrictions<BigDecimal> numericRestrictions = createNumericRestrictions(NUMERIC_MIN_LIMIT, new Limit<>(referenceValue.getValue(), false));
+        final LinearRestrictions<BigDecimal> numericRestrictions = createNumericRestrictions(NUMERIC_MIN_LIMIT, new Limit<>(referenceValue, false));
         return FieldSpecFactory.fromRestriction(numericRestrictions);
     }