Skip to content

Commit ac6e151

Browse files
winridwinrid
committed
0.0.15 making status less type safe until we figure out the schema issues...
1 parent b7ac7ee commit ac6e151

File tree

7 files changed

+18
-20
lines changed

7 files changed

+18
-20
lines changed

‎client/api/openapi.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4365,7 +4365,7 @@ components:
43654365
additionalProperties: false
43664366
properties:
43674367
status:
4368-
$ref: '#/components/schemas/ImportedAPIStatus.SUCCESS'
4368+
type: string
43694369
feedPosts:
43704370
items:
43714371
$ref: '#/components/schemas/FeedPost'
@@ -4509,7 +4509,7 @@ components:
45094509
key: true
45104510
user: ""
45114511
tenantIdWS: tenantIdWS
4512-
status: success
4512+
status: status
45134513
ReactFeedPostResponse:
45144514
additionalProperties: false
45154515
example:

‎client/docs/GetPublicFeedPostsResponse.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
| Name | Type | Description | Notes |
99
|------------ | ------------- | ------------- | -------------|
10-
|**status** | **ImportedAPIStatusSUCCESS** | | |
10+
|**status** | **String** | | |
1111
|**feedPosts** | [**List<FeedPost>**](FeedPost.md) | | |
1212
|**user** | [**UserSessionInfo**](UserSessionInfo.md) | | |
1313

‎client/docs/PublicFeedPostsResponse.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
| Name | Type | Description | Notes |
99
|------------ | ------------- | ------------- | -------------|
10-
|**status** | **ImportedAPIStatusSUCCESS** | | |
10+
|**status** | **String** | | |
1111
|**feedPosts** | [**List<FeedPost>**](FeedPost.md) | | |
1212
|**user** | [**UserSessionInfo**](UserSessionInfo.md) | | |
1313
|**urlIdWS** | **String** | | [optional] |

