diff --git a/src/main/java/se/su/dsv/scipro/io/facade/ExporterFacade.java b/src/main/java/se/su/dsv/scipro/io/facade/ExporterFacade.java index 7c0d0aabee..79e57f4557 100644 --- a/src/main/java/se/su/dsv/scipro/io/facade/ExporterFacade.java +++ b/src/main/java/se/su/dsv/scipro/io/facade/ExporterFacade.java @@ -1,6 +1,7 @@ package se.su.dsv.scipro.io.facade; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import se.su.dsv.scipro.data.dataobjects.Project; import se.su.dsv.scipro.data.dataobjects.ProjectFollower; @@ -15,6 +16,7 @@ import se.su.dsv.scipro.io.exceptions.ExternalExportException; @Service public class ExporterFacade { + @Qualifier("externalExporter") @Autowired ExternalExporter externalExporter; @@ -31,7 +33,7 @@ public class ExporterFacade { }catch(ExternalExportException eee){ externalExporter.deleteProject(""+p.getIdentifier()); System.out.println(eee.getMessage()); - //error(eee.getMessage()); + throw eee; } } diff --git a/src/main/java/se/su/dsv/scipro/io/http/ApiClient.java b/src/main/java/se/su/dsv/scipro/io/http/ApiClient.java index 1e1db73e42..3647dea6fa 100644 --- a/src/main/java/se/su/dsv/scipro/io/http/ApiClient.java +++ b/src/main/java/se/su/dsv/scipro/io/http/ApiClient.java @@ -202,7 +202,7 @@ public class ApiClient { Client client = getClient(); WebResource resource = client.resource(url); ClientResponse clientResponse = resource.accept(MediaType.APPLICATION_JSON_TYPE).delete(ClientResponse.class); - if(clientResponse.getStatus() != 200){ + if(clientResponse.getStatus() != 204){ throw new ExternalExportException("Could not delete project"); } return ""+clientResponse.getStatus();