VOL-543: Provision for specifying urls where subscriber id is not at the end
Change-Id: I3aa7030ebe34f6ecaa6a761db523e0c6df7a3eb7
diff --git a/app/src/main/java/org/opencord/sadis/impl/SadisConfig.java b/app/src/main/java/org/opencord/sadis/impl/SadisConfig.java
index 42a11af..eb48fe0 100644
--- a/app/src/main/java/org/opencord/sadis/impl/SadisConfig.java
+++ b/app/src/main/java/org/opencord/sadis/impl/SadisConfig.java
@@ -81,6 +81,7 @@
private static final String SADIS_URL = "url";
private static final String SADIS_ENTRIES = "entries";
private static final String DEFAULT_CACHE_TTL = "PT0S";
+ private static final String SUBSCRIBER_ID_SUB_PATTERN = "%s";
/**
* Returns SADIS integration URL.
@@ -99,7 +100,11 @@
if (url.isMissingNode()) {
return null;
}
-
+ StringBuffer buf = new StringBuffer(SUBSCRIBER_ID_SUB_PATTERN);
+ if (!url.asText().contains(buf)) {
+ log.error("Error in url, missing {}", SUBSCRIBER_ID_SUB_PATTERN);
+ return null;
+ }
return new URL(url.asText());
}