[extra-standard] r1961 committed - Erstellen des Requests nach Fehlern angepasst

[extra-s...@googlecode.com]

Revision: 1961
Author: florianstratil
Date: Wed Mar 25 12:37:49 2015 UTC
Log: Erstellen des Requests nach Fehlern angepasst
https://code.google.com/p/extra-standard/source/detail?r=1961

Modified:

/trunk/java/apps/extraClientLight/src/main/java/de/extra/extraClientLight/helper/BuildExtraTransport.java

/trunk/java/apps/extraClientLight/src/main/java/de/extra/extraClientLight/helper/ExtraResponseHelper.java

=======================================
---
/trunk/java/apps/extraClientLight/src/main/java/de/extra/extraClientLight/helper/BuildExtraTransport.java
Mon Jan 19 12:52:10 2015 UTC
+++
/trunk/java/apps/extraClientLight/src/main/java/de/extra/extraClientLight/helper/BuildExtraTransport.java
Wed Mar 25 12:37:49 2015 UTC
@@ -43,7 +43,6 @@
import de.drv.dsrv.spoc.extra.v1_3.jaxb.messages.DataRequestArgumentType;
import de.drv.dsrv.spoc.extra.v1_3.jaxb.messages.DataRequestQueryType;
import de.drv.dsrv.spoc.extra.v1_3.jaxb.messages.DataRequestType;
-import de.drv.dsrv.spoc.extra.v1_3.jaxb.messages.OperandSetType;
import de.drv.dsrv.spoc.extra.v1_3.jaxb.messages.OperandType;
import de.drv.dsrv.spoc.extra.v1_3.jaxb.request.TransportRequestBodyType;
import de.drv.dsrv.spoc.extra.v1_3.jaxb.request.TransportRequestHeaderType;
@@ -52,8 +51,16 @@
import de.extra.extraClientLight.util.ClientConstants;

public class BuildExtraTransport {
- private static Logger LOGGER =
LoggerFactory.getLogger(BuildExtraTransport.class);

+ private static Logger LOGGER = LoggerFactory
+ .getLogger(BuildExtraTransport.class);
+
+ /**
+ * Erstellt den Transport-Request aus der RequestBean
+ *
+ * @param requestBean
+ * @return TransportRequest
+ */
public static TransportRequestType buildTransportRequest(
RequestExtraBean requestBean) {

@@ -64,10 +71,19 @@
request.setTransportHeader(buildHeader(requestBean));
if (!requestBean.getDataObjekt().isQuery()) {
try {
- request.setTransportBody(buildBody(requestBean.getDataObjekt()
- .getData()));
+
+ // TODO Leeren Body zulassen (DataObjekt = null)
+ if (requestBean.getDataObjekt() != null) {
+ // Lese Nutzdaten aus Stream
+ request.setTransportBody(buildBody(requestBean
+ .getDataObjekt().getData()));
+ } else {
+
+ // Sende mit leerem Body
+ request.setTransportBody(new TransportRequestBodyType());
+ }
} catch (IOException e) {
- LOGGER.error("Fehler beim Lesen des InputStreams",e);
+ LOGGER.error("Fehler beim Lesen des InputStreams", e);
}
} else {

@@ -181,14 +197,14 @@

requestIdArgument.getContent().add(jaxbOperand);
dataQuery.getArgument().add(requestIdArgument);
- /*
- * procedureArgument.setProperty(ClientConstants.QUERY_PROCEDURE);
- *
- * dataQuery.getArgument().add(procedureArgument);
- *
- * dataTypeArgument.setProperty(ClientConstants.QUERY_DATATYPE);
- * dataQuery.getArgument().add(dataTypeArgument);
- */
+
+ procedureArgument.setProperty(ClientConstants.QUERY_PROCEDURE);
+
+ dataQuery.getArgument().add(procedureArgument);
+
+ dataTypeArgument.setProperty(ClientConstants.QUERY_DATATYPE);
+ dataQuery.getArgument().add(dataTypeArgument);
+
dataRequest.setQuery(dataQuery);

return dataRequest;
=======================================
---
/trunk/java/apps/extraClientLight/src/main/java/de/extra/extraClientLight/helper/ExtraResponseHelper.java
Mon Jan 19 12:52:10 2015 UTC
+++
/trunk/java/apps/extraClientLight/src/main/java/de/extra/extraClientLight/helper/ExtraResponseHelper.java
Wed Mar 25 12:37:49 2015 UTC
@@ -65,7 +65,7 @@
getReportInformation(reportFlag);

// TODO Attachments in Response auslesen.
-
+//TODO Body kann auch leer sein (v.a. im asynchronen Verfahren)
try {

DataSource nutzdatenDS = extraResponse.getTransportBody().getData()