Merge branch 'main' into prod

noi-techpark · Dec 19, 2024 · 625c92e · 625c92e
2 parents 4552f5b + f12a503
commit 625c92e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/RadeltAPIClient.java b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/RadeltAPIClient.java
@@ -9,6 +9,7 @@
 
 import org.apache.http.HttpEntity;
 import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.CookieSpecs;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -49,6 +50,7 @@ public static CloseableHttpClient httpClient(){
             .setConnectTimeout(timeout)
             .setSocketTimeout(timeout)
             .setConnectionRequestTimeout(timeout)
+            .setCookieSpec(CookieSpecs.STANDARD)
             .build();
         return HttpClientBuilder.create().setDefaultRequestConfig(rc).build();
     }

diff --git a/data-collectors/traffic-provBZ/src/main/java/it/bz/odh/trafficprovbz/FamasClient.java b/data-collectors/traffic-provBZ/src/main/java/it/bz/odh/trafficprovbz/FamasClient.java
@@ -120,13 +120,19 @@ public AggregatedDataDto[] getAggregatedDataOnStations(String stationId, String
 		payload.put("IdPostazioni", stationIdArray);
 		payload.put("InizioPeriodo", startPeriod);
 		payload.put("FinePeriodo", endPeriod);
-		StringEntity stringEntity = new StringEntity(String.valueOf(payload),
+		String payloadString = payload.toJSONString();
+		StringEntity stringEntity = new StringEntity(payloadString,
 				ContentType.APPLICATION_JSON);
 		HttpPost request = new HttpPost(aggregatedDataOnStationsUrl);
 		request.setEntity(stringEntity);
-		HttpEntity entity = client.execute(request).getEntity();
-		String responseString = EntityUtils.toString(entity, RESPONSE_CHARSET);
-		return objectMapper.readValue(responseString, AggregatedDataDto[].class);
+		try {
+			HttpEntity entity = client.execute(request).getEntity();
+			String responseString = EntityUtils.toString(entity, RESPONSE_CHARSET);
+			return objectMapper.readValue(responseString, AggregatedDataDto[].class);
+		} catch (Exception e) {
+			LOG.error("Dumping request object: " + payloadString);
+			throw e;
+		}
 	}
 
 	/**