Added support for unknown API-Specs

Author: Chris Wiechmann

modules/api-export/src/main/java/com/axway/apim/api/export/impl/APIResultHandler.java

@@ -95,7 +95,8 @@ protected Builder getBaseAPIFilterBuilder() {
 				.includeCustomProperties(APIManagerAdapter.getAllConfiguredCustomProperties(CUSTOM_PROP_TYPE.api))
 				.translateMethods(METHOD_TRANSLATION.AS_NAME)
 				.translatePolicies(POLICY_TRANSLATION.TO_NAME)
-				.useFEAPIDefinition(params.isUseFEAPIDefinition());
+				.useFEAPIDefinition(params.isUseFEAPIDefinition())
+				.failOnError(false);
 		return builder;
 	}
 

modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIFilter.java

@@ -87,6 +87,8 @@ public static enum FILTER_OP {
 
 	private boolean useFEAPIDefinition = false;
 
+	private boolean failOnError = true;
+	
 	POLICY_TRANSLATION translatePolicyMode = POLICY_TRANSLATION.NONE;
 
 	List<NameValuePair> filters = new ArrayList<NameValuePair>();
@@ -364,6 +366,14 @@ public void setCustomProperties(Map<String, String> customProperties) {
 		this.customProperties = customProperties;
 	}
 
+	public boolean isFailOnError() {
+		return failOnError;
+	}
+
+	public void setFailOnError(boolean failOnError) {
+		this.failOnError = failOnError;
+	}
+
 	@Override
 	public boolean equals(Object obj) {
 		if (obj == null) return false;
@@ -512,6 +522,8 @@ public static enum APIType {
 
 		boolean useFEAPIDefinition = false;
 
+		boolean failOnError = true;
+		
 		POLICY_TRANSLATION translatePolicyMode = POLICY_TRANSLATION.NONE;
 
 		List<NameValuePair> filters = new ArrayList<NameValuePair>();
@@ -566,6 +578,7 @@ public APIFilter build() {
 			apiFilter.setCustomProperties(this.customProperties);
 			apiFilter.setCreatedOn(this.createdOn, this.createdOnOp);
 			apiFilter.setBackendBasepath(this.backendBasepath);
+			apiFilter.setFailOnError(this.failOnError);
 			return apiFilter;
 		}
 
@@ -717,6 +730,11 @@ public Builder hasBackendBasepath(String backendBasepath) {
 			this.backendBasepath = backendBasepath;
 			return this;
 		}
+		
+		public Builder failOnError(boolean failOnError) {
+			this.failOnError = failOnError;
+			return this;
+		}		
 	}
 
 }

modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIManagerAPIAdapter.java

@@ -129,7 +129,7 @@ public List<API> getAPIs(APIFilter filter, boolean logProgress) throws AppExcept
 			addCustomProperties(apis, filter);
 			if(logProgress && apis.size()>5) System.out.print("\n");
 		} catch (IOException e) {
-			throw new AppException("Cant reads API from API-Manager", ErrorCode.API_MANAGER_COMMUNICATION, e);
+			throw new AppException("Cannot read APIs from API-Manager", ErrorCode.API_MANAGER_COMMUNICATION, e);
 		}
 		return apis;
 	}
@@ -485,7 +485,7 @@ private static void addOriginalAPIDefinitionFromAPIM(API api, APIFilter filter)
 			if(httpResponse.containsHeader("Content-Disposition")) {
 				origFilename = httpResponse.getHeaders("Content-Disposition")[0].getValue();
 			}
-			apiDefinition = APISpecificationFactory.getAPISpecification(res.getBytes(StandardCharsets.UTF_8), origFilename.substring(origFilename.indexOf("filename=")+9), null);
+			apiDefinition = APISpecificationFactory.getAPISpecification(res.getBytes(StandardCharsets.UTF_8), origFilename.substring(origFilename.indexOf("filename=")+9), null, filter.isFailOnError());
 			api.setApiDefinition(apiDefinition);
 		} catch (Exception e) {
 			throw new AppException("Cannot parse API-Definition for API: '" + api.getName() + "' ("+api.getVersion()+") on path: '"+api.getPath()+"'", ErrorCode.CANT_READ_API_DEFINITION_FILE, e);

modules/apim-adapter/src/main/java/com/axway/apim/api/definition/APISpecification.java

@@ -27,7 +27,8 @@ public static enum APISpecType {
 		SWAGGGER_API_20_YAML("Swagger 2.0 (YAML)", ".yaml"),
 		OPEN_API_30("Open API 3.0", ".json"),
 		OPEN_API_30_YAML("Open API 3.0 (YAML)", ".yaml"),
-		WSDL_API ("WSDL", ".xml");
+		WSDL_API ("WSDL", ".xml"),
+		UNKNOWN ("Unknown", ".txt");
 
 		String niceName;
 		String fileExtension;

modules/apim-adapter/src/main/java/com/axway/apim/api/definition/APISpecificationFactory.java

@@ -24,8 +24,11 @@ public class APISpecificationFactory {
 	    add(WSDLSpecification.class);
 	}};
 
-	
 	public static APISpecification getAPISpecification(byte[] apiSpecificationContent, String apiDefinitionFile, String backendBasepath) throws AppException {
+		return getAPISpecification(apiSpecificationContent, apiDefinitionFile, backendBasepath, true);
+	}
+	
+	public static APISpecification getAPISpecification(byte[] apiSpecificationContent, String apiDefinitionFile, String backendBasepath, boolean failOnError) throws AppException {
 		if(LOG.isDebugEnabled()) {
 			LOG.debug("Handle API-Specification: '" + getContentStart(apiSpecificationContent) + "...', apiDefinitionFile: '"+apiDefinitionFile+"'");	
 		}
@@ -50,6 +53,10 @@ public static APISpecification getAPISpecification(byte[] apiSpecificationConten
 				}
 			}
 		}
+		if(!failOnError) {
+			LOG.error("Can't handle API specification: '" + getContentStart(apiSpecificationContent) + "'");
+			return new UnknownAPISpecification(apiSpecificationContent, backendBasepath);
+		}
 		LOG.error("Can't handle API specification: '" + getContentStart(apiSpecificationContent) + "'");
 		throw new AppException("Can't handle API specification. No suiteable API-Specification implementation available.", ErrorCode.UNXPECTED_ERROR);
 	}

modules/apim-adapter/src/main/java/com/axway/apim/api/definition/UnknownAPISpecification.java

@@ -0,0 +1,28 @@
+package com.axway.apim.api.definition;
+
+import com.axway.apim.lib.errorHandling.AppException;
+
+public class UnknownAPISpecification extends APISpecification {
+
+	public UnknownAPISpecification(byte[] apiSpecificationContent, String backendBasepath) throws AppException {
+		super(apiSpecificationContent, backendBasepath);
+	}
+
+	public UnknownAPISpecification() {
+	}
+
+	@Override
+	protected void configureBasepath() throws AppException {
+	}
+
+	@Override
+	public APISpecType getAPIDefinitionType() throws AppException {
+		return APISpecType.UNKNOWN;
+	}
+
+	@Override
+	public boolean configure() throws AppException {
+		return false;
+	}
+
+}