adjustments to work with unit conversion

Author: steffenjacobs

src/main/java/me/steffenjacobs/syntacticjsonmatcher/TestFileGenerator.java

@@ -15,13 +15,13 @@ public class TestFileGenerator {
 	private static final String[] VALUES_HUMIDITY = new String[] { "44", "\"44\"", "\"44%\"", "44.4", "\"44.4%\"" };
 
 	private static final String[] KEYS_PRESSURE = new String[] { "pressure", "p", "pres", "air pressure", "druck", "Luftdruck", "pressione" };
-	private static final String[] VALUES_PRESSURE = new String[] { "905", "\"905\"", "905.5", "\"905ppi\"", "\"905.5ppi\"", "\"905.5bar\"" };
+	private static final String[] VALUES_PRESSURE = new String[] { "905", "\"905\"", "905.5", "\"905psi\"", "\"905.5psi\"", "\"905.5bar\"" };
 
 	private static final String[] KEYS_CO2 = new String[] { "co2", "CO2", "co2 value" };
 	private static final String[] VALUES_CO2 = new String[] { "505", "505.5", "\"505ppm\"" };
 
 	private static final String[] KEYS_LIGHT = new String[] { "light", "brightness", "Helligkeit", "luminance" };
-	private static final String[] VALUES_LIGHT = new String[] { "1505", "1505.5", "\"1505lx\"", "\"1505lm\"" };
+	private static final String[] VALUES_LIGHT = new String[] { "1505", "1505.5", "\"1505lx\"", "\"1505phots\"" };
 
 	private static final double RANDOM_SAMPLING_RATE = .00008;
 

src/main/java/me/steffenjacobs/syntacticjsonmatcher/domain/wolframapi/ObjectFactory.java

@@ -2,7 +2,7 @@
 // Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 generiert 
 // Siehe <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Änderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. 
-// Generiert: 2018.11.23 um 03:11:54 PM CET 
+// Generiert: 2018.11.23 um 06:16:42 PM CET 
 //
 
 

src/main/java/me/steffenjacobs/syntacticjsonmatcher/domain/wolframapi/Queryresult.java

@@ -2,7 +2,7 @@
 // Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 generiert 
 // Siehe <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Änderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. 
-// Generiert: 2018.11.23 um 03:11:54 PM CET 
+// Generiert: 2018.11.23 um 06:16:42 PM CET 
 //
 
 
@@ -66,6 +66,7 @@
  *                 &lt;attribute name="position" type="{http://www.w3.org/2001/XMLSchema}int" />
  *                 &lt;attribute name="error" type="{http://www.w3.org/2001/XMLSchema}boolean" />
  *                 &lt;attribute name="numsubpods" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                 &lt;attribute name="primary" type="{http://www.w3.org/2001/XMLSchema}string" />
  *               &lt;/restriction>
  *             &lt;/complexContent>
  *           &lt;/complexType>
@@ -613,6 +614,7 @@ public void setVersion(BigDecimal value) {
      *       &lt;attribute name="position" type="{http://www.w3.org/2001/XMLSchema}int" />
      *       &lt;attribute name="error" type="{http://www.w3.org/2001/XMLSchema}boolean" />
      *       &lt;attribute name="numsubpods" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *       &lt;attribute name="primary" type="{http://www.w3.org/2001/XMLSchema}string" />
      *     &lt;/restriction>
      *   &lt;/complexContent>
      * &lt;/complexType>
@@ -639,6 +641,8 @@ public static class Pod {
         protected Boolean error;
         @XmlAttribute(name = "numsubpods")
         protected Integer numsubpods;
+        @XmlAttribute(name = "primary")
+        protected String primary;
 
         /**
          * Gets the value of the subpod property.
@@ -813,6 +817,30 @@ public void setNumsubpods(Integer value) {
             this.numsubpods = value;
         }
 
+        /**
+         * Ruft den Wert der primary-Eigenschaft ab.
+         * 
+         * @return
+         *     possible object is
+         *     {@link String }
+         *     
+         */
+        public String getPrimary() {
+            return primary;
+        }
+
+        /**
+         * Legt den Wert der primary-Eigenschaft fest.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link String }
+         *     
+         */
+        public void setPrimary(String value) {
+            this.primary = value;
+        }
+
 
         /**
          * <p>Java-Klasse für anonymous complex type.

src/main/java/me/steffenjacobs/syntacticjsonmatcher/service/UnitConversionService.java

@@ -46,9 +46,14 @@ public String convert(String source, String unit) {
 			return (String) conversionCache.get(key);
 		} else {
 			String request = buildRequest(source, unit);
-			String result = httpRequester.sendGet(request);
+			String oldresult = httpRequester.sendGet(request);
+			String result = "";
 			try {
-				result = extractResult(result, unit);
+				result = extractResult(oldresult, source, unit);
+				if (result == null) {
+					conversionCache.put(key, source);
+					return source;
+				}
 				result = cleanResult(result);
 			} catch (JAXBException e) {
 				LOG.error(e.getMessage());
@@ -69,7 +74,7 @@ public String cleanResult(String extractedResult) {
 		return extractedResult;
 	}
 
-	public String extractResult(String input, String unit) throws JAXBException {
+	public String extractResult(String input, String source, String unit) throws JAXBException {
 
 		JAXBContext jc = JAXBContext.newInstance(Queryresult.class);
 
@@ -79,7 +84,6 @@ public String extractResult(String input, String unit) throws JAXBException {
 		if (result.isSuccess()) {
 			for (Pod pod : result.getPod()) {
 				if ("Result".equals(pod.getId())) {
-
 					for (Subpod subpod : pod.getSubpod()) {
 						if (subpod != null && "".equals(subpod.getTitle())) {
 							return subpod.getPlaintext();
@@ -92,10 +96,11 @@ public String extractResult(String input, String unit) throws JAXBException {
 							return subpod.getPlaintext();
 						}
 					}
-					LOG.error("No result with correct converted unit in subpods not found.");
+					System.out.println(input);
+					LOG.error("No result with correct converted unit in subpods found.");
 				}
 			}
-			LOG.error("Result pod not found.");
+			LOG.error("No result found for conversion {} -> {}.", source, unit);
 		} else {
 			LOG.error("Query not successful.");
 		}