Issue #12 fix (#24)

* jroad issue #12 fix and version * junit test for StandardXRoadConsumerMessageExtractor, which fixes jroad issue #12 * added more unit tests for StandardXRoadConsumerMessageExtractor, which fixes jroad issue #12 * refactoring StandardXRoadConsumerMessageExtractorTest * changed version back to 4.2.4
nortal · Oct 12, 2017 · ebb67d1 · ebb67d1
1 parent 7ee6f94
commit ebb67d1
Show file tree

Hide file tree

Showing 8 changed files with 363 additions and 2 deletions.
diff --git a/...java/com/nortal/jroad/client/service/extractor/StandardXRoadConsumerMessageExtractor.java b/...java/com/nortal/jroad/client/service/extractor/StandardXRoadConsumerMessageExtractor.java
@@ -58,8 +58,8 @@ public XRoadMessage<XmlObject> extractData(WebServiceMessage response) throws IO
       Element body = mes.getSOAPBody();
       NodeList kehaNodes = body.getChildNodes();
       kehaNode = body.getChildNodes().item(0);
-      if (kehaNode.getTextContent().contains("\n")) {
-        kehaNode = kehaNodes.item(1);
+      if (kehaNode instanceof javax.xml.soap.Text) {
+        kehaNode = getKehaNode(kehaNodes, 1);
       }
       if (kehaNodes.getLength() > 1) {
         // In case of multiple elements take the first one that matches specified hierarchy
@@ -140,6 +140,14 @@ public XRoadMessage<XmlObject> extractData(WebServiceMessage response) throws IO
 
   }
 
+  private Node getKehaNode(NodeList kehaNodes, int nextIndex) {
+    Node kehaNode = kehaNodes.item(nextIndex);
+    if (kehaNode instanceof javax.xml.soap.Text) {
+      kehaNode = getKehaNode(kehaNodes, ++nextIndex);
+    }
+    return kehaNode;
+  }
+
   private void checkForNonTechnicalFault(Node kehaNode) throws NonTechnicalFaultException {
     String nonTechnicalFaultCode = null;
     String nonTechnicalFaultString = null;

diff --git a/.../com/nortal/jroad/client/service/extractor/StandardXRoadConsumerMessageExtractorTest.java b/.../com/nortal/jroad/client/service/extractor/StandardXRoadConsumerMessageExtractorTest.java
@@ -0,0 +1,128 @@
+package com.nortal.jroad.client.service.extractor;
+
+
+import com.nortal.jroad.model.XRoadMessage;
+import com.nortal.jroad.model.XmlBeansXRoadMetadata;
+import org.junit.Test;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.ws.soap.saaj.SaajSoapMessage;
+
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import java.io.IOException;
+import java.io.InputStream;
+
+import static org.junit.Assert.assertEquals;
+
+public class StandardXRoadConsumerMessageExtractorTest {
+
+    private final static String RESULT_PEM_FORMAT = "<response xmlns:era=\"http://earest.x-road.eu/\" xmlns=\"f\">\n" +
+            "  <request xmlns=\"\">\n" +
+            "    <ParinguKoostamiseAeg>2017-10-06T15:51:00</ParinguKoostamiseAeg>\n" +
+            "  </request>\n" +
+            "  <response xmlns=\"\">\n" +
+            "    <ArestiVastused>\n" +
+            "      <Vastus>\n" +
+            "        <IsikuOigusedKohustused>\n" +
+            "          <Akt>\n" +
+            "            <AlgParinguUnikaalneID>A801201702209240</AlgParinguUnikaalneID>\n" +
+            "            <VolitatudKasutajad>\n" +
+            "              <VolitatudKasutaja>\n" +
+            "                <VolituseLaad/>\n" +
+            "                <VolituseFailiNimi>jyritamm</VolituseFailiNimi>\n" +
+            "                <VolituseFail>JVBERi0xLjUNCiW1tbW1DQoxIDAgb2JqDQo8PC9UeXBlL0NhdGFsb2cvUGFnZXMgMiAwIFIvTGFu\n" +
+            "ZyhldC1FRSkgL1N0cnVjdFRyZWVSb290IDE1IDAgUi9NYXJrSW5mbzw8L01hcmtlZCB0cnVlPj4+\n" +
+            "CjE1MDc2Nw0KJSVFT0YNCnhyZWYNCjAgMA0KdHJhaWxlcg0KPDwvU2l6ZSAyNy9Sb290IDEgMCBS\n" +
+            "L0luZm8gMTQgMCBSL0lEWzxBNDQzRkEyNkVCQzM3RTRDODczOUFEQkYxNUEyRTZDRj48QTQ0M0ZB\n" +
+            "MjZFQkMzN0U0Qzg3MzlBREJGMTVBMkU2Q0Y+XSAvUHJldiAxNTA3NjcvWFJlZlN0bSAxNTA0NjM+\n" +
+            "Pg0Kc3RhcnR4cmVmDQoxNTE0NjUNCiUlRU9G</VolituseFail>\n" +
+            "              </VolitatudKasutaja>\n" +
+            "            </VolitatudKasutajad>\n" +
+            "          </Akt>\n" +
+            "        </IsikuOigusedKohustused>\n" +
+            "      </Vastus>\n" +
+            "    </ArestiVastused>\n" +
+            "  </response>\n" +
+            "</response>";
+
+
+    private final static String RESULT_SINGLE_ROW_FORMAT = "<response xmlns:era=\"http://earest.x-road.eu/\" xmlns=\"f\">\n" +
+            "  <request xmlns=\"\">\n" +
+            "    <ParinguKoostamiseAeg>2017-10-06T15:51:00</ParinguKoostamiseAeg>\n" +
+            "  </request>\n" +
+            "  <response xmlns=\"\">\n" +
+            "    <ArestiVastused>\n" +
+            "      <Vastus>\n" +
+            "        <IsikuOigusedKohustused>\n" +
+            "          <Akt>\n" +
+            "            <AlgParinguUnikaalneID>A801201702209240</AlgParinguUnikaalneID>\n" +
+            "            <VolitatudKasutajad>\n" +
+            "              <VolitatudKasutaja>\n" +
+            "                <VolituseLaad/>\n" +
+            "                <VolituseFailiNimi>jyritamm</VolituseFailiNimi>\n" +
+            "                <VolituseFail>JVBERi0xLjUNCiW1tbW1DQoxIDAgb2JqDQo8PC9UeXBlL0NhdGFsb" +
+            "2cvUGFnZXMgMiAwIFIvTGFuZyhldC1FRSkgL1N0cnVjdFRyZWVSb290IDE1IDAgUi9NYXJrSW5mbzw8L01h" +
+            "cmtlZCB0cnVlPj4+CjE1MDc2Nw0KJSVFT0YNCnhyZWYNCjAgMA0KdHJhaWxlcg0KPDwvU2l6ZSAyNy9Sb29" +
+            "0IDEgMCBSL0luZm8gMTQgMCBSL0lEWzxBNDQzRkEyNkVCQzM3RTRDODczOUFEQkYxNUEyRTZDRj48QTQ0M0" +
+            "ZBMjZFQkMzN0U0Qzg3MzlBREJGMTVBMkU2Q0YXSAvUHJldiAxNTA3NjcvWFJlZlN0bSAxNTA0NjM+Pg0Kc3" +
+            "RhcnR4cmVmDQoxNTE0NjUNCiUlRU9G</VolituseFail>\n" +
+            "              </VolitatudKasutaja>\n" +
+            "            </VolitatudKasutajad>\n" +
+            "          </Akt>\n" +
+            "        </IsikuOigusedKohustused>\n" +
+            "      </Vastus>\n" +
+            "    </ArestiVastused>\n" +
+            "  </response>\n" +
+            "</response>";
+
+    public static final StandardXRoadConsumerMessageExtractor EXTRACTOR =
+            new StandardXRoadConsumerMessageExtractor(new XmlBeansXRoadMetadata("operation",
+            "b",
+            "request",
+            "d",
+            "response",
+            "f",
+            "1"));
+
+
+    private SOAPMessage getMessageFromString(String filename) throws SOAPException, IOException {
+        InputStream is = (new ClassPathResource(filename)).getInputStream();
+
+        return MessageFactory.newInstance().createMessage(null, is);
+    }
+
+    @Test
+    public void testExtractDataWithComment() throws IOException, SOAPException {
+        // with comment
+        XRoadMessage message = EXTRACTOR.extractData(new SaajSoapMessage(getMessageFromString("extractor/EarestFail6.xml")));
+        assertEquals(RESULT_PEM_FORMAT, message.getContent().toString());
+    }
+
+
+    @Test
+    public void testExtractDataBase64SingleRow() throws IOException, SOAPException {
+        // whole file in a single row (base64binary in a single row)
+        XRoadMessage message = EXTRACTOR.extractData(new SaajSoapMessage(getMessageFromString("extractor/EarestFail4.xml")));
+        assertEquals(RESULT_SINGLE_ROW_FORMAT, message.getContent().toString());
+    }
+
+    @Test
+    public void testExtractDataBase64PEMFormat() throws IOException, SOAPException {
+        // xml elements in a single row, but base64binary part on different rows (PEM format)
+        XRoadMessage message1 = EXTRACTOR.extractData(new SaajSoapMessage(getMessageFromString("extractor/EarestFail1.xml")));
+        assertEquals(RESULT_PEM_FORMAT, message1.getContent().toString());
+
+        // manually formated file with whitespaces between elements without new row (base64binary in PEM format)
+        XRoadMessage message2 = EXTRACTOR.extractData(new SaajSoapMessage(getMessageFromString("extractor/EarestFail2.xml")));
+        assertEquals(RESULT_PEM_FORMAT, message2.getContent().toString());
+
+        // menually formated file without whitespaces between elements and without new row (base64binary in PEM format)
+        XRoadMessage message3 = EXTRACTOR.extractData(new SaajSoapMessage(getMessageFromString("extractor/EarestFail3.xml")));
+        assertEquals(RESULT_PEM_FORMAT, message3.getContent().toString());
+
+        // menually formated file with whitespaces between elements and without new row (base64binary in PEM format)
+        XRoadMessage message5 = EXTRACTOR.extractData(new SaajSoapMessage(getMessageFromString("extractor/EarestFail5.xml")));
+        assertEquals(RESULT_PEM_FORMAT, message5.getContent().toString());
+    }
+}
diff --git a/client-transport/src/test/resources/extractor/EarestFail1.xml b/client-transport/src/test/resources/extractor/EarestFail1.xml
@@ -0,0 +1,6 @@
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ear="http://earest.x-road.eu/" xmlns:id="http://x-road.eu/xsd/identifiers" xmlns:xroad="http://x-road.eu/xsd/xroad.xsd"><SOAP-ENV:Header><xroad:userId>70000349</xroad:userId><xroad:id>15d11af556270000349-1423336605</xroad:id><xroad:protocolVersion>4.0</xroad:protocolVersion><xroad:client id:objectType="SUBSYSTEM"><id:xRoadInstance>ee-dev</id:xRoadInstance><id:memberClass>GOV</id:memberClass><id:memberCode>70000349</id:memberCode><id:subsystemCode>earest-client</id:subsystemCode></xroad:client><xroad:service id:objectType="SERVICE"><id:xRoadInstance>ee-dev</id:xRoadInstance><id:memberClass>GOV</id:memberClass><id:memberCode>70000310</id:memberCode><id:subsystemCode>earest</id:subsystemCode><id:serviceCode>MulleSaabunudAsjad</id:serviceCode><id:serviceVersion>v1</id:serviceVersion></xroad:service></SOAP-ENV:Header><SOAP-ENV:Body><era:MulleSaabunudAsjadResponse xmlns:era="http://earest.x-road.eu/"><request><ParinguKoostamiseAeg>2017-10-06T15:51:00</ParinguKoostamiseAeg></request><response><ArestiVastused><Vastus><IsikuOigusedKohustused><Akt><AlgParinguUnikaalneID>A801201702209240</AlgParinguUnikaalneID><VolitatudKasutajad><VolitatudKasutaja><VolituseLaad /><VolituseFailiNimi>jyritamm</VolituseFailiNimi><VolituseFail>JVBERi0xLjUNCiW1tbW1DQoxIDAgb2JqDQo8PC9UeXBlL0NhdGFsb2cvUGFnZXMgMiAwIFIvTGFu
+ZyhldC1FRSkgL1N0cnVjdFRyZWVSb290IDE1IDAgUi9NYXJrSW5mbzw8L01hcmtlZCB0cnVlPj4+
+CjE1MDc2Nw0KJSVFT0YNCnhyZWYNCjAgMA0KdHJhaWxlcg0KPDwvU2l6ZSAyNy9Sb290IDEgMCBS
+L0luZm8gMTQgMCBSL0lEWzxBNDQzRkEyNkVCQzM3RTRDODczOUFEQkYxNUEyRTZDRj48QTQ0M0ZB
+MjZFQkMzN0U0Qzg3MzlBREJGMTVBMkU2Q0Y+XSAvUHJldiAxNTA3NjcvWFJlZlN0bSAxNTA0NjM+
+Pg0Kc3RhcnR4cmVmDQoxNTE0NjUNCiUlRU9G</VolituseFail></VolitatudKasutaja></VolitatudKasutajad></Akt></IsikuOigusedKohustused></Vastus></ArestiVastused></response></era:MulleSaabunudAsjadResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/client-transport/src/test/resources/extractor/EarestFail2.xml b/client-transport/src/test/resources/extractor/EarestFail2.xml
@@ -0,0 +1,54 @@
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xroad="http://x-road.eu/xsd/xroad.xsd" xmlns:id="http://x-road.eu/xsd/identifiers" xmlns:ear="http://earest.x-road.eu/">
+	<SOAP-ENV:Header>
+		<xroad:userId>70000349</xroad:userId>
+		<xroad:id>15d11af556270000349-1423336605</xroad:id>
+		<xroad:protocolVersion>4.0</xroad:protocolVersion>
+		<xroad:client id:objectType="SUBSYSTEM">
+			<id:xRoadInstance>ee-dev</id:xRoadInstance>
+			<id:memberClass>GOV</id:memberClass>
+			<id:memberCode>70000349</id:memberCode>
+			<id:subsystemCode>earest-client</id:subsystemCode>
+		</xroad:client>
+		<xroad:service id:objectType="SERVICE">
+			<id:xRoadInstance>ee-dev</id:xRoadInstance>
+			<id:memberClass>GOV</id:memberClass>
+			<id:memberCode>70000310</id:memberCode>
+			<id:subsystemCode>earest</id:subsystemCode>
+			<id:serviceCode>MulleSaabunudAsjad</id:serviceCode>
+			<id:serviceVersion>v1</id:serviceVersion>
+		</xroad:service>
+	</SOAP-ENV:Header>
+	<SOAP-ENV:Body xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+
+
+
+	<era:MulleSaabunudAsjadResponse xmlns:era="http://earest.x-road.eu/">
+		<request>
+		<ParinguKoostamiseAeg>2017-10-06T15:51:00</ParinguKoostamiseAeg>
+		</request>
+		<response>
+		<ArestiVastused>
+		<Vastus>
+		<IsikuOigusedKohustused>
+		<Akt>
+		<AlgParinguUnikaalneID>A801201702209240</AlgParinguUnikaalneID>
+		<VolitatudKasutajad>
+		<VolitatudKasutaja>
+		<VolituseLaad/>
+		<VolituseFailiNimi>jyritamm</VolituseFailiNimi>
+		<VolituseFail>JVBERi0xLjUNCiW1tbW1DQoxIDAgb2JqDQo8PC9UeXBlL0NhdGFsb2cvUGFnZXMgMiAwIFIvTGFu
+ZyhldC1FRSkgL1N0cnVjdFRyZWVSb290IDE1IDAgUi9NYXJrSW5mbzw8L01hcmtlZCB0cnVlPj4+
+CjE1MDc2Nw0KJSVFT0YNCnhyZWYNCjAgMA0KdHJhaWxlcg0KPDwvU2l6ZSAyNy9Sb290IDEgMCBS
+L0luZm8gMTQgMCBSL0lEWzxBNDQzRkEyNkVCQzM3RTRDODczOUFEQkYxNUEyRTZDRj48QTQ0M0ZB
+MjZFQkMzN0U0Qzg3MzlBREJGMTVBMkU2Q0Y+XSAvUHJldiAxNTA3NjcvWFJlZlN0bSAxNTA0NjM+
+Pg0Kc3RhcnR4cmVmDQoxNTE0NjUNCiUlRU9G</VolituseFail>
+		</VolitatudKasutaja>
+		</VolitatudKasutajad>
+		</Akt>
+		</IsikuOigusedKohustused>
+		</Vastus>
+		</ArestiVastused>
+		</response>
+		</era:MulleSaabunudAsjadResponse>
+	</SOAP-ENV:Body>
+</SOAP-ENV:Envelope>
diff --git a/client-transport/src/test/resources/extractor/EarestFail3.xml b/client-transport/src/test/resources/extractor/EarestFail3.xml
@@ -0,0 +1,55 @@
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
+                   xmlns:xroad="http://x-road.eu/xsd/xroad.xsd" xmlns:id="http://x-road.eu/xsd/identifiers"
+                   xmlns:ear="http://earest.x-road.eu/">
+    <SOAP-ENV:Header>
+        <xroad:userId>70000349</xroad:userId>
+        <xroad:id>15d11af556270000349-1423336605</xroad:id>
+        <xroad:protocolVersion>4.0</xroad:protocolVersion>
+        <xroad:client id:objectType="SUBSYSTEM">
+            <id:xRoadInstance>ee-dev</id:xRoadInstance>
+            <id:memberClass>GOV</id:memberClass>
+            <id:memberCode>70000349</id:memberCode>
+            <id:subsystemCode>earest-client</id:subsystemCode>
+        </xroad:client>
+        <xroad:service id:objectType="SERVICE">
+            <id:xRoadInstance>ee-dev</id:xRoadInstance>
+            <id:memberClass>GOV</id:memberClass>
+            <id:memberCode>70000310</id:memberCode>
+            <id:subsystemCode>earest</id:subsystemCode>
+            <id:serviceCode>MulleSaabunudAsjad</id:serviceCode>
+            <id:serviceVersion>v1</id:serviceVersion>
+        </xroad:service>
+    </SOAP-ENV:Header>
+    <SOAP-ENV:Body xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+        <era:MulleSaabunudAsjadResponse xmlns:era="http://earest.x-road.eu/">
+            <request>
+                <ParinguKoostamiseAeg>2017-10-06T15:51:00</ParinguKoostamiseAeg>
+            </request>
+            <response>
+                <ArestiVastused>
+                    <Vastus>
+                        <IsikuOigusedKohustused>
+                            <Akt>
+                                <AlgParinguUnikaalneID>A801201702209240</AlgParinguUnikaalneID>
+                                <VolitatudKasutajad>
+                                    <VolitatudKasutaja>
+                                        <VolituseLaad/>
+                                        <VolituseFailiNimi>jyritamm</VolituseFailiNimi>
+                                        <VolituseFail>
+JVBERi0xLjUNCiW1tbW1DQoxIDAgb2JqDQo8PC9UeXBlL0NhdGFsb2cvUGFnZXMgMiAwIFIvTGFu
+ZyhldC1FRSkgL1N0cnVjdFRyZWVSb290IDE1IDAgUi9NYXJrSW5mbzw8L01hcmtlZCB0cnVlPj4+
+CjE1MDc2Nw0KJSVFT0YNCnhyZWYNCjAgMA0KdHJhaWxlcg0KPDwvU2l6ZSAyNy9Sb290IDEgMCBS
+L0luZm8gMTQgMCBSL0lEWzxBNDQzRkEyNkVCQzM3RTRDODczOUFEQkYxNUEyRTZDRj48QTQ0M0ZB
+MjZFQkMzN0U0Qzg3MzlBREJGMTVBMkU2Q0Y+XSAvUHJldiAxNTA3NjcvWFJlZlN0bSAxNTA0NjM+
+Pg0Kc3RhcnR4cmVmDQoxNTE0NjUNCiUlRU9G
+                                        </VolituseFail>
+                                    </VolitatudKasutaja>
+                                </VolitatudKasutajad>
+                            </Akt>
+                        </IsikuOigusedKohustused>
+                    </Vastus>
+                </ArestiVastused>
+            </response>
+        </era:MulleSaabunudAsjadResponse>
+    </SOAP-ENV:Body>
+</SOAP-ENV:Envelope>
diff --git a/client-transport/src/test/resources/extractor/EarestFail4.xml b/client-transport/src/test/resources/extractor/EarestFail4.xml
@@ -0,0 +1 @@
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ear="http://earest.x-road.eu/" xmlns:id="http://x-road.eu/xsd/identifiers" xmlns:xroad="http://x-road.eu/xsd/xroad.xsd"><SOAP-ENV:Header><xroad:userId>70000349</xroad:userId><xroad:id>15d11af556270000349-1423336605</xroad:id><xroad:protocolVersion>4.0</xroad:protocolVersion><xroad:client id:objectType="SUBSYSTEM"><id:xRoadInstance>ee-dev</id:xRoadInstance><id:memberClass>GOV</id:memberClass><id:memberCode>70000349</id:memberCode><id:subsystemCode>earest-client</id:subsystemCode></xroad:client><xroad:service id:objectType="SERVICE"><id:xRoadInstance>ee-dev</id:xRoadInstance><id:memberClass>GOV</id:memberClass><id:memberCode>70000310</id:memberCode><id:subsystemCode>earest</id:subsystemCode><id:serviceCode>MulleSaabunudAsjad</id:serviceCode><id:serviceVersion>v1</id:serviceVersion></xroad:service></SOAP-ENV:Header><SOAP-ENV:Body><era:MulleSaabunudAsjadResponse xmlns:era="http://earest.x-road.eu/"><request><ParinguKoostamiseAeg>2017-10-06T15:51:00</ParinguKoostamiseAeg></request><response><ArestiVastused><Vastus><IsikuOigusedKohustused><Akt><AlgParinguUnikaalneID>A801201702209240</AlgParinguUnikaalneID><VolitatudKasutajad><VolitatudKasutaja><VolituseLaad /><VolituseFailiNimi>jyritamm</VolituseFailiNimi><VolituseFail>JVBERi0xLjUNCiW1tbW1DQoxIDAgb2JqDQo8PC9UeXBlL0NhdGFsb2cvUGFnZXMgMiAwIFIvTGFuZyhldC1FRSkgL1N0cnVjdFRyZWVSb290IDE1IDAgUi9NYXJrSW5mbzw8L01hcmtlZCB0cnVlPj4+CjE1MDc2Nw0KJSVFT0YNCnhyZWYNCjAgMA0KdHJhaWxlcg0KPDwvU2l6ZSAyNy9Sb290IDEgMCBSL0luZm8gMTQgMCBSL0lEWzxBNDQzRkEyNkVCQzM3RTRDODczOUFEQkYxNUEyRTZDRj48QTQ0M0ZBMjZFQkMzN0U0Qzg3MzlBREJGMTVBMkU2Q0YXSAvUHJldiAxNTA3NjcvWFJlZlN0bSAxNTA0NjM+Pg0Kc3RhcnR4cmVmDQoxNTE0NjUNCiUlRU9G</VolituseFail></VolitatudKasutaja></VolitatudKasutajad></Akt></IsikuOigusedKohustused></Vastus></ArestiVastused></response></era:MulleSaabunudAsjadResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/client-transport/src/test/resources/extractor/EarestFail5.xml b/client-transport/src/test/resources/extractor/EarestFail5.xml
@@ -0,0 +1,50 @@
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xroad="http://x-road.eu/xsd/xroad.xsd" xmlns:id="http://x-road.eu/xsd/identifiers" xmlns:ear="http://earest.x-road.eu/">
+	<SOAP-ENV:Header>
+		<xroad:userId>70000349</xroad:userId>
+		<xroad:id>15d11af556270000349-1423336605</xroad:id>
+		<xroad:protocolVersion>4.0</xroad:protocolVersion>
+		<xroad:client id:objectType="SUBSYSTEM">
+			<id:xRoadInstance>ee-dev</id:xRoadInstance>
+			<id:memberClass>GOV</id:memberClass>
+			<id:memberCode>70000349</id:memberCode>
+			<id:subsystemCode>earest-client</id:subsystemCode>
+		</xroad:client>
+		<xroad:service id:objectType="SERVICE">
+			<id:xRoadInstance>ee-dev</id:xRoadInstance>
+			<id:memberClass>GOV</id:memberClass>
+			<id:memberCode>70000310</id:memberCode>
+			<id:subsystemCode>earest</id:subsystemCode>
+			<id:serviceCode>MulleSaabunudAsjad</id:serviceCode>
+			<id:serviceVersion>v1</id:serviceVersion>
+		</xroad:service>
+	</SOAP-ENV:Header>
+	<SOAP-ENV:Body xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">		<era:MulleSaabunudAsjadResponse xmlns:era="http://earest.x-road.eu/">
+		<request>
+			<ParinguKoostamiseAeg>2017-10-06T15:51:00</ParinguKoostamiseAeg>
+		</request>
+		<response>
+			<ArestiVastused>
+				<Vastus>
+					<IsikuOigusedKohustused>
+						<Akt>
+							<AlgParinguUnikaalneID>A801201702209240</AlgParinguUnikaalneID>
+							<VolitatudKasutajad>
+								<VolitatudKasutaja>
+									<VolituseLaad/>
+									<VolituseFailiNimi>jyritamm</VolituseFailiNimi>
+									<VolituseFail>JVBERi0xLjUNCiW1tbW1DQoxIDAgb2JqDQo8PC9UeXBlL0NhdGFsb2cvUGFnZXMgMiAwIFIvTGFu
+ZyhldC1FRSkgL1N0cnVjdFRyZWVSb290IDE1IDAgUi9NYXJrSW5mbzw8L01hcmtlZCB0cnVlPj4+
+CjE1MDc2Nw0KJSVFT0YNCnhyZWYNCjAgMA0KdHJhaWxlcg0KPDwvU2l6ZSAyNy9Sb290IDEgMCBS
+L0luZm8gMTQgMCBSL0lEWzxBNDQzRkEyNkVCQzM3RTRDODczOUFEQkYxNUEyRTZDRj48QTQ0M0ZB
+MjZFQkMzN0U0Qzg3MzlBREJGMTVBMkU2Q0Y+XSAvUHJldiAxNTA3NjcvWFJlZlN0bSAxNTA0NjM+
+Pg0Kc3RhcnR4cmVmDQoxNTE0NjUNCiUlRU9G</VolituseFail>
+								</VolitatudKasutaja>
+							</VolitatudKasutajad>
+						</Akt>
+					</IsikuOigusedKohustused>
+				</Vastus>
+			</ArestiVastused>
+		</response>
+	</era:MulleSaabunudAsjadResponse>
+	</SOAP-ENV:Body>
+</SOAP-ENV:Envelope>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ear="http://earest.x-road.eu/" xmlns:id="http://x-road.eu/xsd/identifiers" xmlns:xroad="http://x-road.eu/xsd/xroad.xsd"><SOAP-ENV:Header><xroad:userId>70000349</xroad:userId><xroad:id>15d11af556270000349-1423336605</xroad:id><xroad:protocolVersion>4.0</xroad:protocolVersion><xroad:client id:objectType="SUBSYSTEM"><id:xRoadInstance>ee-dev</id:xRoadInstance><id:memberClass>GOV</id:memberClass><id:memberCode>70000349</id:memberCode><id:subsystemCode>earest-client</id:subsystemCode></xroad:client><xroad:service id:objectType="SERVICE"><id:xRoadInstance>ee-dev</id:xRoadInstance><id:memberClass>GOV</id:memberClass><id:memberCode>70000310</id:memberCode><id:subsystemCode>earest</id:subsystemCode><id:serviceCode>MulleSaabunudAsjad</id:serviceCode><id:serviceVersion>v1</id:serviceVersion></xroad:service></SOAP-ENV:Header><SOAP-ENV:Body><era:MulleSaabunudAsjadResponse xmlns:era="http://earest.x-road.eu/"><request><ParinguKoostamiseAeg>2017-10-06T15:51:00</ParinguKoostamiseAeg></request><response><ArestiVastused><Vastus><IsikuOigusedKohustused><Akt><AlgParinguUnikaalneID>A801201702209240</AlgParinguUnikaalneID><VolitatudKasutajad><VolitatudKasutaja><VolituseLaad /><VolituseFailiNimi>jyritamm</VolituseFailiNimi><VolituseFail>JVBERi0xLjUNCiW1tbW1DQoxIDAgb2JqDQo8PC9UeXBlL0NhdGFsb2cvUGFnZXMgMiAwIFIvTGFuZyhldC1FRSkgL1N0cnVjdFRyZWVSb290IDE1IDAgUi9NYXJrSW5mbzw8L01hcmtlZCB0cnVlPj4+CjE1MDc2Nw0KJSVFT0YNCnhyZWYNCjAgMA0KdHJhaWxlcg0KPDwvU2l6ZSAyNy9Sb290IDEgMCBSL0luZm8gMTQgMCBSL0lEWzxBNDQzRkEyNkVCQzM3RTRDODczOUFEQkYxNUEyRTZDRj48QTQ0M0ZBMjZFQkMzN0U0Qzg3MzlBREJGMTVBMkU2Q0YXSAvUHJldiAxNTA3NjcvWFJlZlN0bSAxNTA0NjM+Pg0Kc3RhcnR4cmVmDQoxNTE0NjUNCiUlRU9G</VolituseFail></VolitatudKasutaja></VolitatudKasutajad></Akt></IsikuOigusedKohustused></Vastus></ArestiVastused></response></era:MulleSaabunudAsjadResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>