1 files changed, 35 insertions, 155 deletions
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadResultImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadResultImpl.java
index 6f07338f..8904eac6 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadResultImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadResultImpl.java
@@ -14,158 +14,38 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package at.gv.egiz.bku.slcommands.impl;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Result;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.dom.DOMSource;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-
-import at.buergerkarte.namespaces.securitylayer._1.Base64XMLContentType;
-import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadResponseType;
-import at.buergerkarte.namespaces.securitylayer._1.ObjectFactory;
-import at.buergerkarte.namespaces.securitylayer._1.XMLContentType;
-import at.gv.egiz.bku.slcommands.InfoboxReadResult;
-import at.gv.egiz.bku.slcommands.SLCommand;
-import at.gv.egiz.bku.slcommands.SLCommandFactory;
-import at.gv.egiz.bku.slexceptions.SLRuntimeException;
-
-/**
- * This class implements the result of the security layer command <code>InfoboxReadRequest</code>.
- * 
- * @author mcentner
- */
-public class InfoboxReadResultImpl extends SLResultImpl implements
-    InfoboxReadResult {
-
-  /**
-   * Logging facility.
-   */
-  protected static Log log = LogFactory.getLog(InfoboxReadResultImpl.class);
-
-  /**
-   * The XML document containing the infobox content.
-   */
-  Document xmlDocument;
-
-  /**
-   * Creates the response document from the given <code>binaryContent</code>.
-   * 
-   * @param binaryContent the infobox content
-   * @param preserveSpace the value of the <code>preserveSpace</code> parameter
-   * 
-   * @return the created response document
-   */
-  private Document createResponseDocument(byte[] binaryContent, boolean preserveSpace) {
-    
-    DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-    Document doc;
-    try {
-      doc = dbf.newDocumentBuilder().newDocument();
-    } catch (ParserConfigurationException e) {
-      // it should always be possible to create a new Document
-      log.error("Failed to create XML document.", e);
-      throw new SLRuntimeException(e);
-    }
-
-    ObjectFactory factory = new ObjectFactory();
-    
-    Base64XMLContentType base64XMLContentType = factory.createBase64XMLContentType();
-    if (binaryContent == null) {
-      XMLContentType xmlContentType = factory.createXMLContentType();
-      if (preserveSpace) {
-        xmlContentType.setSpace("preserve");
-      }
-      base64XMLContentType.setXMLContent(xmlContentType);
-    } else {
-      base64XMLContentType.setBase64Content(binaryContent);
-    }
-    InfoboxReadResponseType infoboxReadResponseType = factory.createInfoboxReadResponseType();
-    infoboxReadResponseType.setBinaryFileData(base64XMLContentType);
-    
-    JAXBElement<InfoboxReadResponseType> infoboxReadResponse = factory.createInfoboxReadResponse(infoboxReadResponseType);
-    
-    JAXBContext context = SLCommandFactory.getJaxbContext();
-    try {
-      Marshaller marshaller = context.createMarshaller();
-      marshaller.marshal(infoboxReadResponse, doc);
-    } catch (JAXBException e) {
-      log.error("Failed to marshal 'InfoboxReadResponse' document.", e);
-      throw new SLRuntimeException(e);
-    }
-
-    return doc;
-    
-  }
-  
-  
-  /**
-   * @return an XMLResult for marshalling the infobox to
-   */
-  Result getXmlResult(boolean preserveSpace) {
-    
-    xmlDocument = createResponseDocument(null, preserveSpace);
-    
-    NodeList nodeList = xmlDocument.getElementsByTagNameNS(SLCommand.NAMESPACE_URI, "XMLContent");
-    return new DOMResult(nodeList.item(0));
-    
-  }
-  
-  /**
-   * Creates a new result document for this <code>InfoboxReadResult</code>
-   * and sets the given <code>resultBytes</code> as content.
-   * 
-   * @param resultBytes
-   */
-  void setResultBytes(byte[] resultBytes) {
-    
-    xmlDocument = createResponseDocument(resultBytes, false);
-    
-  }
-  
-  @Override
-  public void writeTo(Result result) {
-
-    try {
-      writeTo(result, null);
-    } catch (TransformerException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
-    }
-
-  }
-
-  /* (non-Javadoc)
-   * @see at.gv.egiz.bku.slcommands.impl.SLResultImpl#writeTo(javax.xml.transform.Result, javax.xml.transform.Transformer)
-   */
-  @Override
-  public void writeTo(Result result, Transformer transformer) throws TransformerException {
-
-    if (transformer == null) {
-      TransformerFactory transformerFactory = TransformerFactory.newInstance();
-      try {
-        transformer = transformerFactory.newTransformer();
-      } catch (TransformerConfigurationException e) {
-        log.error("Failed to create Transformer.", e);
-        throw new SLRuntimeException(e);
-      }
-    }
-    transformer.transform(new DOMSource(xmlDocument), result);
-    
-  }
-
-}
+package at.gv.egiz.bku.slcommands.impl;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.transform.Result;
+import javax.xml.transform.Templates;
+
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadDataAssocArrayType;
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadResponseType;
+import at.buergerkarte.namespaces.securitylayer._1.ObjectFactory;
+
+public class InfoboxReadResultImpl extends SLResultImpl {
+
+  /**
+   * The <code>InfoboxReadResponse</code>
+   */
+  protected InfoboxReadResponseType infoboxReadResponse;
+  
+  public InfoboxReadResultImpl(InfoboxReadDataAssocArrayType assocArray) {
+    
+    ObjectFactory objectFactory = new ObjectFactory();
+    InfoboxReadResponseType infoboxReadResponseType = objectFactory.createInfoboxReadResponseType();
+    
+    infoboxReadResponseType.setAssocArrayData(assocArray);
+    
+    this.infoboxReadResponse = infoboxReadResponseType;
+  }
+
+  @Override
+  public void writeTo(Result result, Templates templates) {
+    ObjectFactory objectFactory = new ObjectFactory();
+    JAXBElement<InfoboxReadResponseType> response = objectFactory.createInfoboxReadResponse(infoboxReadResponse);
+    writeTo(response, result, templates);
+  }
+
+}