diff --git a/src/main/java/se/su/dsv/scipro/json/IResponseHandler.java b/src/main/java/se/su/dsv/scipro/json/IResponseHandler.java index 80ed1a69d2..4b7c920144 100644 --- a/src/main/java/se/su/dsv/scipro/json/IResponseHandler.java +++ b/src/main/java/se/su/dsv/scipro/json/IResponseHandler.java @@ -1,8 +1,10 @@ package se.su.dsv.scipro.json; +import java.io.IOException; + /** * Interface for delegated callback handling of response-strings. */ public interface IResponseHandler { - public void handleResponse(final String response,final RemoteLookupOptions options); + public void handleResponse(final String response,final RemoteLookupOptions options) throws IOException; } diff --git a/src/main/java/se/su/dsv/scipro/json/ImportWorkerLookup.java b/src/main/java/se/su/dsv/scipro/json/ImportWorkerLookup.java index cc094fac0f..81c1de7f04 100644 --- a/src/main/java/se/su/dsv/scipro/json/ImportWorkerLookup.java +++ b/src/main/java/se/su/dsv/scipro/json/ImportWorkerLookup.java @@ -17,7 +17,6 @@ import se.su.dsv.scipro.ApplicationSettings; * * @author Dan Kjellman <dan-kjel@dsv.su.se> */ -//TODO Make sure this worker successfully fails when it should @Component public class ImportWorkerLookup { public static final String USERS = "users"; diff --git a/src/main/java/se/su/dsv/scipro/json/ImportWorkerResponseHandler.java b/src/main/java/se/su/dsv/scipro/json/ImportWorkerResponseHandler.java index 4d8292901e..2dbf9efcda 100644 --- a/src/main/java/se/su/dsv/scipro/json/ImportWorkerResponseHandler.java +++ b/src/main/java/se/su/dsv/scipro/json/ImportWorkerResponseHandler.java @@ -1,5 +1,6 @@ package se.su.dsv.scipro.json; +import java.io.IOException; import java.lang.reflect.Type; import org.apache.log4j.Level; @@ -34,7 +35,7 @@ public class ImportWorkerResponseHandler extends JsonResponseHandler { * * @param response the json string */ - public void handleResponse(final String response, final RemoteLookupOptions options) { + public void handleResponse(final String response, final RemoteLookupOptions options) throws IOException { JsonCompleteGetContainer completeContainer = null; try{ Gson gson = new Gson(); @@ -43,7 +44,7 @@ public class ImportWorkerResponseHandler extends JsonResponseHandler { } catch (Exception e) { logger.log(Level.FATAL, "Gson error when creating objects from json \n" + e.getMessage()); - return; + throw new IOException(e); } int createdUsers = 0; int changedUsers = 0; diff --git a/src/main/java/se/su/dsv/scipro/json/JsonResponseHandler.java b/src/main/java/se/su/dsv/scipro/json/JsonResponseHandler.java index b28c809bb4..4516bb5bf2 100644 --- a/src/main/java/se/su/dsv/scipro/json/JsonResponseHandler.java +++ b/src/main/java/se/su/dsv/scipro/json/JsonResponseHandler.java @@ -1,16 +1,14 @@ package se.su.dsv.scipro.json; +import java.io.IOException; import java.util.Date; -import java.util.HashSet; import java.util.Iterator; -import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; -import org.springframework.transaction.annotation.Transactional; import se.su.dsv.scipro.ApplicationSettings; import se.su.dsv.scipro.data.dao.interfaces.ProjectClassDao; @@ -465,7 +463,7 @@ abstract class JsonResponseHandler implements IResponseHandler { /* * Force subclasses to handle the response */ - public abstract void handleResponse(final String response, final RemoteLookupOptions options); + public abstract void handleResponse(final String response, final RemoteLookupOptions options) throws IOException; /* * Getters for logging