PI-17312: Changed SubscriptionOrderEventParser

AppDirect · Mar 26, 2020 · bca3ecc · bca3ecc
1 parent b97a497
commit bca3ecc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -90,6 +90,7 @@
         <dependency>
             <groupId>org.springframework.hateoas</groupId>
             <artifactId>spring-hateoas</artifactId>
+            <version>0.23.0.RELEASE</version>
         </dependency>
         <!-- Guava -->
         <dependency>

diff --git a/src/main/java/com/appdirect/sdk/appmarket/events/SubscriptionOrderEventParser.java b/src/main/java/com/appdirect/sdk/appmarket/events/SubscriptionOrderEventParser.java
@@ -24,12 +24,18 @@
 class SubscriptionOrderEventParser implements EventParser<SubscriptionOrder> {
 	@Override
 	public SubscriptionOrder parse(EventInfo eventInfo, EventHandlingContext eventContext) {
-		String samlIdpUrl = null;
-		try {
-			samlIdpUrl = eventInfo.getLinks().stream().filter(link -> link.getRel().equals("samlIdp")).findFirst().map(Link::getHref).orElse(null);
-		} catch (Exception e) {
-			log.warn("Error when recovering samlIdp, proceeding with empty value", e);
-		}
+		String samlIdpUrl = eventInfo.getLinks().stream()
+				.filter(link -> {
+					try {
+						return "samlIdp".equals(link.getRel());
+					} catch (Exception e) {
+						log.warn("Error when recovering samlIdp, proceeding with empty value", e);
+						return false;
+					}
+				})
+				.findFirst()
+				.map(Link::getHref)
+				.orElse(null);
 
 		return new SubscriptionOrder(
 				eventContext.getConsumerKeyUsedByTheRequest(),