Skip to content

Update minimum UDMI functions version 19 (require latest) #1315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
noursaidi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update minimum UDMI functions version 19 (require latest) #1315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions services/src/main/java/com/google/bos/iot/core/bambi/LocalSiteModelManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import static com.google.udmi.util.JsonUtil.isoConvert;
import static com.google.udmi.util.JsonUtil.nestFlattenedJson;
import static com.google.udmi.util.JsonUtil.writeFormattedFile;
import static udmi.util.SchemaVersion.VERSION_1_5_2;
import static udmi.util.SchemaVersion.VERSION_1_5_3;

import com.fasterxml.jackson.databind.JsonNode;
import java.io.File;
Expand Down Expand Up @@ -216,7 +216,7 @@ private Map<String, String> mergeDeviceMetadata(Map<String, String> originalData
updateTimestamp(originalData, true);
}
if (!originalData.containsKey(VERSION_KEY)) {
originalData.put(VERSION_KEY, VERSION_1_5_2.key());
originalData.put(VERSION_KEY, VERSION_1_5_3.key());
}
// Merge all data including any renamed points
Map<String, String> mergedData = merge(originalData, receivedUpdate, true);
Expand Down
4 changes: 2 additions & 2 deletions udmis/src/main/java/com/google/bos/udmi/service/pod/ContainerBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
public abstract class ContainerBase implements UdmiComponent {

public static final String INITIAL_EXECUTION_CONTEXT = "xxxxxxxx";
public static final Integer FUNCTIONS_VERSION_MIN = 18;
public static final Integer FUNCTIONS_VERSION_MAX = 18;
public static final Integer FUNCTIONS_VERSION_MIN = 19;
public static final Integer FUNCTIONS_VERSION_MAX = 19;
public static final String EMPTY_JSON = "{}";
public static final String REFLECT_BASE = "UDMI-REFLECT";
private static final ThreadLocal<String> executionContext = new ThreadLocal<>();
Expand Down
2 changes: 1 addition & 1 deletion validator/src/main/java/com/google/daq/mqtt/util/ConfigUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
public abstract class ConfigUtil {

public static final String EXCEPTIONS_JSON = "exceptions.json";
public static final String UDMI_VERSION = "1.5.2";
public static final String UDMI_VERSION = "1.5.3";
public static final String UDMI_TOOLS = System.getenv(UDMI_VERSION_KEY);
public static final File UDMI_ROOT = new File(ofNullable(System.getenv("UDMI_ROOT")).orElse("."));

Expand Down
2 changes: 1 addition & 1 deletion validator/src/main/java/com/google/daq/mqtt/validator/Validator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
*/
public class Validator {

public static final int TOOLS_FUNCTIONS_VERSION = 18;
public static final int TOOLS_FUNCTIONS_VERSION = 19;
public static final String PROJECT_PROVIDER_PREFIX = "//";
public static final String TIMESTAMP_ZULU_SUFFIX = "Z";
public static final String TIMESTAMP_UTC_SUFFIX_1 = "+00:00";
Expand Down
Loading