diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab6a1b2..14f59f4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,7 +39,7 @@ jobs: ./gradlew test - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v5 with: token: ${{ secrets.CODECOV_TOKEN }} fail_ci_if_error: true diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index f903bb1..078ad30 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -4,6 +4,11 @@ Repo for code shared between Java services. +## VERSION: 0.3.1 (Release 4/21/25) + +* Restored the JobState class, which was removed in version 0.1.0 is 2019. It was no longer + used in this repo, but is still used in `kb_sdk` async Java clients. + ## VERSION: 0.3.0 (Release 4/24/24) * The GetMongoDB class has been removed. @@ -24,8 +29,8 @@ Repo for code shared between Java services. ## VERSION: 0.1.0 (Release 11/12/19) -* JsonServerServlet method dispatch to the Narrative Job Service (via *_async and *_check) methods - has been removed. +* JsonServerServlet method dispatch to the Narrative Job Service (via `*_async` and `*_check`) + methods has been removed. * This includes removing the us.kbase.common.service.JobState class. * JsonServerServlet automatic provenance generation has been removed. * Java required version is now 1.8. diff --git a/src/main/java/us/kbase/common/service/JobState.java b/src/main/java/us/kbase/common/service/JobState.java new file mode 100644 index 0000000..7bacb7d --- /dev/null +++ b/src/main/java/us/kbase/common/service/JobState.java @@ -0,0 +1,107 @@ +package us.kbase.common.service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + + +// NOTE: This class is not used in this repo, but is required for kb_sdk[_plus] Java async clients. + +/** + *

Original spec-file type: JobState

+ *
+ * finished - indicates whether job is done (including error cases) or not,
+ *     if the value is true then either of 'returned_data' or 'detailed_error'
+ *     should be defined;
+ * ujs_url - url of UserAndJobState service used by job service
+ * status - tuple returned by UserAndJobState.get_job_status method
+ * result - keeps exact copy of what original server method puts
+ *     in result block of JSON RPC response;
+ * error - keeps exact copy of what original server method puts
+ *     in error block of JSON RPC response.
+ * 
+ * + */ +@JsonInclude(JsonInclude.Include.NON_NULL) +@Generated("com.googlecode.jsonschema2pojo") +@JsonPropertyOrder({ + "finished", + "ujs_url", + "status", + "result", + "error" +}) +public class JobState { + + @JsonProperty("finished") + private Long finished; + @JsonProperty("ujs_url") + private String ujsUrl; + @JsonProperty("status") + private List status; + @JsonProperty("result") + private T result; + private Map additionalProperties = new HashMap(); + + @JsonProperty("finished") + public Long getFinished() { + return finished; + } + + @JsonProperty("finished") + public void setFinished(Long finished) { + this.finished = finished; + } + + @JsonProperty("ujs_url") + public String getUjsUrl() { + return ujsUrl; + } + + @JsonProperty("ujs_url") + public void setUjsUrl(String ujsUrl) { + this.ujsUrl = ujsUrl; + } + + @JsonProperty("status") + public List getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(List status) { + this.status = status; + } + + @JsonProperty("result") + public T getResult() { + return result; + } + + @JsonProperty("result") + public void setResult(T result) { + this.result = result; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperties(String name, Object value) { + this.additionalProperties.put(name, value); + } + + @Override + public String toString() { + return ((((((((((("JobState"+" [finished=")+ finished)+", ujsUrl=")+ ujsUrl)+", status=")+ status)+", result=")+ result)+", additionalProperties=")+ additionalProperties)+"]"); + } +} +