Fix MNP_SM_2460 completata + Mock servizio retrieveESO (rimosso TIMAC)

This commit is contained in:
vincenzofariello
2025-03-19 11:06:32 +01:00
parent f2070def85
commit 7c029fec7c
7 changed files with 127 additions and 10 deletions

View File

@@ -11,6 +11,7 @@ import mnp.utility.DateUtils;
import mnp.utility.Func;
import mnp.utility.Resources;
import org.apache.http.Header;
import org.apache.http.HttpStatus;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
@@ -63,15 +64,25 @@ public class WSRestHandler extends GenericHandler {
post.setEntity(postingString);
post.setHeaders(headers);
response = client.execute(post);
BufferedReader rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
String line;
while ((line = rd.readLine()) != null) {
jsonString.append(line).append('\n');
//check sulla risposta HTTP di ESO
if(response.getStatusLine().getStatusCode() == HttpStatus.SC_OK){ // se 200
BufferedReader rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
String line;
while ((line = rd.readLine()) != null) {
jsonString.append(line).append('\n');
}
}
else { //Altrimenti ci aspettiamo solo status code: 401 (Richiesta non autorizzata) o 503 (Non espletata)
log.write("9999","ERRORE REST POST response: " + response.getStatusLine().getStatusCode());
throw new Exception("HTTP Status Code: " + response.getStatusLine().getStatusCode() +" Reason Phrase: " + response.getStatusLine().getReasonPhrase());
}
client.close();
response.close();
} catch (Exception ex) {
log.write("2512","ERRORE POST response");
log.write("9999","ERRORE REST POST response: " + ex.getMessage());
throw ex;
} finally {
try {
@@ -328,11 +339,26 @@ public class WSRestHandler extends GenericHandler {
logWrite("9999", "retrieveESORestPost: INIZIO CHIAMATA SERVIZIO REST");
String risposta = "";
try {
Header[] headers = setHeaderRetrieveESO("retriveESO");
String url = Resources.getESO_RETRIEVE_REST_POST_URL();
risposta = restPost(url,headers,requestSdpJson,log);
logWrite("9999", "retrieveESORestPost: url chiamato: "+url);
logWrite("9999", "retrieveESORestPost: FINE CHIAMATA SERVIZIO REST");
if("1".equals(Resources.getESO_RETRIEVE_REST_POST_MOCK_RESPONSE_ENABLED())) {
logWrite("9999", "retrieveESO: RETRIEVE ESO MOCK RESPONSE");
BufferedReader reader = new BufferedReader(new FileReader(Resources.getESO_RETRIEVE_REST_POST_MOCK_RESPONSE()));
try {
String line;
while ((line = reader.readLine()) != null) {
risposta = line;
}
} finally {
reader.close();
}
} else {
Header[] headers = setHeaderRetrieveESO("retriveESO");
String url = Resources.getESO_RETRIEVE_REST_POST_URL();
risposta = restPost(url, headers, requestSdpJson, log);
logWrite("9999", "retrieveESORestPost: url chiamato: " + url);
logWrite("9999", "retrieveESORestPost: FINE CHIAMATA SERVIZIO REST");
}
} catch (Exception ex) {
logWrite("9999", "retrieveESORestPost: ECCEZIONE NELLA CHIAMATA REST:" + " Message: " +ex.getMessage() +" Cause: "+ex.getCause());
throw ex;

View File

@@ -2521,4 +2521,15 @@ public class Resources {
return trim(props.getProperty("ESO_RETRIEVE_REST_POST_AUTHBASIC_BASE64"));
}
public static String getESO_RETRIEVE_REST_POST_MOCK_RESPONSE() {
init();
return trim(props.getProperty("ESO_RETRIEVE_REST_POST_MOCK_RESPONSE"));
}
public static String getESO_RETRIEVE_REST_POST_MOCK_RESPONSE_ENABLED() {
init();
return trim(props.getProperty("ESO_RETRIEVE_REST_POST_MOCK_RESPONSE_ENABLED"));
}
}