Merge branch 'main' into bugfix/418-date-examples

eclipse-esmf · Oct 20, 2023 · 0ede3c5 · 0ede3c5
2 parents c015c58 + 8d39df9
commit 0ede3c5
Show file tree

Hide file tree

Showing 66 changed files with 372 additions and 299 deletions.
diff --git a/.github/workflows/dependency-update.yml b/.github/workflows/dependency-update.yml
@@ -0,0 +1,19 @@
+name: Dependency Update
+
+on:
+  push:
+    branches:
+      - 'main'
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  dependency:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Submit Dependency Snapshot
+        uses: advanced-security/maven-dependency-submission-action@v3
diff --git a/core/esmf-aspect-model-aas-generator/pom.xml b/core/esmf-aspect-model-aas-generator/pom.xml
@@ -38,6 +38,10 @@
          <groupId>org.eclipse.digitaltwin.aas4j</groupId>
          <artifactId>dataformat-json</artifactId>
       </dependency>
+      <dependency>
+         <groupId>org.apache.poi</groupId>
+         <artifactId>poi</artifactId>
+      </dependency>
       <dependency>
          <groupId>org.eclipse.esmf</groupId>
          <artifactId>esmf-test-resources</artifactId>

diff --git a/...test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AbstractTestEntity.java b/...test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AbstractTestEntity.java
@@ -16,13 +16,13 @@
 import java.math.BigInteger;
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 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 jakarta.validation.constraints.NotNull;
+
 @JsonTypeInfo( use = JsonTypeInfo.Id.NAME )
 @JsonSubTypes( {
       @JsonSubTypes.Type( value = ExtendingTestEntity.class, name = "ExtendingTestEntity" )

diff --git a/...ava/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithAbstractEntity.java b/...ava/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithAbstractEntity.java
@@ -15,11 +15,11 @@
 
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+
 public class AspectWithAbstractEntity {
 
    @NotNull

diff --git a/...g/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithAbstractSingleEntity.java b/...g/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithAbstractSingleEntity.java
@@ -15,11 +15,11 @@
 
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+
 public class AspectWithAbstractSingleEntity {
 
    @NotNull

diff --git a/...e/esmf/aspectmodel/generator/json/testclasses/AspectWithCollectionWithAbstractEntity.java b/...e/esmf/aspectmodel/generator/json/testclasses/AspectWithCollectionWithAbstractEntity.java
@@ -16,13 +16,13 @@
 import java.util.Collection;
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.eclipse.esmf.aspectmodel.java.CollectionAspect;
 
+import jakarta.validation.constraints.NotNull;
+
 public class AspectWithCollectionWithAbstractEntity implements CollectionAspect<Collection<AbstractTestEntity>, AbstractTestEntity> {
 
    @NotNull

diff --git a/...st/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithComplexSet.java b/...st/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithComplexSet.java
@@ -3,12 +3,12 @@
 import java.util.Objects;
 import java.util.Set;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+
 /**
  * Generated class for Test Aspect. This is a test description
  */

diff --git a/...ava/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithConstrainedSet.java b/...ava/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithConstrainedSet.java
@@ -3,12 +3,12 @@
 import java.util.Objects;
 import java.util.Set;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+
 /**
  * Generated class for Test Aspect. This is a test description
  */

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
@@ -17,14 +17,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 import org.eclipse.esmf.aspectmodel.java.customconstraint.DoubleMax;
 import org.eclipse.esmf.aspectmodel.java.customconstraint.DoubleMin;
 import org.eclipse.esmf.aspectmodel.java.customconstraint.FloatMax;
@@ -33,6 +25,14 @@
 import org.eclipse.esmf.aspectmodel.java.customconstraint.IntegerMin;
 import org.eclipse.esmf.metamodel.impl.BoundDefinition;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+
 /** Generated class for AspectWithConstraints. */
 public class AspectWithConstraints {
 
@@ -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/...lipse/esmf/aspectmodel/generator/json/testclasses/AspectWithGTypeForRangeConstraints.java b/...lipse/esmf/aspectmodel/generator/json/testclasses/AspectWithGTypeForRangeConstraints.java
@@ -14,16 +14,17 @@
 
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 import org.eclipse.esmf.aspectmodel.java.customconstraint.GregorianCalendarMax;
 import org.eclipse.esmf.aspectmodel.java.customconstraint.GregorianCalendarMin;
 import org.eclipse.esmf.metamodel.impl.BoundDefinition;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import jakarta.validation.constraints.NotNull;
+
 /** Generated class for AspectWithGTypeForRangeConstraints. */
 public class AspectWithGTypeForRangeConstraints {
 

diff --git a/...eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithGenericNumericProperty.java b/...eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithGenericNumericProperty.java
@@ -14,11 +14,11 @@
 
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+
 /**
  * Class for testing aspects with variously typed and constrained numeric properties.
  */
@@ -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/...ipse/esmf/aspectmodel/generator/json/testclasses/AspectWithMultilanguageExampleValue.java b/...ipse/esmf/aspectmodel/generator/json/testclasses/AspectWithMultilanguageExampleValue.java
@@ -2,13 +2,13 @@
 
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import org.eclipse.esmf.metamodel.datatypes.LangString;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+
 /**
  * Generated class for AspectWithMultilanguageExampleValue.
  *

diff --git a/...tmodel/generator/json/testclasses/AspectWithRangeConstraintWithoutMinMaxIntegerValue.java b/...tmodel/generator/json/testclasses/AspectWithRangeConstraintWithoutMinMaxIntegerValue.java
@@ -15,19 +15,20 @@
 import java.math.BigInteger;
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+
 /** 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/.../esmf/aspectmodel/generator/json/testclasses/AspectWithRecursivePropertyWithOptional.java b/.../esmf/aspectmodel/generator/json/testclasses/AspectWithRecursivePropertyWithOptional.java
@@ -14,11 +14,11 @@
 
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+
 /** Generated class for AspectWithRecursivePropertyWithOptional. */
 public class AspectWithRecursivePropertyWithOptional {
 

diff --git a/...est/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/ExtendingTestEntity.java b/...est/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/ExtendingTestEntity.java
@@ -16,11 +16,11 @@
 import java.math.BigInteger;
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+
 public class ExtendingTestEntity extends AbstractTestEntity {
 
    @NotNull

diff --git a/...-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/Id.java b/...-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/Id.java
@@ -3,11 +3,11 @@
 import java.net.URI;
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+
 /**
  * Generated class for Unique Identifier.
  *

diff --git a/...org/eclipse/esmf/aspectmodel/generator/jsonschema/AspectModelJsonSchemaGeneratorTest.java b/...org/eclipse/esmf/aspectmodel/generator/jsonschema/AspectModelJsonSchemaGeneratorTest.java
@@ -839,8 +839,8 @@ public void testEnumComplexMapping( final KnownVersion metaModelVersion ) {
             + "['properties']['description']['enum'][0]" ) ).isEqualTo( "Result succeeded" );
       assertThat( context.<String> read( "$['components']['schemas']['ResultGood']['properties']['details']"
             + "['properties']['message']['enum'][0]" ) ).isEqualTo( "Evaluation succeeded." );
-      assertThat( context.<Double> read( "$['components']['schemas']['ResultGood']['properties']['details']"
-            + "['properties']['numericCode']['enum'][0]" ) ).isCloseTo( 10.0d, Percentage.withPercentage( 1.0d ) );
+      assertThat( context.<Integer> read( "$['components']['schemas']['ResultGood']['properties']['details']"
+            + "['properties']['numericCode']['enum'][0]" ) ).isEqualTo( 10 );
    }
 
    @ParameterizedTest

diff --git a/core/esmf-aspect-model-java-generator/pom.xml b/core/esmf-aspect-model-java-generator/pom.xml
@@ -41,8 +41,8 @@
          <artifactId>esmf-aspect-model-generator</artifactId>
       </dependency>
       <dependency>
-         <groupId>javax.validation</groupId>
-         <artifactId>validation-api</artifactId>
+         <groupId>jakarta.validation</groupId>
+         <artifactId>jakarta.validation-api</artifactId>
       </dependency>
       <dependency>
          <groupId>org.eclipse.esmf</groupId>