From 9700ceadb3b0f9a37f7f847b303d4a26f09c8d04 Mon Sep 17 00:00:00 2001 From: anthony-symphony <46792802+anthony-symphony@users.noreply.github.com> Date: Wed, 24 Apr 2024 13:42:43 -0400 Subject: [PATCH 1/4] recipientTenantIds Fix --- .../src/main/java/model/Stream.java | 9 +++++++++ .../java/model/events/SymphonyElementsAction.java | 15 +++++++-------- .../bdk/bot/sdk/event/model/StreamDetails.java | 2 ++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/symphony-api-client-java/src/main/java/model/Stream.java b/symphony-api-client-java/src/main/java/model/Stream.java index c63f1d378..a47c0b50a 100755 --- a/symphony-api-client-java/src/main/java/model/Stream.java +++ b/symphony-api-client-java/src/main/java/model/Stream.java @@ -12,6 +12,7 @@ public class Stream { private List members; private Boolean external; private Boolean crossPod; + private List recipientTenantIds; public String getStreamId() { return streamId; @@ -60,4 +61,12 @@ public Boolean getCrossPod() { public void setCrossPod(Boolean crossPod) { this.crossPod = crossPod; } + + public List getRecipientTenantIds() { + return recipientTenantIds; + } + + public void setRecipientTenantIds(List recipientTenantIds) { + this.recipientTenantIds = recipientTenantIds; + } } diff --git a/symphony-api-client-java/src/main/java/model/events/SymphonyElementsAction.java b/symphony-api-client-java/src/main/java/model/events/SymphonyElementsAction.java index b59809e6e..0a6d49ef4 100644 --- a/symphony-api-client-java/src/main/java/model/events/SymphonyElementsAction.java +++ b/symphony-api-client-java/src/main/java/model/events/SymphonyElementsAction.java @@ -1,19 +1,21 @@ package model.events; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import model.Stream; + import java.util.Map; @JsonIgnoreProperties(ignoreUnknown = true) public class SymphonyElementsAction { private Map formStream; - private Map stream; + private Stream stream; private String formId; private Map formValues; private String formMessageId; public String getStreamId() { - if (stream != null && stream.get("streamId") != null) { - return stream.get("streamId"); + if (stream != null && stream.getStreamId() != null) { + return stream.getStreamId(); } if (formStream != null && formStream.get("streamId") != null) { return formStream.get("streamId") @@ -25,17 +27,14 @@ public String getStreamId() { } public String getStreamType() { - if (stream != null && stream.get("streamType") != null) { - return stream.get("streamType"); - } - return null; + return stream.getStreamType(); } public void setFormStream(Map formStream) { this.formStream = formStream; } - public void setStream(Map stream) { + public void setStream(Stream stream) { this.stream = stream; } diff --git a/symphony-bdk-bot-sdk-java/src/main/java/com/symphony/bdk/bot/sdk/event/model/StreamDetails.java b/symphony-bdk-bot-sdk-java/src/main/java/com/symphony/bdk/bot/sdk/event/model/StreamDetails.java index c7b4fd806..a4e200e4f 100644 --- a/symphony-bdk-bot-sdk-java/src/main/java/com/symphony/bdk/bot/sdk/event/model/StreamDetails.java +++ b/symphony-bdk-bot-sdk-java/src/main/java/com/symphony/bdk/bot/sdk/event/model/StreamDetails.java @@ -24,6 +24,7 @@ public class StreamDetails { private List members; private Boolean external; private Boolean crossPod; + private List recipientTenantIds; public StreamDetails(Stream stream) { this.streamType = StreamType.value(stream.getStreamType().toUpperCase()); @@ -32,6 +33,7 @@ public StreamDetails(Stream stream) { : stream.getMembers().stream().map(UserDetails::new).collect(Collectors.toList()); this.external = stream.getExternal(); this.crossPod = stream.getCrossPod(); + this.recipientTenantIds = stream.getRecipientTenantIds(); } } From ccbeb6f548af719dd80b1fc033a633c8aea783e4 Mon Sep 17 00:00:00 2001 From: anthony-symphony <46792802+anthony-symphony@users.noreply.github.com> Date: Wed, 24 Apr 2024 13:43:11 -0400 Subject: [PATCH 2/4] JsonIgnoreProperties fix --- .../src/main/java/model/datafeed/DatafeedV2.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/symphony-api-client-java/src/main/java/model/datafeed/DatafeedV2.java b/symphony-api-client-java/src/main/java/model/datafeed/DatafeedV2.java index 89fba6f37..97453c3ef 100644 --- a/symphony-api-client-java/src/main/java/model/datafeed/DatafeedV2.java +++ b/symphony-api-client-java/src/main/java/model/datafeed/DatafeedV2.java @@ -2,11 +2,12 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -@JsonIgnoreProperties() +@JsonIgnoreProperties(ignoreUnknown = true) public class DatafeedV2 { private String id; private Long createdAt; + private String type; public String getId() { return id; @@ -23,4 +24,12 @@ public Long getCreatedAt() { public void setCreatedAt(Long createdAt) { this.createdAt = createdAt; } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } } From a794515e268a04b98463e95e1a354185b7a7f96a Mon Sep 17 00:00:00 2001 From: anthony-symphony <46792802+anthony-symphony@users.noreply.github.com> Date: Wed, 24 Apr 2024 13:46:58 -0400 Subject: [PATCH 3/4] JsonIgnoreProperties to any model missing it --- symphony-api-client-java/src/main/java/model/AdminNewUser.java | 3 +++ .../src/main/java/model/AdminStreamFilter.java | 3 +++ .../src/main/java/model/AdminUserInfoList.java | 3 +++ .../src/main/java/model/AppAuthResponse.java | 3 +++ symphony-api-client-java/src/main/java/model/Application.java | 3 +++ .../src/main/java/model/ApplicationEntitlementList.java | 3 +++ .../src/main/java/model/ApplicationInfo.java | 3 +++ .../src/main/java/model/ApplicationProduct.java | 3 +++ symphony-api-client-java/src/main/java/model/AvatarList.java | 3 +++ .../src/main/java/model/DropdownMenuOption.java | 3 +++ .../src/main/java/model/FeatureEntitlement.java | 3 +++ .../src/main/java/model/FeatureEntitlementList.java | 3 +++ .../src/main/java/model/InboundImportMessage.java | 3 +++ .../src/main/java/model/InboundImportMessageList.java | 3 +++ .../src/main/java/model/InboundMessageList.java | 3 +++ symphony-api-client-java/src/main/java/model/MemberList.java | 3 +++ .../src/main/java/model/OutboundImportMessage.java | 3 +++ .../src/main/java/model/OutboundImportMessageList.java | 3 +++ .../src/main/java/model/OutboundShare.java | 3 +++ symphony-api-client-java/src/main/java/model/Password.java | 3 +++ symphony-api-client-java/src/main/java/model/PodCert.java | 3 +++ symphony-api-client-java/src/main/java/model/SessionToken.java | 3 +++ symphony-api-client-java/src/main/java/model/SignalList.java | 3 +++ .../src/main/java/model/SignalSubscriber.java | 3 +++ .../src/main/java/model/SignalSubscriberList.java | 3 +++ symphony-api-client-java/src/main/java/model/Status.java | 3 +++ .../src/main/java/model/StreamInfoList.java | 3 +++ symphony-api-client-java/src/main/java/model/UserFilter.java | 3 +++ .../src/main/java/model/events/AdminStreamInfoList.java | 3 +++ 29 files changed, 87 insertions(+) diff --git a/symphony-api-client-java/src/main/java/model/AdminNewUser.java b/symphony-api-client-java/src/main/java/model/AdminNewUser.java index 6420a2074..72ffb5f13 100644 --- a/symphony-api-client-java/src/main/java/model/AdminNewUser.java +++ b/symphony-api-client-java/src/main/java/model/AdminNewUser.java @@ -1,7 +1,10 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) public class AdminNewUser { private AdminUserAttributes userAttributes; diff --git a/symphony-api-client-java/src/main/java/model/AdminStreamFilter.java b/symphony-api-client-java/src/main/java/model/AdminStreamFilter.java index 98245bbe1..f45b09f38 100644 --- a/symphony-api-client-java/src/main/java/model/AdminStreamFilter.java +++ b/symphony-api-client-java/src/main/java/model/AdminStreamFilter.java @@ -1,7 +1,10 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) public class AdminStreamFilter { private List streamTypes; diff --git a/symphony-api-client-java/src/main/java/model/AdminUserInfoList.java b/symphony-api-client-java/src/main/java/model/AdminUserInfoList.java index 2f35aeecf..b90289b89 100644 --- a/symphony-api-client-java/src/main/java/model/AdminUserInfoList.java +++ b/symphony-api-client-java/src/main/java/model/AdminUserInfoList.java @@ -1,6 +1,9 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.ArrayList; +@JsonIgnoreProperties(ignoreUnknown = true) public class AdminUserInfoList extends ArrayList { } diff --git a/symphony-api-client-java/src/main/java/model/AppAuthResponse.java b/symphony-api-client-java/src/main/java/model/AppAuthResponse.java index 3d31843ca..48770e67a 100644 --- a/symphony-api-client-java/src/main/java/model/AppAuthResponse.java +++ b/symphony-api-client-java/src/main/java/model/AppAuthResponse.java @@ -1,5 +1,8 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class AppAuthResponse { private String appToken; private String symphonyToken; diff --git a/symphony-api-client-java/src/main/java/model/Application.java b/symphony-api-client-java/src/main/java/model/Application.java index 7525d0996..fcc4685cf 100644 --- a/symphony-api-client-java/src/main/java/model/Application.java +++ b/symphony-api-client-java/src/main/java/model/Application.java @@ -1,7 +1,10 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) public class Application { private ApplicationInfo applicationInfo; diff --git a/symphony-api-client-java/src/main/java/model/ApplicationEntitlementList.java b/symphony-api-client-java/src/main/java/model/ApplicationEntitlementList.java index 72fb732fc..11680297a 100644 --- a/symphony-api-client-java/src/main/java/model/ApplicationEntitlementList.java +++ b/symphony-api-client-java/src/main/java/model/ApplicationEntitlementList.java @@ -1,6 +1,9 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.ArrayList; +@JsonIgnoreProperties(ignoreUnknown = true) public class ApplicationEntitlementList extends ArrayList { } diff --git a/symphony-api-client-java/src/main/java/model/ApplicationInfo.java b/symphony-api-client-java/src/main/java/model/ApplicationInfo.java index 75747fa4a..2db14a45b 100644 --- a/symphony-api-client-java/src/main/java/model/ApplicationInfo.java +++ b/symphony-api-client-java/src/main/java/model/ApplicationInfo.java @@ -1,5 +1,8 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class ApplicationInfo { private String appId; diff --git a/symphony-api-client-java/src/main/java/model/ApplicationProduct.java b/symphony-api-client-java/src/main/java/model/ApplicationProduct.java index d5ff3e7e6..a917359c7 100644 --- a/symphony-api-client-java/src/main/java/model/ApplicationProduct.java +++ b/symphony-api-client-java/src/main/java/model/ApplicationProduct.java @@ -1,5 +1,8 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class ApplicationProduct { private String appId; diff --git a/symphony-api-client-java/src/main/java/model/AvatarList.java b/symphony-api-client-java/src/main/java/model/AvatarList.java index 0afb89ad4..21f0a874d 100644 --- a/symphony-api-client-java/src/main/java/model/AvatarList.java +++ b/symphony-api-client-java/src/main/java/model/AvatarList.java @@ -1,6 +1,9 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.ArrayList; +@JsonIgnoreProperties(ignoreUnknown = true) public class AvatarList extends ArrayList { } diff --git a/symphony-api-client-java/src/main/java/model/DropdownMenuOption.java b/symphony-api-client-java/src/main/java/model/DropdownMenuOption.java index 8c4abca2d..80ea435ff 100644 --- a/symphony-api-client-java/src/main/java/model/DropdownMenuOption.java +++ b/symphony-api-client-java/src/main/java/model/DropdownMenuOption.java @@ -1,5 +1,8 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class DropdownMenuOption { private String value; private String display; diff --git a/symphony-api-client-java/src/main/java/model/FeatureEntitlement.java b/symphony-api-client-java/src/main/java/model/FeatureEntitlement.java index 1152dbaf9..ce5cf30be 100644 --- a/symphony-api-client-java/src/main/java/model/FeatureEntitlement.java +++ b/symphony-api-client-java/src/main/java/model/FeatureEntitlement.java @@ -1,5 +1,8 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class FeatureEntitlement { private String entitlment; diff --git a/symphony-api-client-java/src/main/java/model/FeatureEntitlementList.java b/symphony-api-client-java/src/main/java/model/FeatureEntitlementList.java index cbdaf3902..d6b1455ac 100644 --- a/symphony-api-client-java/src/main/java/model/FeatureEntitlementList.java +++ b/symphony-api-client-java/src/main/java/model/FeatureEntitlementList.java @@ -1,6 +1,9 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.ArrayList; +@JsonIgnoreProperties(ignoreUnknown = true) public class FeatureEntitlementList extends ArrayList { } diff --git a/symphony-api-client-java/src/main/java/model/InboundImportMessage.java b/symphony-api-client-java/src/main/java/model/InboundImportMessage.java index 51b412faa..f0c3d422b 100644 --- a/symphony-api-client-java/src/main/java/model/InboundImportMessage.java +++ b/symphony-api-client-java/src/main/java/model/InboundImportMessage.java @@ -1,5 +1,8 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class InboundImportMessage { private String messageId; diff --git a/symphony-api-client-java/src/main/java/model/InboundImportMessageList.java b/symphony-api-client-java/src/main/java/model/InboundImportMessageList.java index ac046dec9..e905ec43b 100644 --- a/symphony-api-client-java/src/main/java/model/InboundImportMessageList.java +++ b/symphony-api-client-java/src/main/java/model/InboundImportMessageList.java @@ -1,6 +1,9 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.ArrayList; +@JsonIgnoreProperties(ignoreUnknown = true) public class InboundImportMessageList extends ArrayList { } diff --git a/symphony-api-client-java/src/main/java/model/InboundMessageList.java b/symphony-api-client-java/src/main/java/model/InboundMessageList.java index f684f2a40..748f10a17 100644 --- a/symphony-api-client-java/src/main/java/model/InboundMessageList.java +++ b/symphony-api-client-java/src/main/java/model/InboundMessageList.java @@ -1,6 +1,9 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.ArrayList; +@JsonIgnoreProperties(ignoreUnknown = true) public class InboundMessageList extends ArrayList { } diff --git a/symphony-api-client-java/src/main/java/model/MemberList.java b/symphony-api-client-java/src/main/java/model/MemberList.java index dd3a306f4..6b734c110 100755 --- a/symphony-api-client-java/src/main/java/model/MemberList.java +++ b/symphony-api-client-java/src/main/java/model/MemberList.java @@ -1,6 +1,9 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.ArrayList; +@JsonIgnoreProperties(ignoreUnknown = true) public class MemberList extends ArrayList { } diff --git a/symphony-api-client-java/src/main/java/model/OutboundImportMessage.java b/symphony-api-client-java/src/main/java/model/OutboundImportMessage.java index cd1bed9ca..d07ddd0f2 100644 --- a/symphony-api-client-java/src/main/java/model/OutboundImportMessage.java +++ b/symphony-api-client-java/src/main/java/model/OutboundImportMessage.java @@ -1,5 +1,8 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class OutboundImportMessage { private String message; private String data; diff --git a/symphony-api-client-java/src/main/java/model/OutboundImportMessageList.java b/symphony-api-client-java/src/main/java/model/OutboundImportMessageList.java index 679428995..b363e8345 100644 --- a/symphony-api-client-java/src/main/java/model/OutboundImportMessageList.java +++ b/symphony-api-client-java/src/main/java/model/OutboundImportMessageList.java @@ -1,6 +1,9 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.ArrayList; +@JsonIgnoreProperties(ignoreUnknown = true) public class OutboundImportMessageList extends ArrayList { } diff --git a/symphony-api-client-java/src/main/java/model/OutboundShare.java b/symphony-api-client-java/src/main/java/model/OutboundShare.java index d10358b90..6af5b9e8b 100644 --- a/symphony-api-client-java/src/main/java/model/OutboundShare.java +++ b/symphony-api-client-java/src/main/java/model/OutboundShare.java @@ -1,5 +1,8 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class OutboundShare { private String articleId; diff --git a/symphony-api-client-java/src/main/java/model/Password.java b/symphony-api-client-java/src/main/java/model/Password.java index d709b1ad4..689ba9636 100644 --- a/symphony-api-client-java/src/main/java/model/Password.java +++ b/symphony-api-client-java/src/main/java/model/Password.java @@ -1,5 +1,8 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class Password { private String hhSalt; private String hhPassword; diff --git a/symphony-api-client-java/src/main/java/model/PodCert.java b/symphony-api-client-java/src/main/java/model/PodCert.java index 586bb96f6..569315210 100644 --- a/symphony-api-client-java/src/main/java/model/PodCert.java +++ b/symphony-api-client-java/src/main/java/model/PodCert.java @@ -1,5 +1,8 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class PodCert { String certificate; diff --git a/symphony-api-client-java/src/main/java/model/SessionToken.java b/symphony-api-client-java/src/main/java/model/SessionToken.java index 31d6c5ee8..6f3341d2a 100644 --- a/symphony-api-client-java/src/main/java/model/SessionToken.java +++ b/symphony-api-client-java/src/main/java/model/SessionToken.java @@ -1,5 +1,8 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class SessionToken { private String sessionToken; diff --git a/symphony-api-client-java/src/main/java/model/SignalList.java b/symphony-api-client-java/src/main/java/model/SignalList.java index b372bf1cb..2b4b64fad 100644 --- a/symphony-api-client-java/src/main/java/model/SignalList.java +++ b/symphony-api-client-java/src/main/java/model/SignalList.java @@ -1,6 +1,9 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.ArrayList; +@JsonIgnoreProperties(ignoreUnknown = true) public class SignalList extends ArrayList { } diff --git a/symphony-api-client-java/src/main/java/model/SignalSubscriber.java b/symphony-api-client-java/src/main/java/model/SignalSubscriber.java index 492194673..250fa4e7d 100644 --- a/symphony-api-client-java/src/main/java/model/SignalSubscriber.java +++ b/symphony-api-client-java/src/main/java/model/SignalSubscriber.java @@ -1,5 +1,8 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class SignalSubscriber { private boolean pushed; diff --git a/symphony-api-client-java/src/main/java/model/SignalSubscriberList.java b/symphony-api-client-java/src/main/java/model/SignalSubscriberList.java index a0f57ba0c..35165764c 100644 --- a/symphony-api-client-java/src/main/java/model/SignalSubscriberList.java +++ b/symphony-api-client-java/src/main/java/model/SignalSubscriberList.java @@ -1,7 +1,10 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) public class SignalSubscriberList { private int offset; diff --git a/symphony-api-client-java/src/main/java/model/Status.java b/symphony-api-client-java/src/main/java/model/Status.java index aeeaabad4..c0b17b16e 100644 --- a/symphony-api-client-java/src/main/java/model/Status.java +++ b/symphony-api-client-java/src/main/java/model/Status.java @@ -1,5 +1,8 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class Status { private String status; diff --git a/symphony-api-client-java/src/main/java/model/StreamInfoList.java b/symphony-api-client-java/src/main/java/model/StreamInfoList.java index 85d982685..e1336b47a 100644 --- a/symphony-api-client-java/src/main/java/model/StreamInfoList.java +++ b/symphony-api-client-java/src/main/java/model/StreamInfoList.java @@ -1,6 +1,9 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.ArrayList; +@JsonIgnoreProperties(ignoreUnknown = true) public class StreamInfoList extends ArrayList { } diff --git a/symphony-api-client-java/src/main/java/model/UserFilter.java b/symphony-api-client-java/src/main/java/model/UserFilter.java index a4c38b59a..7f6f7f4fd 100644 --- a/symphony-api-client-java/src/main/java/model/UserFilter.java +++ b/symphony-api-client-java/src/main/java/model/UserFilter.java @@ -1,5 +1,8 @@ package model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class UserFilter { private String title; diff --git a/symphony-api-client-java/src/main/java/model/events/AdminStreamInfoList.java b/symphony-api-client-java/src/main/java/model/events/AdminStreamInfoList.java index 32dd1f52f..231dab6a6 100644 --- a/symphony-api-client-java/src/main/java/model/events/AdminStreamInfoList.java +++ b/symphony-api-client-java/src/main/java/model/events/AdminStreamInfoList.java @@ -1,9 +1,12 @@ package model.events; import java.util.List; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import model.AdminStreamFilter; import model.AdminStreamInfo; +@JsonIgnoreProperties(ignoreUnknown = true) public class AdminStreamInfoList { private int count; From 66e4f0239f49e4a66c9d9924a801680edb1ec39f Mon Sep 17 00:00:00 2001 From: anthony-symphony <46792802+anthony-symphony@users.noreply.github.com> Date: Thu, 25 Apr 2024 12:24:50 -0400 Subject: [PATCH 4/4] Vulnerability Fixes --- build.gradle | 39 ++++++++++++++++++------------ sms-sdk-renderer-java/build.gradle | 6 +---- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index f5574d588..56ffa13d6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ description = 'Symphony Java BDK Legacy Modules' -ext.projectVersion = '1.3.8' +ext.projectVersion = '1.3.9-SNAPSHOT' ext.isReleaseVersion = !ext.projectVersion.endsWith('SNAPSHOT') ext.mavenRepoUrl = project.properties['mavenRepoUrl'] ?: 'https://oss.sonatype.org/service/local/staging/deploy/maven2/' @@ -46,10 +46,13 @@ buildscript { } dependencies { classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.22.0' + classpath("gradle.plugin.io.snyk.gradle.plugin:snyk:0.6.1") } } apply plugin: 'io.codearte.nexus-staging' +apply plugin: "io.snyk.gradle.plugin.snykplugin" + nexusStaging { username = rootProject.ext.mavenRepoUsername @@ -82,11 +85,16 @@ subprojects { compileOnly 'org.projectlombok:lombok:1.18.16' annotationProcessor 'org.projectlombok:lombok:1.18.16' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.2' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.0' - implementation 'com.github.jknack:handlebars-guava-cache:4.2.0' - implementation 'com.github.jknack:handlebars-jackson2:4.2.0' - implementation 'com.github.jknack:handlebars:4.2.0' + implementation 'com.github.jknack:handlebars-guava-cache:4.3.1' + implementation 'com.github.jknack:handlebars-jackson2:4.3.1' + implementation 'com.github.jknack:handlebars:4.3.1' + implementation ('com.google.guava:guava:33.1.0-jre'){ + attributes{ + attribute(Attribute.of("org.gradle.jvm.environment", String),"standard-jvm") + } + } implementation 'com.google.code.findbugs:jsr305:3.0.2' implementation 'com.googlecode.json-simple:json-simple:1.1.1' @@ -98,6 +106,7 @@ subprojects { implementation 'io.github.resilience4j:resilience4j-bulkhead:1.4.0' implementation 'io.github.resilience4j:resilience4j-circuitbreaker:1.4.0' implementation 'io.github.resilience4j:resilience4j-retry:1.4.0' + implementation 'io.jsonwebtoken:jjwt:0.9.1' implementation 'io.springfox:springfox-swagger2:2.10.0' @@ -106,11 +115,11 @@ subprojects { implementation 'javax.servlet:javax.servlet-api:4.0.1' implementation 'javax.xml.bind:jaxb-api:2.3.1' implementation 'org.apiguardian:apiguardian-api:1.1.0' - implementation 'org.bitbucket.b_c:jose4j:0.7.2' + implementation 'org.bitbucket.b_c:jose4j:0.9.6' implementation 'org.glassfish.jersey.connectors:jersey-apache-connector:2.34' implementation 'org.glassfish.jersey.core:jersey-client:2.34' implementation 'org.glassfish.jersey.inject:jersey-hk2:2.34' - implementation 'org.glassfish.jersey.media:jersey-media-json-jackson:2.34' + implementation 'org.glassfish.jersey.media:jersey-media-json-jackson:2.42' implementation 'org.glassfish.jersey.media:jersey-media-multipart:2.34' implementation 'org.owasp.esapi:esapi:2.2.3.1' implementation 'org.owasp.antisamy:antisamy:1.6.4' @@ -118,14 +127,14 @@ subprojects { implementation 'org.slf4j:slf4j-api:1.7.32' - implementation 'org.springframework.boot:spring-boot-starter-security:2.6.1' - implementation 'org.springframework.boot:spring-boot-starter-web:2.6.1' - implementation 'org.springframework.boot:spring-boot-starter-aop:2.6.1' - implementation 'org.springframework.boot:spring-boot-starter-actuator:2.6.1' - implementation 'org.springframework.boot:spring-boot-starter-test:2.6.1' - implementation 'org.springframework.security:spring-security-test:5.6.0' + implementation 'org.springframework.boot:spring-boot-starter-security:2.7.18' + implementation 'org.springframework.boot:spring-boot-starter-web:2.7.18' + implementation 'org.springframework.boot:spring-boot-starter-aop:2.7.18' + implementation 'org.springframework.boot:spring-boot-starter-actuator:2.7.18' + implementation 'org.springframework.boot:spring-boot-starter-test:2.7.18' + implementation 'org.springframework.security:spring-security-test:5.8.12' - implementation 'org.symphonyoss.symphony:messageml:0.9.81' + implementation 'org.symphonyoss.symphony:messageml:0.12.0' implementation 'io.micrometer:micrometer-registry-prometheus:1.5.1' testCompileOnly 'org.projectlombok:lombok:1.18.16' @@ -133,7 +142,7 @@ subprojects { implementation 'junit:junit:4.13.1' implementation 'org.mockito:mockito-core:3.6.0' - implementation 'com.github.tomakehurst:wiremock-jre8:2.32.0' + implementation 'com.github.tomakehurst:wiremock-jre8:2.35.2' } } diff --git a/sms-sdk-renderer-java/build.gradle b/sms-sdk-renderer-java/build.gradle index 7fdc75067..245f4d75c 100644 --- a/sms-sdk-renderer-java/build.gradle +++ b/sms-sdk-renderer-java/build.gradle @@ -10,11 +10,7 @@ dependencies { api 'com.github.jknack:handlebars' api 'com.github.jknack:handlebars-jackson2' api 'com.github.jknack:handlebars-guava-cache' - constraints { - api('com.google.guava:guava:30.0-jre') { - because 'version 18.0 pulled by com.github.jknack:handlebars-guava-cache:4.2.0 is way too old!' - } - } + api 'com.googlecode.json-simple:json-simple' testImplementation 'junit:junit'