Merge branch 'main' into release

.gitlab-ci.yml

@@ -397,7 +397,7 @@ update_model_ALTERNARIA:
   script:
     - apk add --no-cache openjdk11
     - export RELEASE_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$RELEASE_VERSION
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$RELEASE_VERSION -e PURPOSE="update"
   tags:
     - vips-java
   rules:

pom.xml

@@ -10,7 +10,7 @@
 
     <groupId>no.nibio.vips</groupId>
     <artifactId>VIPSCommon</artifactId>
-    <version>2.0.6</version>
+    <version>2.0.7-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>VIPSCommon</name>

src/main/java/no/nibio/vips/entity/WeatherObservation.java

@@ -81,8 +81,8 @@ public class WeatherObservation implements Comparable{
         
     public final void setTimeMeasured(Date timeMeasured) { this.timeMeasured = timeMeasured; }
     
-    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern="yyyy-MM-dd'T'HH:mm:ssXXX", timezone="UTC") // Java >= 7
-    @JsonbDateFormat(value = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    //@JsonFormat(shape=JsonFormat.Shape.STRING, pattern="yyyy-MM-dd'T'HH:mm:ssXXX", timezone="UTC") // Java >= 7
+    //@JsonbDateFormat(value = "yyyy-MM-dd'T'HH:mm:ssXXX")
     public Date getTimeMeasured() { return this.timeMeasured; }
     
     public final void setElementMeasurementTypeId(String elementMeasurementTypeId) { 

src/test/java/no/nibio/vips/util/ModelUtilTest.java

@@ -18,11 +18,22 @@
  */
 package no.nibio.vips.util;
 
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.MappingJsonFactory;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import junit.framework.TestCase;
+import no.nibio.vips.entity.ModelConfiguration;
+import no.nibio.vips.entity.WeatherObservation;
 import no.nibio.vips.model.ConfigValidationException;
 
 /**
@@ -82,6 +93,26 @@ public class ModelUtilTest extends TestCase {
         assertEquals(expResult, result);
         
     }
+    
+    public void testExtractWeatherObservationList()
+    {
+        String weatherDataFileName = "/weatherData_milliseconds.json";
+        try {
+
+            BufferedInputStream inputStream = new BufferedInputStream(this.getClass().getResourceAsStream(weatherDataFileName));
+            //InputStream i = this.getClass().getResourceAsStream(weatherDataFileName);
+            JsonFactory f = new MappingJsonFactory();
+            JsonParser jp = f.createParser(inputStream);
+            JsonNode all = jp.readValueAsTree();
+            List<WeatherObservation> result = new ModelUtil().extractWeatherObservationList(all);
+            System.out.println(result.get(0));
+            assertNotNull(result);
+
+        } catch (IOException ex) {
+            //ex.printStackTrace();
+            fail(ex.getMessage());
+        } 
+    }