Merge pull request #39 from VladimirSB/SOAP-5313-Cannot-invoke-method-addNewInterface()-on-null-object-error-when-cancel-project-creating

SOAP-5313 "Cannot invoke method addNewInterface() on null object" error when cancel project creating

Author: Ole Lensmar

src/main/groovy/com/smartbear/swagger/Swagger2Importer.groovy

@@ -117,7 +117,7 @@ class Swagger2Importer implements SwaggerImporter {
     }
 
     void ensureEndpoint(RestService restService, String url) {
-        if (restService.endpoints.length == 0) {
+        if (restService != null && restService.endpoints.length == 0) {
 
             def ix = url.indexOf("://")
             if (ix > 0) {
@@ -136,6 +136,9 @@ class Swagger2Importer implements SwaggerImporter {
      */
 
     RestResource importPath(RestService restService, String path, Path resource) {
+        if (restService == null) {
+            return null
+        }
         RestResource res = restService.addNewResource(path, path)
 
         if (resource.get != null)
@@ -300,6 +303,9 @@ class Swagger2Importer implements SwaggerImporter {
     }
 
     private RestService createRestService(Swagger swagger, String url) {
+        if (project == null) {
+            return null
+        }
 
         String name = swagger.info && swagger.info.title ? swagger.info.title : null
         if (name == null) {
@@ -311,9 +317,7 @@ class Swagger2Importer implements SwaggerImporter {
             }
         }
 
-        RestService restService = forRefactoring ?
-                InterfaceFactoryRegistry.createNew(project, RestServiceFactory.REST_TYPE, name) :
-                project.addNewInterface(name, RestServiceFactory.REST_TYPE)
+        RestService restService = project.addNewInterface(name, RestServiceFactory.REST_TYPE);
         restService.description = swagger.info?.description
 
         if (swagger.host != null) {