eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-14 22:43:57 +00:00
Code Activity

bug5311: report errors also in JSON format, as promised

Browse Source
This commit is contained in:
Axel Uhl committed 2021-09-23 23:56:56 +02:00
1 parent ecc75fa0ef
commit d718dc3e6d
1 file changed
+5 -3
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MasterDataImportResource.java
+5 -3
View File
@@ -40,7 +40,7 @@ public class MasterDataImportResource extends AbstractSailingServerResource {
public static final String REMOTE_SERVER_PASSWORD_FORM_PARAM = "remoteServerPassword";
public static final String REMOTE_SERVER_USERNAME_FORM_PARAM = "remoteServerUsername";
public static final String REMOTE_SERVER_URL_FORM_PARAM = "remoteServerUrl";
public static final String PROGRSS_TRACKING_UUID_FORM_PARAM = "progressTrackingUUID";
public static final String PROGRESS_TRACKING_UUID_FORM_PARAM = "progressTrackingUUID";
private static final Logger logger = Logger.getLogger(MasterDataImportResource.class.getName());
public MasterDataImportResource() {
@@ -59,7 +59,7 @@ public class MasterDataImportResource extends AbstractSailingServerResource {
@FormParam(MasterDataImportResultJsonSerializer.EXPORT_WIND_FORM_PARAM) @DefaultValue("true") Boolean exportWind,
@FormParam(MasterDataImportResultJsonSerializer.EXPORT_DEVICE_CONFIGS_FORM_PARAM) @DefaultValue("false") Boolean exportDeviceConfigs,
@FormParam(MasterDataImportResultJsonSerializer.EXPORT_TRACKED_RACES_AND_START_TRACKING_FORM_PARAM) @DefaultValue("true") Boolean exportTrackedRacesAndStartTracking,
@FormParam(PROGRSS_TRACKING_UUID_FORM_PARAM) String progressTrackingUuid) {
@FormParam(PROGRESS_TRACKING_UUID_FORM_PARAM) String progressTrackingUuid) {
Response response = null;
if (!Util.hasLength(remoteServerUrlAsString)) {
response = badRequest("Remote server URL parameter "+REMOTE_SERVER_URL_FORM_PARAM+" must be present and non-empty");
@@ -106,7 +106,9 @@ public class MasterDataImportResource extends AbstractSailingServerResource {
getSecurityService().checkCurrentUserServerPermission(ServerActions.CAN_IMPORT_MASTERDATA);
final DataImportProgress progress = getService().getDataImportLock().getProgress(UUID.fromString(progressTrackingUuid));
if (progress == null) {
response = Response.status(Status.NOT_FOUND).entity("No progress found for progess tracking UUID "+progressTrackingUuid).type(MediaType.TEXT_PLAIN).build();
response = Response.status(Status.NOT_FOUND)
.entity("\"No progress found for progess tracking UUID "+progressTrackingUuid+"\"")
.type(MediaType.APPLICATION_JSON).build();
} else {
final JSONObject jsonResponse = new DataImportProgressJsonSerializer().serialize(progress);
response = Response.ok(streamingOutput(jsonResponse)).build();