fix: Handle errors in apiversions and wrong URLs (#1788)

* Log error coming from versions.

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Don't fail on error in Versions

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Don't fail on leading and trailing empty characters in URL

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Trim non null version

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Fix style

Signed-off-by: Jakub Balhar <jakub@balhar.net>

Author: balhar-jakub

api-catalog-services/src/main/java/org/zowe/apiml/apicatalog/services/cached/CachedProductFamilyService.java

@@ -206,6 +206,7 @@ private String getInstanceHomePageUrl(InstanceInfo instanceInfo) {
         String instanceHomePage = instanceInfo.getHomePageUrl();
 
         if (hasHomePage(instanceInfo)) {
+            instanceHomePage = instanceHomePage.trim();
             RoutedServices routes = metadataParser.parseRoutes(instanceInfo.getMetadata());
 
             try {
@@ -214,7 +215,7 @@ private String getInstanceHomePageUrl(InstanceInfo instanceInfo) {
                     instanceInfo.getVIPAddress(),
                     instanceHomePage,
                     routes);
-            } catch (URLTransformationException e) {
+            } catch (URLTransformationException | IllegalArgumentException e) {
                 apimlLog.log("org.zowe.apiml.apicatalog.homePageTransformFailed", instanceInfo.getAppName(), e.getMessage());
             }
         }
@@ -326,12 +327,18 @@ private APIService createAPIServiceFromInstance(InstanceInfo instanceInfo) {
 
         String instanceHomePage = getInstanceHomePageUrl(instanceInfo);
         String apiBasePath = getApiBasePath(instanceInfo);
-        Map<String, String> apiId = metadataParser.parseApiInfo(instanceInfo.getMetadata()).stream().filter(apiInfo -> apiInfo.getApiId() != null).collect(
-            Collectors.toMap(
-                apiInfo -> (apiInfo.getMajorVersion() < 0) ? "default" : "v" + apiInfo.getMajorVersion(),
-                ApiInfo::getApiId
-            )
-        );
+        Map<String, String> apiId = new HashMap<>();
+        try {
+            apiId = metadataParser.parseApiInfo(instanceInfo.getMetadata()).stream().filter(apiInfo -> apiInfo.getApiId() != null).collect(
+                Collectors.toMap(
+                    apiInfo -> (apiInfo.getMajorVersion() < 0) ? "default" : "v" + apiInfo.getMajorVersion(),
+                    ApiInfo::getApiId
+                )
+            );
+        } catch (Exception ex) {
+            log.info("createApiServiceFromInstance#incorrectVersions {}", ex.getMessage());
+        }
+
         return new APIService.Builder(instanceInfo.getAppName().toLowerCase())
             .title(instanceInfo.getMetadata().get(SERVICE_TITLE))
             .description(instanceInfo.getMetadata().get(SERVICE_DESCRIPTION))

apiml-common/src/main/java/org/zowe/apiml/product/routing/transform/TransformService.java

@@ -101,6 +101,7 @@ public String transformURL(ServiceType type,
     public String retrieveApiBasePath(String serviceId,
                                       String serviceUrl,
                                       RoutedServices routes) throws URLTransformationException {
+        serviceUrl = serviceUrl.trim();
         URI serviceUri = URI.create(serviceUrl);
         String serviceUriPath = serviceUri.getPath();
         if (serviceUriPath == null) {