‎client/src/main/java/com/fastcomments/model/GetPublicFeedPostsResponse.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import java.util.Objects;
1717
import com.fastcomments.model.FeedPost;
18-
import com.fastcomments.model.ImportedAPIStatusSUCCESS;
1918
import com.fastcomments.model.UserSessionInfo;
2019
import com.google.gson.TypeAdapter;
2120
import com.google.gson.annotations.JsonAdapter;
@@ -58,7 +57,7 @@ public class GetPublicFeedPostsResponse {
5857
public static final String SERIALIZED_NAME_STATUS = "status";
5958
@SerializedName(SERIALIZED_NAME_STATUS)
6059
@javax.annotation.Nonnull
61-
private ImportedAPIStatusSUCCESS status;
60+
private String status;
6261

6362
public static final String SERIALIZED_NAME_FEED_POSTS = "feedPosts";
6463
@SerializedName(SERIALIZED_NAME_FEED_POSTS)
@@ -73,7 +72,7 @@ public class GetPublicFeedPostsResponse {
7372
public GetPublicFeedPostsResponse() {
7473
}
7574

76-
public GetPublicFeedPostsResponse status(@javax.annotation.Nonnull ImportedAPIStatusSUCCESS status) {
75+
public GetPublicFeedPostsResponse status(@javax.annotation.Nonnull String status) {
7776
this.status = status;
7877
return this;
7978
}
@@ -83,11 +82,11 @@ public GetPublicFeedPostsResponse status(@javax.annotation.Nonnull ImportedAPISt
8382
* @return status
8483
*/
8584
@javax.annotation.Nonnull
86-
public ImportedAPIStatusSUCCESS getStatus() {
85+
public String getStatus() {
8786
return status;
8887
}
8988

90-
public void setStatus(@javax.annotation.Nonnull ImportedAPIStatusSUCCESS status) {
89+
public void setStatus(@javax.annotation.Nonnull String status) {
9190
this.status = status;
9291
}
9392

@@ -226,8 +225,9 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
226225
}
227226
}
228227
JsonObject jsonObj = jsonElement.getAsJsonObject();
229-
// validate the required field `status`
230-
ImportedAPIStatusSUCCESS.validateJsonElement(jsonObj.get("status"));
228+
if (!jsonObj.get("status").isJsonPrimitive()) {
229+
throw new IllegalArgumentException(String.format("Expected the field `status` to be a primitive type in the JSON string but got `%s`", jsonObj.get("status").toString()));
230+
}
231231
// ensure the json data is an array
232232
if (!jsonObj.get("feedPosts").isJsonArray()) {
233233
throw new IllegalArgumentException(String.format("Expected the field `feedPosts` to be an array in the JSON string but got `%s`", jsonObj.get("feedPosts").toString()));

‎client/src/main/java/com/fastcomments/model/PublicFeedPostsResponse.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import java.util.Objects;
1717
import com.fastcomments.model.FeedPost;
18-
import com.fastcomments.model.ImportedAPIStatusSUCCESS;
1918
import com.fastcomments.model.UserSessionInfo;
2019
import com.google.gson.TypeAdapter;
2120
import com.google.gson.annotations.JsonAdapter;
@@ -60,7 +59,7 @@ public class PublicFeedPostsResponse {
6059
public static final String SERIALIZED_NAME_STATUS = "status";
6160
@SerializedName(SERIALIZED_NAME_STATUS)
6261
@javax.annotation.Nonnull
63-
private ImportedAPIStatusSUCCESS status;
62+
private String status;
6463

6564
public static final String SERIALIZED_NAME_FEED_POSTS = "feedPosts";
6665
@SerializedName(SERIALIZED_NAME_FEED_POSTS)
@@ -95,7 +94,7 @@ public class PublicFeedPostsResponse {
9594
public PublicFeedPostsResponse() {
9695
}
9796

98-
public PublicFeedPostsResponse status(@javax.annotation.Nonnull ImportedAPIStatusSUCCESS status) {
97+
public PublicFeedPostsResponse status(@javax.annotation.Nonnull String status) {
9998
this.status = status;
10099
return this;
101100
}
@@ -105,11 +104,11 @@ public PublicFeedPostsResponse status(@javax.annotation.Nonnull ImportedAPIStatu
105104
* @return status
106105
*/
107106
@javax.annotation.Nonnull
108-
public ImportedAPIStatusSUCCESS getStatus() {
107+
public String getStatus() {
109108
return status;
110109
}
111110

112-
public void setStatus(@javax.annotation.Nonnull ImportedAPIStatusSUCCESS status) {
111+
public void setStatus(@javax.annotation.Nonnull String status) {
113112
this.status = status;
114113
}
115114

@@ -344,8 +343,9 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
344343
}
345344
}
346345
JsonObject jsonObj = jsonElement.getAsJsonObject();
347-
// validate the required field `status`
348-
ImportedAPIStatusSUCCESS.validateJsonElement(jsonObj.get("status"));
346+
if (!jsonObj.get("status").isJsonPrimitive()) {
347+
throw new IllegalArgumentException(String.format("Expected the field `status` to be a primitive type in the JSON string but got `%s`", jsonObj.get("status").toString()));
348+
}
349349
// ensure the json data is an array
350350
if (!jsonObj.get("feedPosts").isJsonArray()) {
351351
throw new IllegalArgumentException(String.format("Expected the field `feedPosts` to be an array in the JSON string but got `%s`", jsonObj.get("feedPosts").toString()));

‎client/src/test/java/com/fastcomments/model/GetPublicFeedPostsResponseTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
package com.fastcomments.model;
1515

1616
import com.fastcomments.model.FeedPost;
17-
import com.fastcomments.model.ImportedAPIStatusSUCCESS;
1817
import com.fastcomments.model.UserSessionInfo;
1918
import com.google.gson.TypeAdapter;
2019
import com.google.gson.annotations.JsonAdapter;

‎client/src/test/java/com/fastcomments/model/PublicFeedPostsResponseTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
package com.fastcomments.model;
1515

1616
import com.fastcomments.model.FeedPost;
17-
import com.fastcomments.model.ImportedAPIStatusSUCCESS;
1817
import com.fastcomments.model.UserSessionInfo;
1918
import com.google.gson.TypeAdapter;
2019
import com.google.gson.annotations.JsonAdapter;

0 commit comments

Comments
 (0)