Update sequence tester with generated schema

.gitignore

@@ -4,6 +4,7 @@ udmi_site_model/
 gcp_reflect_key.pkcs8
 /pubber.out
 workspace.xml
+codegen/
 .gradle/
 .firebase/
 dashboard/functions/node_modules/

bin/gencode

@@ -0,0 +1,31 @@
+#!/bin/bash -e
+
+JVERSION=1.1.1
+JBASENAME=jsonschema2pojo
+
+ROOT_DIR=$(realpath $(dirname $0)/..)
+cd $ROOT_DIR
+
+rm -rf codegen gencode
+mkdir -p codegen gencode
+
+cd codegen
+GENDIR=$PWD
+
+JARVER=$JBASENAME-$JVERSION
+
+curl -L https://github.com/joelittlejohn/$JBASENAME/releases/download/$JARVER/$JARVER.tar.gz -o $JARVER.tgz
+
+tar -xzvf $JARVER.tgz
+
+cd $ROOT_DIR/schema
+JOPTS="-d . -ds -dg -S -p udmi.schema -ut"
+echo Generating code in gencode/java...
+$GENDIR/$JARVER/bin/$JBASENAME $JOPTS --source . --target $ROOT_DIR/gencode/java
+
+cd $ROOT_DIR
+echo Copying gencode to pubber...
+rm -rf pubber/src/main/java/udmi
+cp -a gencode/java/udmi pubber/src/main/java/
+
+echo Done with code generation.

bin/test_sequences

@@ -37,7 +37,7 @@ JAVA_CMD="java -cp $JARFILE org.junit.runner.JUnitCore"
 rm -rf out/devices/$device_id
 # Relies on VALIDATOR_CONFIG environment variable.
 echo $JAVA_CMD com.google.daq.mqtt.validator.validations.BaselineValidator
-timeout 120s $JAVA_CMD com.google.daq.mqtt.validator.validations.BaselineValidator
+timeout 5m $JAVA_CMD com.google.daq.mqtt.validator.validations.BaselineValidator
 result=$?
 
 if [[ $result != 0 ]]; then

pubber/pubber.iml

@@ -17,7 +17,7 @@
     <orderEntry type="library" name="Gradle: javax.xml.bind:jaxb-api:2.3.1" level="project" />
     <orderEntry type="library" name="Gradle: com.sun.xml.bind:jaxb-impl:3.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.cloud:google-cloud-logging:2.1.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.apis:google-api-services-cloudiot:v1-rev20201110-1.31.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.apis:google-api-services-cloudiot:v1-rev20210323-1.31.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.api-client:google-api-client:1.31.2" level="project" />
     <orderEntry type="library" name="Gradle: com.google.oauth-client:google-oauth-client:1.31.4" level="project" />
     <orderEntry type="library" name="Gradle: com.google.http-client:google-http-client-gson:1.38.1" level="project" />
@@ -108,5 +108,6 @@
     <orderEntry type="library" scope="TEST" name="Gradle: org.codehaus.mojo:animal-sniffer-annotations:1.19" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.android:annotations:4.1.1.4" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: io.perfmark:perfmark-api:0.19.0" level="project" />
+    <orderEntry type="module" module-name="gencode" />
   </component>
 </module>

pubber/src/main/java/daq/pubber/AbstractPoint.java

@@ -1,20 +1,20 @@
 package daq.pubber;
 
-import daq.udmi.Message.PointConfig;
-import daq.udmi.Message.PointData;
-import daq.udmi.Message.PointState;
+import udmi.schema.PointPointsetConfig;
+import udmi.schema.PointPointsetEvent;
+import udmi.schema.PointPointsetState;
 
 public interface AbstractPoint {
 
   String getName();
 
-  PointData getData();
+  PointPointsetEvent getData();
 
   void updateData();
 
   boolean isDirty();
 
-  PointState getState();
+  PointPointsetState getState();
 
-  void setConfig(PointConfig config);
+  void setConfig(PointPointsetConfig config);
 }

pubber/src/main/java/daq/pubber/BasicPoint.java

@@ -1,19 +1,16 @@
 package daq.pubber;
 
-import daq.udmi.Entry;
-import daq.udmi.Message.PointConfig;
-import daq.udmi.Message.PointData;
-import daq.udmi.Message.PointState;
+import udmi.schema.Entry;
+import udmi.schema.PointPointsetConfig;
+import udmi.schema.PointPointsetEvent;
+import udmi.schema.PointPointsetState;
+import udmi.schema.PointPointsetState.Value_state;
 
 public abstract class BasicPoint implements AbstractPoint {
 
-  private static final String INVALID_STATE = "invalid";
-  private static final String APPLIED_STATE = "applied";
-  private static final String FAILURE_STATE = "failure";
-
   protected final String name;
-  protected final PointData data = new PointData();
-  private final PointState state = new PointState();
+  protected final PointPointsetEvent data = new PointPointsetEvent();
+  private final PointPointsetState state = new PointPointsetState();
   private final boolean writable;
   protected boolean written;
   private boolean dirty;
@@ -33,7 +30,7 @@ public void updateData() {
     }
   }
 
-  public PointState getState() {
+  public PointPointsetState getState() {
     dirty = false;
     return state;
   }
@@ -44,11 +41,11 @@ public String getName() {
     return name;
   }
 
-  public PointData getData() {
+  public PointPointsetEvent getData() {
     return data;
   }
 
-  public void setConfig(PointConfig config) {
+  public void setConfig(PointPointsetConfig config) {
     if (config == null || config.set_value == null) {
       written = false;
       state.status = null;
@@ -57,27 +54,31 @@ public void setConfig(PointConfig config) {
     } else {
       if (!validateValue(config.set_value)) {
         state.status = invalidValueStatus();
-        state.value_state = INVALID_STATE;
+        state.value_state = Value_state.INVALID;
         dirty = true;
       } else if (!writable) {
         state.status = notWritableStatus();
-        state.value_state = FAILURE_STATE;
+        state.value_state = Value_state.FAILURE;
         dirty = true;
       } else {
-        state.value_state = APPLIED_STATE;
+        state.value_state = Value_state.APPLIED;
         written = true;
         data.present_value = config.set_value;
       }
     }
   }
 
   private Entry invalidValueStatus() {
-    return new Entry("Written value is not valid");
+    Entry entry = new Entry();
+    entry.message = "Written value is not valid";
+    return entry;
   }
 
   protected abstract boolean validateValue(Object set_value);
 
   private Entry notWritableStatus() {
-    return new Entry("Point is not writable");
+    Entry entry = new Entry();
+    entry.message = "Point is not writable";
+    return entry;
   }
 }