From a171f28b462d5cbdca394bec14e35e27749c012c Mon Sep 17 00:00:00 2001
From: Johannes Brodwall <johannes.brodwall@soprasteria.com>
Date: Tue, 29 May 2018 21:07:39 +0200
Subject: [PATCH] Fix compilation errors with incomplete functionality from
 merge

---
 src/main/java/org/eaxy/experimental/SampleXmlBuilder.java   | 5 ++---
 .../java/org/eaxy/experimental/SoapSimulatorWebApp.java     | 4 ++--
 .../java/org/eaxy/experimental/SampleXmlBuilderTest.java    | 6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/eaxy/experimental/SampleXmlBuilder.java b/src/main/java/org/eaxy/experimental/SampleXmlBuilder.java
index a3c2d44..a0d6c6a 100644
--- a/src/main/java/org/eaxy/experimental/SampleXmlBuilder.java
+++ b/src/main/java/org/eaxy/experimental/SampleXmlBuilder.java
@@ -29,10 +29,9 @@ public class SampleXmlBuilder {
     private Random random = new Random();
     private String nsPrefix;
 
-    public SampleXmlBuilder(Document schemaDoc, String nsPrefix, SampleData sampleData) throws IOException {
+    public SampleXmlBuilder(Document schemaDoc, String nsPrefix) throws IOException {
         this.schemaDoc = schemaDoc;
         this.nsPrefix = nsPrefix;
-        this.sampleData = sampleData;
 
         xsNamespace = schemaDoc.getRootElement().getName().getNamespace();
         for (Element xsdInclude : schemaDoc.find("import")) {
@@ -49,7 +48,7 @@ public SampleXmlBuilder(Document schemaDoc, String nsPrefix, SampleData sampleDa
     }
 
     public SampleXmlBuilder(URL resource, String nsPrefix) throws IOException {
-        this(Xml.read(resource), nsPrefix, new SampleData());
+        this(Xml.read(resource), nsPrefix);
     }
 
     public SampleXmlBuilder(String nsPrefix, Document schemaDoc, List<Document> includedSchemas) {
diff --git a/src/main/java/org/eaxy/experimental/SoapSimulatorWebApp.java b/src/main/java/org/eaxy/experimental/SoapSimulatorWebApp.java
index 16c27f6..8a9a131 100644
--- a/src/main/java/org/eaxy/experimental/SoapSimulatorWebApp.java
+++ b/src/main/java/org/eaxy/experimental/SoapSimulatorWebApp.java
@@ -128,7 +128,7 @@ private static Map<String, String> readMultipart(String boundary, InputStream in
         return formData;
     }
 
-    public static class StockQuoteRandomData extends SampleData {
+    private static class StockQuoteRandomData extends SampleData {
 
         private static Namespace NS = new Namespace("http://example.com/stockquote.xsd");
 
@@ -146,7 +146,7 @@ public String randomElementText(QualifiedName elementName, Element typeDefinitio
     public static void main(String[] args) throws IOException {
         SoapSimulatorWebApp server = new SoapSimulatorWebApp(10080);
         server.addSoapEndpoint("/soap/stockQuote",
-            new SampleSoapXmlBuilder(Xml.read(new File("src/test/resources/xsd/StockQuoteService.wsdl")), new StockQuoteRandomData()));
+            new SampleSoapXmlBuilder(Xml.read(new File("src/test/resources/xsd/StockQuoteService.wsdl"))));
         server.addSoapEndpoint("/soap/airport",
             new SampleSoapXmlBuilder(Xml.read(new File("src/test/xml/wsdl-suite/airport.wsdl"))));
         server.start();
diff --git a/src/test/java/org/eaxy/experimental/SampleXmlBuilderTest.java b/src/test/java/org/eaxy/experimental/SampleXmlBuilderTest.java
index 299f23b..eb393f2 100644
--- a/src/test/java/org/eaxy/experimental/SampleXmlBuilderTest.java
+++ b/src/test/java/org/eaxy/experimental/SampleXmlBuilderTest.java
@@ -32,7 +32,7 @@ public void shouldGenerateMessageFromWsdl() throws IOException {
     @Test
     public void shouldGenerateAttributeValues() throws IOException {
         Document schemaDoc = Xml.readResource("/mailmessage.xsd");
-        SampleXmlBuilder generator = new SampleXmlBuilder(schemaDoc, null, new SampleData());
+        SampleXmlBuilder generator = new SampleXmlBuilder(schemaDoc, null);
         generator.setFull(true);
         Element element = generator.createRandomElement("message");
         assertThat(element.find("recipients", "recipient").first().attr("type")).isIn("email", "phone");
@@ -41,7 +41,7 @@ public void shouldGenerateAttributeValues() throws IOException {
     @Test
     public void shouldGenerateManyElementsWhenAppropriate() throws Exception {
         Document schemaDoc = Xml.readResource("/mailmessage.xsd");
-        SampleXmlBuilder generator = new SampleXmlBuilder(schemaDoc, "msg", new SampleData());
+        SampleXmlBuilder generator = new SampleXmlBuilder(schemaDoc, "msg");
         generator.setFull(true);
         Element element = generator.createRandomElement("message");
         generator.getValidator().validate(element);
@@ -63,7 +63,7 @@ public void shouldBuildFull() throws IOException {
     @Test
     public void shouldBuildMinimal() throws IOException {
         Document schemaDoc = Xml.readResource("/xsd/po.xsd");
-        SampleXmlBuilder generator = new SampleXmlBuilder(schemaDoc, null, new SampleData());
+        SampleXmlBuilder generator = new SampleXmlBuilder(schemaDoc, null);
         generator.setMinimal(true);
         Element el = generator.createRandomElement("purchaseOrder");
         assertThat(el.hasAttr("orderDate")).isFalse();