Skip to content

Commit

Permalink
Make tool use mutually exclusive (faucetsdn#987)
Browse files Browse the repository at this point in the history
  • Loading branch information
grafnu authored Oct 11, 2024
1 parent 08e9934 commit 0b0b15b
Show file tree
Hide file tree
Showing 23 changed files with 143 additions and 596 deletions.
12 changes: 5 additions & 7 deletions .gencode_hash.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@ e3683cb4561b6dda5703cb659fd6a8f12242725de389709a12eb45f146cbb295 gencode/docs/e
c8a40993b2810dffb9119469f83592461d817c7148072203f157b89922187e7c gencode/docs/persistent_device.html
5d039d607af9ec75ee552dfe36b16c702687ea16f5663f41fc49b4533b86e00d gencode/docs/properties.html
16512c8cc60e4f1a0e01555f3fb6c8a49d3f2b609275a8dc9e62f38fa7b404ca gencode/docs/query_cloud.html
7de373cef78518480a6f19c321b09e96c02aad00bde1817de4c31418e534a809 gencode/docs/readme.md
eeafb6e89a6c43816cfcb26244a95615a4ee75966e1c015cae5a13b6cfcb0078 gencode/docs/readme.md
741b880216be3743f6747800a042f2dbd89f3b0344c6b0a965f4bc010f03a930 gencode/docs/schema_doc.css
878ea88206c974f40643c3cc430875f9c4e8c5e3fd6bcd6358bd3eb6d48699a9 gencode/docs/schema_doc.min.js
7ed934930aee763e0beebc349725ba3909115e8d346bb762f28bcbe745bb163a gencode/docs/schema_extras.js
0f16008af7116a182322736046b05c2718ac8b1f2cd755a60d28c9cfaeb6a8a9 gencode/docs/site_metadata.html
12a32a1555e58e6ba35566e6613eea5f9b70f80a02d58146ad250acb830cf378 gencode/docs/state.html
b2398e7f9e352c47867e38f97168f3eb88e23280c7dd576f13e038c8c3f714c9 gencode/docs/state_mapping.html
26a68053bfe56d031b08d887f2c29f7bc663a408720a7fb8c0c4b7af4287d96f gencode/docs/state_udmi.html
f2ee2c60326e8b2bc33c6897387bb9eeacf8313b55959dfd9d001d4e6e6479e9 gencode/docs/state_validation.html
a9ac875562f5f5431e6f090cd63950e452c2fff43a221561929a0747e775964d gencode/java/udmi/schema/Adjunct.java
0e0d87fa6bc2f746eaacfbcd0f1258c9c6beee2b03d995868af9aafcbc4a88dc gencode/java/udmi/schema/Area.java
Expand Down Expand Up @@ -117,11 +116,10 @@ d87deaba67bb3272c528e3491d378bde059b626964a4a2aed15f5643305c2463 gencode/java/u
4cdd5dc6b2e054a43f2e70adeb46ef8e3ff78288d4315923a925415f87e871aa gencode/java/udmi/schema/PubberConfiguration.java
078be5eaf90e5eba1bc99252be3a11a99fdbcad0685ca82c070af1a8e956ff50 gencode/java/udmi/schema/PubberOptions.java
9fba0aec550c20d32b8fccf364e66fe854d33400559402248bc118e89709dfda gencode/java/udmi/schema/RefDiscovery.java
7f18815cf6567e5ec7f96d053bc9bf7d82d0838d4b0833f8355e71310dd6ed21 gencode/java/udmi/schema/ReplyUdmiConfig.java
14faa115d13ee46d10935b13753bff85758f3b64b5136a59f60d36b5b541687c gencode/java/udmi/schema/SchemaValidationState.java
0284c992b20c1f5a353dda0d040db39ba76184cfb70dc2ba3fd00d9d667e4191 gencode/java/udmi/schema/SequenceValidationState.java
f1da39b7c8b9784e4ad51ef08dc73381cd8e0f4f7dcc903edcf0898c51d86d25 gencode/java/udmi/schema/SetupUdmiConfig.java
8222ba7061afdb437f27503384db6a7edc4c6354e47ff29bebd5319f93bdf6db gencode/java/udmi/schema/SetupUdmiState.java
158ca584a225a422af3143b6db05b56e91bcf26a3a4a2d1d4efee53f935b9415 gencode/java/udmi/schema/SetupUdmiState.java
8fcb31df1070010da6d3ae61d741a77d2ce8b3757226bbe35ff9218a0581b1ec gencode/java/udmi/schema/SiteLinks.java
a3dc7f14d4270ea370db2015785ad12d4bd61825213ab7ac4ee03dda21dde4f2 gencode/java/udmi/schema/SiteLocation.java
d1effacea13d7a859f256c26fae214d959dca879b14ffba0d4af51dfa552152a gencode/java/udmi/schema/SiteMetadata.java
Expand All @@ -137,7 +135,7 @@ fb3b391c375d69770029a0561ffb833f90e272ff2a0f4c10385e69b76a6e0c21 gencode/java/u
7db128c5607f7f2a701e60895da9f49ae8b2c75a8daf7792fd155d537978fdd0 gencode/java/udmi/schema/TargetTestingModel.java
f9c304ff024f26654ee7f6a06661a825dfaf312a4fffd0cf753f4eea5958060b gencode/java/udmi/schema/TestingModel.java
6e2a7c00d3f228d798ab67d5f843b379f97d03a31afe3e7a9124f5f0473ff287 gencode/java/udmi/schema/TestingSystemConfig.java
0b6f99b40e38ca3d86d8ff5c8c5d55c4ca44a19ff678e87e48f1a38e5d9390ea gencode/java/udmi/schema/UdmiConfig.java
18720de528285d01e9dbe891af0ad043e291dd848f4b35dd1413462eb9ff0d6d gencode/java/udmi/schema/UdmiConfig.java
38e283a1c8b904c9953ec873279d5194373a33669e57ee2e5f8c5d058396f6cd gencode/java/udmi/schema/UdmiEvents.java
38f3439b89314c873102d71d9a7ecaf8f3096c8a15dc113382fc9a18f1225c2e gencode/java/udmi/schema/UdmiState.java
089275574b2b0330df77b63361ddec9114618d648062ce3d2b6c54799796893e gencode/java/udmi/schema/ValidationEvents.java
Expand Down Expand Up @@ -167,7 +165,7 @@ ac3facbd96f7cb2f7e387e7497d6a36af379a2687329571f250c5670f9933244 gencode/python
5444c5eb6971addf729566e39e7eb13dd8b78dceeeab3ef8a6ec3d2a7f5ed25c gencode/python/udmi/schema/config_pointset_point.py
7da3bdb37f338260d5f3829fa5fcbb9bbf9f146b514a68319c314a96c6b8ac12 gencode/python/udmi/schema/config_system.py
b15c649657d0fb2a102a3e1ff9653c9002715d3b412d44c544a080c37b6a9811 gencode/python/udmi/schema/config_system_testing.py
d8eff8b947c37b9f969c06cc4f50a6b0037548b26c0b5b0e88845058e30cb82c gencode/python/udmi/schema/config_udmi.py
b35b27fc4908bf02bef530d58cc5f6991427f50a73b60174b6ffaecedbdb3ed9 gencode/python/udmi/schema/config_udmi.py
cd72d3ebc324e2db939e4161a9df246adaeb2dabecc8e9c4305ebbc5984bf2a4 gencode/python/udmi/schema/configuration_endpoint.py
802e6433c9471cd1c0a67d44d31ab5991131965127569dff96328457a2f9eb3b gencode/python/udmi/schema/configuration_execution.py
8f65402ddb43815f4482b1c0c965d44c390dbe1561899b3d9df572458ceb97cc gencode/python/udmi/schema/configuration_pod.py
Expand Down Expand Up @@ -230,7 +228,7 @@ ee5cc804c59d8216cc3555741748c2d67e30ad5ac2a801ad18b44569835e4f75 gencode/python
1b313e7c02ed0af08db89453ec6acee7571f9a2af0e289ac6f3f9be3df6928f5 gencode/python/udmi/schema/state_system.py
8a0bf4294fb70533a056322a6bfc6f13a963381d2100d1468d8b6de757cd72e9 gencode/python/udmi/schema/state_system_hardware.py
37c55dce0e38dddad3cebb3d40270128a4dbb7b586657d1746bb96dac90e2ac1 gencode/python/udmi/schema/state_system_operation.py
b69b9a7f9afaaf3c755d54f97d20cd4749f18391ae7fa5f2d7ef4bed7926e6a9 gencode/python/udmi/schema/state_udmi.py
63bd0332a5ee71a2070acb0087c7f4891e9d2fd8816668c2196478482a8a1d81 gencode/python/udmi/schema/state_udmi.py
ad977860afed7a2e7e895e3270350cdf847ffcd24d65d102ecefbdf100908987 gencode/python/udmi/schema/state_validation.py
69fd8989cff79d3dd1e0396993965112f4bc5d8fb1360e8477b433d202519f75 gencode/python/udmi/schema/state_validation_capability.py
5d24e4bf0fa0213d380e8058f562f6b9382041ade57cd7d6d9d38d84a68aa1fd gencode/python/udmi/schema/state_validation_feature.py
Expand Down
3 changes: 2 additions & 1 deletion common/src/main/java/com/google/udmi/util/Common.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public abstract class Common {
public static final String NAMESPACE_SEPARATOR = "~";
private static final String UDMI_VERSION_ENV = "UDMI_TOOLS";
public static final int EXIT_CODE_ERROR = 1;
public static final String UNKNOWN_UDMI_VERSION = "unknown";

/**
* Remove the next item from the list in an exception-safe way.
Expand Down Expand Up @@ -111,7 +112,7 @@ public static String getExceptionMessage(Throwable exception) {
}

public static String getUdmiVersion() {
return Optional.ofNullable(System.getenv(UDMI_VERSION_ENV)).orElse("unknown");
return Optional.ofNullable(System.getenv(UDMI_VERSION_ENV)).orElse(UNKNOWN_UDMI_VERSION);
}

/**
Expand Down
1 change: 0 additions & 1 deletion gencode/docs/readme.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0b0b15b

Please sign in to comment.