From 7cd3ff94623df912d6d63b5714353859f66673ed Mon Sep 17 00:00:00 2001 From: valentin-gauthier-geosiris <88202743+valentin-gauthier-geosiris@users.noreply.github.com> Date: Wed, 25 Sep 2024 14:42:16 +0200 Subject: [PATCH] getters + versioning (#27) - bugfix for pointSet - bugfix for ContactElement creation --- .github/workflows/maven-release.yml | 10 ++-- .github/workflows/pull-tests.yml | 18 +++++-- pom.xml | 50 ++++++++++++++++--- .../geosiris/energyml/data/AbstractMesh.java | 10 ++++ .../java/com/geosiris/energyml/data/Mesh.java | 6 +++ .../energyml/pkg/EPCPackageManager.java | 3 +- 6 files changed, 80 insertions(+), 17 deletions(-) diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index aad67dd..12a8086 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -16,10 +16,10 @@ jobs: packages: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'temurin' @@ -33,14 +33,14 @@ jobs: name: Install gpg secret key run: cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import - - name: Change version to tag name - run: mvn versions:set -DnewVersion="${{ github.event.release.tag_name }}" +# - name: Change version to tag name +# run: mvn versions:set -DnewVersion="${{ github.event.release.tag_name }}" - name: Unit test run: mvn -B --file pom.xml clean test -P test - name: Build with Maven - run: mvn -B --file pom.xml clean deploy -P release + run: mvn -B --file pom.xml clean deploy -P release -Dchangelist= -Drevision="${{ github.event.release.tag_name }}" env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} diff --git a/.github/workflows/pull-tests.yml b/.github/workflows/pull-tests.yml index 708aa1c..0665a95 100644 --- a/.github/workflows/pull-tests.yml +++ b/.github/workflows/pull-tests.yml @@ -13,10 +13,10 @@ jobs: packages: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'temurin' @@ -30,8 +30,20 @@ jobs: name: Install gpg secret key run: cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import +# - name: Change version to SHA name +# run: mvn versions:set -Dsha1=-"${{ github.sha }}" + - name: Unit test run: | PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) echo "jar_version=${PROJECT_VERSION}" >> $GITHUB_OUTPUT - mvn -B --file pom.xml clean test -P test \ No newline at end of file + mvn -B --file pom.xml clean test -P test + + - name: Build with Maven + run: mvn -B --file pom.xml clean deploy -P release + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} + GITHUB_TOKEN: ${{ github.token }} + diff --git a/pom.xml b/pom.xml index d4262a0..c831d67 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.geosiris energyml-utils ${project.groupId}:${project.artifactId} - 1.0.12 + ${revision}${sha1}${changelist} Geosiris http://www.geosiris.com @@ -43,6 +43,10 @@ ${project.basedir}/src/test geosiris-technologies https://sonarcloud.io + 1.0.13 + -SNAPSHOT + + @@ -66,6 +70,11 @@ gson 2.10 + + io.jhdf + jhdf + 0.6.10 + org.apache.logging.log4j @@ -114,12 +123,6 @@ 1.0.4 test - - - io.jhdf - jhdf - 0.6.10 - @@ -148,6 +151,7 @@ org.apache.maven.plugins maven-gpg-plugin + 3.2.4 sign-artifacts @@ -226,6 +230,38 @@ + + + org.junit.jupiter + junit-jupiter-api + 5.9.1 + + + org.junit.jupiter + junit-jupiter-engine + 5.9.1 + + + com.geosiris + energyml-resqml22 + 1.0.4 + + + com.geosiris + energyml-resqml22-dev3 + 1.0.4 + + + com.geosiris + energyml-resqml201 + 1.0.4 + + + com.geosiris + energyml-witsml21 + 1.0.4 + + \ No newline at end of file diff --git a/src/main/java/com/geosiris/energyml/data/AbstractMesh.java b/src/main/java/com/geosiris/energyml/data/AbstractMesh.java index 59624ff..446eaf5 100644 --- a/src/main/java/com/geosiris/energyml/data/AbstractMesh.java +++ b/src/main/java/com/geosiris/energyml/data/AbstractMesh.java @@ -26,6 +26,7 @@ public abstract class AbstractMesh implements MeshExporter{ public abstract Long getNbPoints(); public abstract Long getNbEdge(); public abstract Long getNbFaces(); + public List getPointList(){ return pointList; } @@ -33,5 +34,14 @@ public List getPointList(){ public String getIdentifier() { return identifier; } + public abstract List> getEdgeIndices(); + + public Object getEnergymlObject() { + return energymlObject; + } + + public Object getCrsObject() { + return crsObject; + } } diff --git a/src/main/java/com/geosiris/energyml/data/Mesh.java b/src/main/java/com/geosiris/energyml/data/Mesh.java index c27cf05..794bf2e 100644 --- a/src/main/java/com/geosiris/energyml/data/Mesh.java +++ b/src/main/java/com/geosiris/energyml/data/Mesh.java @@ -102,6 +102,11 @@ public static List readPointRepresentation(Object energymlObject, try { crs = getCrsObj(pointsObj, pointsPathInObj, energymlObject, workspace); } catch (ObjectNotFoundNotError ignore) {} + + if(isZReversed(crs)){ + points.forEach(l->l.set(2, -l.get(2))); + } + meshes.add(new PointSetMesh( energymlObject, crs, @@ -140,6 +145,7 @@ public static List readPointRepresentation(Object energymlObject, try { crs = getCrsObj(pointsObj, pointsPathInObj, energymlObject, workspace); } catch (ObjectNotFoundNotError ignore) {} + meshes.add(new PointSetMesh( energymlObject, crs, diff --git a/src/main/java/com/geosiris/energyml/pkg/EPCPackageManager.java b/src/main/java/com/geosiris/energyml/pkg/EPCPackageManager.java index e46d9ad..044171f 100644 --- a/src/main/java/com/geosiris/energyml/pkg/EPCPackageManager.java +++ b/src/main/java/com/geosiris/energyml/pkg/EPCPackageManager.java @@ -426,8 +426,7 @@ public Object modifyNewInstance(Object instance, Map epcObjects, logger.error("Modifying instance " + instance); if (instance != null) { String objClassNameLower = instance.getClass().getName().toLowerCase(); - if (objClassNameLower.endsWith("dataobjectreference") - || objClassNameLower.endsWith("contactelementreference")) { + if (ObjectController.hasSuperClassSuffix(instance.getClass(), "DataObjectReference")) { // value must be an uuid try { ObjectController.editObjectAttribute(instance, "uuid", value);