From 50c8b8422f7c53c19addfb57ed653726aca01843 Mon Sep 17 00:00:00 2001 From: Dan Jaschob Date: Tue, 27 Jun 2023 20:06:15 -0700 Subject: [PATCH] Client Connector - Get Data - Add call to existing webservice Add public Get_MaxScanCountToReturn_Response call_Get_MaxScanCountToReturn_Webservice( Get_MaxScanCountToReturn_Request webserviceRequest ) The webservice already exists. --- .../CallSpectralStorageGetDataWebservice.java | 41 +++++++++++++++++++ ...ceSpectralStorageGetDataPathConstants.java | 2 + 2 files changed, 43 insertions(+) diff --git a/Client_Connector_Library_Get_Data/src/main/java/org/yeastrc/spectral_storage/get_data_webapp/webservice_connect/main/CallSpectralStorageGetDataWebservice.java b/Client_Connector_Library_Get_Data/src/main/java/org/yeastrc/spectral_storage/get_data_webapp/webservice_connect/main/CallSpectralStorageGetDataWebservice.java index 7398baf..5d54c3c 100644 --- a/Client_Connector_Library_Get_Data/src/main/java/org/yeastrc/spectral_storage/get_data_webapp/webservice_connect/main/CallSpectralStorageGetDataWebservice.java +++ b/Client_Connector_Library_Get_Data/src/main/java/org/yeastrc/spectral_storage/get_data_webapp/webservice_connect/main/CallSpectralStorageGetDataWebservice.java @@ -22,6 +22,8 @@ import org.yeastrc.spectral_storage.get_data_webapp.shared_server_client.constants.WebserviceSpectralStorageGetDataPathConstants; import org.yeastrc.spectral_storage.get_data_webapp.shared_server_client.exceptions.YRCSpectralStorageGetDataWebserviceCallErrorException; +import org.yeastrc.spectral_storage.get_data_webapp.shared_server_client.webservice_request_response.main.Get_MaxScanCountToReturn_Request; +import org.yeastrc.spectral_storage.get_data_webapp.shared_server_client.webservice_request_response.main.Get_MaxScanCountToReturn_Response; import org.yeastrc.spectral_storage.get_data_webapp.shared_server_client.webservice_request_response.main.Get_ScanDataFromScanNumbers_Request; import org.yeastrc.spectral_storage.get_data_webapp.shared_server_client.webservice_request_response.main.Get_ScanDataFromScanNumbers_Response; import org.yeastrc.spectral_storage.get_data_webapp.shared_server_client.webservice_request_response.main.Get_ScanData_AllScans_ExcludePeaks_Request; @@ -78,6 +80,8 @@ public synchronized void init( CallSpectralStorageGetDataWebserviceInitParameter jaxbContext = JAXBContext.newInstance( + Get_MaxScanCountToReturn_Request.class, + Get_MaxScanCountToReturn_Response.class, Get_ScanNumbers_Request.class, Get_ScanNumbers_Response.class, Get_ScanData_AllScans_ExcludePeaks_Request.class, @@ -102,6 +106,43 @@ public synchronized void init( CallSpectralStorageGetDataWebserviceInitParameter ///////////////////////////// + + /** + * @param webserviceRequest + * @return + * @throws Exception + */ + public Get_MaxScanCountToReturn_Response call_Get_MaxScanCountToReturn_Webservice( Get_MaxScanCountToReturn_Request webserviceRequest ) throws Exception { + if ( ! instanceInitialized ) { + throw new IllegalStateException( "Not initialized" ); + } + if ( webserviceRequest == null ) { + throw new IllegalArgumentException( "webserviceRequest param must not be null in call to call_Get_ScanNumbers_Request_Webservice(...)" ); + } + + String webserviceURL = spectralStorageServerBaseURL + + WebserviceSpectralStorageGetDataPathConstants.GET_MAX_SCAN_COUNT_TO_RETURN_SERVLET_XML; + Object webserviceResponseAsObject = callActualWebserviceOnServerSendObject( webserviceRequest, webserviceURL ); + if ( ! ( webserviceResponseAsObject instanceof Get_MaxScanCountToReturn_Response ) ) { + String msg = "Response unmarshaled to class other than Get_MaxScanCountToReturn_Response. " + + " Unmarshaled Class: " + webserviceResponseAsObject.getClass(); + YRCSpectralStorageGetDataWebserviceCallErrorException exception = new YRCSpectralStorageGetDataWebserviceCallErrorException( msg ); + exception.setFailToDecodeDataReceivedFromServer(true); + throw exception; + } + Get_MaxScanCountToReturn_Response webserviceResponse = null; + try { + webserviceResponse = (Get_MaxScanCountToReturn_Response) webserviceResponseAsObject; + } catch ( Exception e ) { + String msg = "Error. Fail to cast response as Get_MaxScanCountToReturn_Response: " + + e.toString(); + YRCSpectralStorageGetDataWebserviceCallErrorException exception = new YRCSpectralStorageGetDataWebserviceCallErrorException( msg ); + exception.setFailToDecodeDataReceivedFromServer(true); + throw exception; + } + return webserviceResponse; + } + /** * @param webserviceRequest * @return diff --git a/Common_Get_Data_Webapp_Client_Connector_Library/src/main/java/org/yeastrc/spectral_storage/get_data_webapp/shared_server_client/constants/WebserviceSpectralStorageGetDataPathConstants.java b/Common_Get_Data_Webapp_Client_Connector_Library/src/main/java/org/yeastrc/spectral_storage/get_data_webapp/shared_server_client/constants/WebserviceSpectralStorageGetDataPathConstants.java index b528192..f6c2b2f 100644 --- a/Common_Get_Data_Webapp_Client_Connector_Library/src/main/java/org/yeastrc/spectral_storage/get_data_webapp/shared_server_client/constants/WebserviceSpectralStorageGetDataPathConstants.java +++ b/Common_Get_Data_Webapp_Client_Connector_Library/src/main/java/org/yeastrc/spectral_storage/get_data_webapp/shared_server_client/constants/WebserviceSpectralStorageGetDataPathConstants.java @@ -8,6 +8,8 @@ public class WebserviceSpectralStorageGetDataPathConstants { // Servlets - Retrieving data from scan files using API Key and other parameters + public static final String GET_MAX_SCAN_COUNT_TO_RETURN_SERVLET_XML = "/query/getMaxScanCountToReturn_XML"; + public static final String GET_SCAN_DATA_ALL_SCANS_EXCLUDE_PEAKS_SERVLET_XML = "/query/getScanData_AllScans_ExcludePeaks_Servlet_XML"; public static final String GET_SCAN_DATA_FROM_SCAN_NUMBERS_SERVLET_XML = "/query/getScanDataFromScanNumbers_XML";