Merge branch 'main' into fix_#432_several_aas_issues_hindering_import…

…_to_aas_package_explorer
eclipse-esmf · Oct 20, 2023 · 0da3d32 · 0da3d32
2 parents dac5297 + a3c61d9
commit 0da3d32
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 31 deletions.
diff --git a/...ain/java/org/eclipse/esmf/aspectmodel/generator/json/AspectModelJsonPayloadGenerator.java b/...ain/java/org/eclipse/esmf/aspectmodel/generator/json/AspectModelJsonPayloadGenerator.java
@@ -513,6 +513,9 @@ private Optional<DateFormat> getDateFormat( final String urn ) {
          if ( XSD.duration.getURI().equals( urn ) ) {
             return Optional.of( new SimpleDateFormat( "PddD" ) );
          }
+         if ( XSD.date.getURI().equals( urn ) ) {
+            return Optional.of( new SimpleDateFormat( "yyyy-MM-dd" ) );
+         }
          return Optional.empty();
       }
 

diff --git a/...t/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithConstraints.java b/...t/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithConstraints.java
@@ -73,25 +73,25 @@ public class AspectWithConstraints {
    @JsonCreator
    public AspectWithConstraints(
          @JsonProperty( value = "testPropertyWithRegularExpression" )
-               String testPropertyWithRegularExpression,
+         String testPropertyWithRegularExpression,
          @JsonProperty( value = "testPropertyWithDecimalMinDecimalMaxRangeConstraint" )
-               BigDecimal testPropertyWithDecimalMinDecimalMaxRangeConstraint,
+         BigDecimal testPropertyWithDecimalMinDecimalMaxRangeConstraint,
          @JsonProperty( value = "testPropertyWithDecimalMaxRangeConstraint" )
-               BigDecimal testPropertyWithDecimalMaxRangeConstraint,
+         BigDecimal testPropertyWithDecimalMaxRangeConstraint,
          @JsonProperty( value = "testPropertyWithMinMaxRangeConstraint" )
-               Integer testPropertyWithMinMaxRangeConstraint,
+         Integer testPropertyWithMinMaxRangeConstraint,
          @JsonProperty( value = "testPropertyWithMinRangeConstraint" )
-               Integer testPropertyWithMinRangeConstraint,
+         Integer testPropertyWithMinRangeConstraint,
          @JsonProperty( value = "testPropertyRangeConstraintWithFloatType" )
-               Float testPropertyRangeConstraintWithFloatType,
+         Float testPropertyRangeConstraintWithFloatType,
          @JsonProperty( value = "testPropertyRangeConstraintWithDoubleType" )
-               Double testPropertyRangeConstraintWithDoubleType,
+         Double testPropertyRangeConstraintWithDoubleType,
          @JsonProperty( value = "testPropertyWithMinMaxLengthConstraint" )
-               String testPropertyWithMinMaxLengthConstraint,
+         String testPropertyWithMinMaxLengthConstraint,
          @JsonProperty( value = "testPropertyWithMinLengthConstraint" )
-               BigInteger testPropertyWithMinLengthConstraint,
+         BigInteger testPropertyWithMinLengthConstraint,
          @JsonProperty( value = "testPropertyCollectionLengthConstraint" )
-               List<BigInteger> testPropertyCollectionLengthConstraint ) {
+         List<BigInteger> testPropertyCollectionLengthConstraint ) {
       this.testPropertyWithRegularExpression = testPropertyWithRegularExpression;
       this.testPropertyWithDecimalMinDecimalMaxRangeConstraint =
             testPropertyWithDecimalMinDecimalMaxRangeConstraint;

diff --git a/...eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithGenericNumericProperty.java b/...eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithGenericNumericProperty.java
@@ -29,7 +29,7 @@ public class AspectWithGenericNumericProperty {
 
    @JsonCreator
    public AspectWithGenericNumericProperty(
-         @JsonProperty(value = "testNumber") Number testNumber) {
+         @JsonProperty( value = "testNumber" ) Number testNumber ) {
       this.testNumber = testNumber;
    }
 
@@ -43,15 +43,15 @@ public Number getTestNumber() {
    }
 
    @Override
-   public boolean equals(final Object o) {
-      if (this == o) {
+   public boolean equals( final Object o ) {
+      if ( this == o ) {
          return true;
       }
-      if (o == null || getClass() != o.getClass()) {
+      if ( o == null || getClass() != o.getClass() ) {
          return false;
       }
       final AspectWithGenericNumericProperty that = (AspectWithGenericNumericProperty) o;
-      return Objects.equals(testNumber, that.testNumber);
+      return Objects.equals( testNumber, that.testNumber );
    }
 }
 

diff --git a/...tmodel/generator/json/testclasses/AspectWithRangeConstraintWithoutMinMaxIntegerValue.java b/...tmodel/generator/json/testclasses/AspectWithRangeConstraintWithoutMinMaxIntegerValue.java
@@ -23,11 +23,12 @@
 /** Generated class for Test Aspect. */
 public class AspectWithRangeConstraintWithoutMinMaxIntegerValue {
 
-   @NotNull private BigInteger testInt;
+   @NotNull
+   private BigInteger testInt;
 
    @JsonCreator
    public AspectWithRangeConstraintWithoutMinMaxIntegerValue(
-         @JsonProperty(value = "testInt") BigInteger testInt) {
+         @JsonProperty( value = "testInt" ) BigInteger testInt ) {
       this.testInt = testInt;
    }
 
@@ -41,16 +42,16 @@ public BigInteger getTestInt() {
    }
 
    @Override
-   public boolean equals(final Object o) {
-      if (this == o) {
+   public boolean equals( final Object o ) {
+      if ( this == o ) {
          return true;
       }
-      if (o == null || getClass() != o.getClass()) {
+      if ( o == null || getClass() != o.getClass() ) {
          return false;
       }
       final AspectWithRangeConstraintWithoutMinMaxIntegerValue that =
             (AspectWithRangeConstraintWithoutMinMaxIntegerValue) o;
-      return Objects.equals(testInt, that.testInt);
+      return Objects.equals( testInt, that.testInt );
    }
 }
 
diff --git a/...org/eclipse/esmf/aspectmodel/generator/jsonschema/AspectModelJsonSchemaGeneratorTest.java b/...org/eclipse/esmf/aspectmodel/generator/jsonschema/AspectModelJsonSchemaGeneratorTest.java
@@ -840,7 +840,7 @@ public void testEnumComplexMapping( final KnownVersion metaModelVersion ) {
       assertThat( context.<String> read( "$['components']['schemas']['ResultGood']['properties']['details']"
             + "['properties']['message']['enum'][0]" ) ).isEqualTo( "Evaluation succeeded." );
       assertThat( context.<Integer> read( "$['components']['schemas']['ResultGood']['properties']['details']"
-              + "['properties']['numericCode']['enum'][0]" ) ).isEqualTo( 10 );
+            + "['properties']['numericCode']['enum'][0]" ) ).isEqualTo( 10 );
    }
 
    @ParameterizedTest

diff --git a/.../src/main/java/org/eclipse/esmf/aspectmodel/java/customconstraint/DoubleMinValidator.java b/.../src/main/java/org/eclipse/esmf/aspectmodel/java/customconstraint/DoubleMinValidator.java
@@ -12,6 +12,7 @@
  */
 
 package org.eclipse.esmf.aspectmodel.java.customconstraint;
+
 import org.eclipse.esmf.metamodel.impl.BoundDefinition;
 
 import jakarta.validation.ConstraintValidator;

diff --git a/...rc/main/java/org/eclipse/esmf/aspectmodel/java/customconstraint/DurationMaxValidator.java b/...rc/main/java/org/eclipse/esmf/aspectmodel/java/customconstraint/DurationMaxValidator.java
@@ -12,6 +12,7 @@
  */
 
 package org.eclipse.esmf.aspectmodel.java.customconstraint;
+
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.Duration;

diff --git a/...ava/org/eclipse/esmf/aspectmodel/java/customconstraint/GregorianCalendarMinValidator.java b/...ava/org/eclipse/esmf/aspectmodel/java/customconstraint/GregorianCalendarMinValidator.java
@@ -12,6 +12,7 @@
  */
 
 package org.eclipse.esmf.aspectmodel.java.customconstraint;
+
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;

diff --git a/...in/java/org/eclipse/esmf/aspectmodel/java/pojo/StructureElementJavaArtifactGenerator.java b/...in/java/org/eclipse/esmf/aspectmodel/java/pojo/StructureElementJavaArtifactGenerator.java
@@ -26,10 +26,6 @@
 import javax.xml.datatype.DatatypeConstants;
 import javax.xml.datatype.DatatypeFactory;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.vocabulary.XSD;
-import org.apache.velocity.app.FieldMethodizer;
 import org.eclipse.esmf.aspectmodel.generator.ArtifactGenerator;
 import org.eclipse.esmf.aspectmodel.generator.TemplateEngine;
 import org.eclipse.esmf.aspectmodel.java.AspectModelJavaUtil;
@@ -40,25 +36,26 @@
 import org.eclipse.esmf.aspectmodel.java.ValueInitializer;
 import org.eclipse.esmf.aspectmodel.java.exception.CodeGenerationException;
 import org.eclipse.esmf.aspectmodel.resolver.services.DataType;
-
 import org.eclipse.esmf.characteristic.Trait;
 import org.eclipse.esmf.metamodel.ComplexType;
 import org.eclipse.esmf.metamodel.Constraint;
 import org.eclipse.esmf.metamodel.Scalar;
 import org.eclipse.esmf.metamodel.StructureElement;
 import org.eclipse.esmf.metamodel.impl.DefaultScalar;
 import org.eclipse.esmf.metamodel.impl.DefaultScalarValue;
-
 import org.eclipse.esmf.samm.KnownVersion;
-import org.jboss.forge.roaster.Roaster;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.collect.ImmutableMap;
-
 import jakarta.validation.constraints.NotNull;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.jena.rdf.model.ResourceFactory;
+import org.apache.jena.vocabulary.XSD;
+import org.apache.velocity.app.FieldMethodizer;
+import org.jboss.forge.roaster.Roaster;
 
 /**
  * A {@link ArtifactGenerator} that generates Java Pojo code

diff --git a/...rc/main/java/org/eclipse/esmf/aspectmodel/java/rangeconstraint/AnnotationTypeMapping.java b/...rc/main/java/org/eclipse/esmf/aspectmodel/java/rangeconstraint/AnnotationTypeMapping.java
@@ -83,4 +83,4 @@ ImmutableMap.<Class<?>, Class<?>> builder()
    public Class<?> getAnnotationType( final Class<?> type ) {
       return typeMapping.get( type );
    }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ @@
      */
     package org.eclipse.esmf.aspectmodel.java.customconstraint;
     import org.eclipse.esmf.metamodel.impl.BoundDefinition;
     import jakarta.validation.ConstraintValidator;
@@ Expand Down @@