Avoid NPE if actualApp has no existing Scopes

#206

Author: Chris Wiechmann

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Changed the Log-Threshold to DEBUG for Console-Logger to make debugging working according to the documentation
 - Application-JSON-Export - Credentials should not contain ApplicationID (See issue [#146](https://github.com/Axway-API-Management-Plus/apim-cli/issues/146))
+- Import Application scopes doesn't work (See issue [#206](https://github.com/Axway-API-Management-Plus/apim-cli/issues/206))
 
 ## [1.3.10] 2021-07-16
 ### Fixed

modules/apim-adapter/src/main/java/com/axway/apim/adapter/clientApps/APIMgrAppsAdapter.java

@@ -637,8 +637,6 @@ private void deleteOAuthResources(ClientApplication desiredApp, List<ClientAppOa
 
 	private void getScopes2AddOrUpdate(ClientApplication actualApp, ClientApplication desiredApp, 
 			List<ClientAppOauthResource> scopes2Update, List<ClientAppOauthResource> scopes2Create, List<ClientAppOauthResource> scopes2Delete) throws AppException {
-		if((desiredApp.getOauthResources()==null || desiredApp.getOauthResources().size()==0) && 
-				(actualApp.getOauthResources()==null || actualApp.getOauthResources().size()==0)) return;
 		List<ClientAppOauthResource> existingScopes = null;
 		List<ClientAppOauthResource> desiredScopes = desiredApp.getOauthResources();
 		if(actualApp!=null) {
@@ -667,7 +665,9 @@ private void getScopes2AddOrUpdate(ClientApplication actualApp, ClientApplicatio
 				}
 				if(!existingScopeFound) scopes2Create.add(desiredScope);
 			}
-			// finally iterate over all existing scopes and check if they are still desired
+		}
+		// finally iterate over all existing scopes and check if they are still desired
+		if(existingScopes!=null) {
 			for(ClientAppOauthResource existingScope : existingScopes) {
 				boolean actualScopeFound = false;
 				for(ClientAppOauthResource desiredScope : desiredScopes) {