Merge pull request #377 from spidasoftware/downgrade-advanced-wires-174911733

luanhnguyen07 · web-flow · commit 95ea4b87d762 · 2020-10-13T19:48:36.000-04:00
[Delivers #174911733] downgrade advanced wires to basic
diff --git a/src/main/groovy/com/spidasoftware/schema/conversion/changeset/AbstractConverter.groovy b/src/main/groovy/com/spidasoftware/schema/conversion/changeset/AbstractConverter.groovy
@@ -14,8 +14,8 @@ abstract class AbstractConverter implements Converter {
 	protected TreeMap<Integer, List<ChangeSet>> versions = new TreeMap<>() // each list will be applied when going from N-1 to N
 	private int currentVersion
 
-	abstract void applyChangeset(ChangeSet changeSet, Map json)
-	abstract void revertChangeset(ChangeSet changeSet, Map json)
+	abstract boolean applyChangeset(ChangeSet changeSet, Map json)
+	abstract boolean revertChangeset(ChangeSet changeSet, Map json)
 
 	int getCurrentVersion() {
 		return currentVersion
@@ -25,7 +25,7 @@ abstract class AbstractConverter implements Converter {
 		currentVersion = version
 	}
 
-	void convert(Map json, int toVersion) throws ConversionException {
+	boolean convert(Map json, int toVersion) throws ConversionException {
 		int fromVersion = defaultVersion
 		if (json.containsKey("version") && json.get('version')!=null) {
 			fromVersion = json.get("version")
@@ -37,6 +37,7 @@ abstract class AbstractConverter implements Converter {
 		}
 
 		List<ChangeSet> toApply = []
+		boolean converted = false
 		if (toVersion > fromVersion) {
 			// all changesets to go TO fromVersion have already been applied to json
 			((fromVersion + 1)..toVersion).each { int index ->
@@ -45,7 +46,9 @@ abstract class AbstractConverter implements Converter {
 				}
 			}
 			toApply.each { ChangeSet changeSet ->
-				applyChangeset(changeSet, json)
+				if (applyChangeset(changeSet, json)) {
+					converted = true
+				}
 			}
 		} else {
 			((toVersion + 1)..fromVersion).each { int index ->
@@ -56,10 +59,13 @@ abstract class AbstractConverter implements Converter {
 			// need to revert in reverse order
 			toApply.reverseEach { ChangeSet changeSet ->
 				Logger.getLogger(AbstractConverter).info("Applying changest: ${changeSet.class.simpleName}")
-				revertChangeset(changeSet, json)
+				if (revertChangeset(changeSet, json)) {
+					converted = true
+				}
 			}
 		}
 		updateVersion(json, toVersion)
+		return converted
 	}
 
 	/**
diff --git a/src/main/groovy/com/spidasoftware/schema/conversion/changeset/Converter.groovy b/src/main/groovy/com/spidasoftware/schema/conversion/changeset/Converter.groovy
@@ -6,7 +6,7 @@ package com.spidasoftware.schema.conversion.changeset
 interface Converter {
 
     String getSchemaPath()
-    void convert(Map json, int toVersion) throws ConversionException
+    boolean convert(Map json, int toVersion) throws ConversionException
     int getCurrentVersion()
     void addChangeSet(int version, ChangeSet changeSet)
     void updateVersion(Map json, int version)
diff --git a/src/main/groovy/com/spidasoftware/schema/conversion/changeset/ConverterUtils.groovy b/src/main/groovy/com/spidasoftware/schema/conversion/changeset/ConverterUtils.groovy
@@ -23,8 +23,8 @@ class ConverterUtils {
         addCalcConverter(new CalcProjectConverter())
         addCalcConverter(new CalcLocationConverter())
         addCalcConverter(new CalcDesignConverter())
-        addClientDataConverter(new ClientDataConverter())
         addCalcConverter(new CalcResultConverter())
+        addClientDataConverter(new ClientDataConverter())
     }
 
     static void addCalcConverter(AbstractCalcConverter converter) {
@@ -65,6 +65,7 @@ class ConverterUtils {
     }
 
     static void addClientDataConverter(ClientDataConverter converter) {
+        converter.addChangeSet(8, new AdvancedWireChangeSet())
         // add client data changesets here
 
         converter.setCurrentVersion(currentVersion)
diff --git a/src/main/groovy/com/spidasoftware/schema/conversion/changeset/calc/AbstractCalcConverter.groovy b/src/main/groovy/com/spidasoftware/schema/conversion/changeset/calc/AbstractCalcConverter.groovy
@@ -26,6 +26,7 @@ abstract class AbstractCalcConverter extends AbstractConverter {
 
 	private static final int VERSION_ALLOWED_IN_LOCATION_DESIGN = 4
 	private static final int VERSION_ALLOWED_IN_DETAILED_RESULTS = 7
+	private static final int VERSION_ALLOWED_IN_CLIENT_DATA = 7
 
 	protected boolean isVersionAllowedInLocationAndDesign(int version) {
 		return version >= VERSION_ALLOWED_IN_LOCATION_DESIGN
@@ -35,4 +36,7 @@ abstract class AbstractCalcConverter extends AbstractConverter {
 		return version >= VERSION_ALLOWED_IN_DETAILED_RESULTS
 	}
 
+	protected boolean isVersionAllowedInClientData(int version) {
+		return version >= VERSION_ALLOWED_IN_CLIENT_DATA
+	}
 }
diff --git a/src/main/groovy/com/spidasoftware/schema/conversion/changeset/calc/CalcDesignConverter.groovy b/src/main/groovy/com/spidasoftware/schema/conversion/changeset/calc/CalcDesignConverter.groovy
@@ -23,13 +23,15 @@ class CalcDesignConverter extends AbstractCalcConverter {
     }
 
     @Override
-    void applyChangeset(ChangeSet changeSet, Map json) {
+    boolean applyChangeset(ChangeSet changeSet, Map json) {
         changeSet.applyToDesign(json)
+        return true // always return true for now because there is no use case to check if it has been converted/not converted
     }
 
     @Override
-    void revertChangeset(ChangeSet changeSet, Map json) {
+    boolean revertChangeset(ChangeSet changeSet, Map json) {
         changeSet.revertDesign(json)
+        return true // always return true for now because there is no use case to check if it has been converted/not converted
     }
 }
 
diff --git a/src/main/groovy/com/spidasoftware/schema/conversion/changeset/calc/CalcLocationConverter.groovy b/src/main/groovy/com/spidasoftware/schema/conversion/changeset/calc/CalcLocationConverter.groovy
@@ -27,12 +27,14 @@ class CalcLocationConverter extends AbstractCalcConverter {
     }
 
     @Override
-    void applyChangeset(ChangeSet changeSet, Map json) {
+    boolean applyChangeset(ChangeSet changeSet, Map json) {
         changeSet.applyToLocation(json)
+        return true // always return true for now because there is no use case to check if it has been converted/not converted
     }
 
     @Override
-    void revertChangeset(ChangeSet changeSet, Map json) {
+    boolean revertChangeset(ChangeSet changeSet, Map json) {
         changeSet.revertLocation(json)
+        return true // always return true for now because there is no use case to check if it has been converted/not converted
     }
 }
diff --git a/src/main/groovy/com/spidasoftware/schema/conversion/changeset/calc/CalcProjectConverter.groovy b/src/main/groovy/com/spidasoftware/schema/conversion/changeset/calc/CalcProjectConverter.groovy
@@ -32,12 +32,14 @@ class CalcProjectConverter extends AbstractCalcConverter {
     }
 
     @Override
-    void applyChangeset(ChangeSet changeSet, Map json) {
+    boolean applyChangeset(ChangeSet changeSet, Map json) {
         changeSet.applyToProject(json)
+        return true // always return true for now because there is no use case to check if it has been converted/not converted
     }
 
     @Override
-    void revertChangeset(ChangeSet changeSet, Map json) {
+    boolean revertChangeset(ChangeSet changeSet, Map json) {
         changeSet.revertProject(json)
+        return true // always return true for now because there is no use case to check if it has been converted/not converted
     }
 }
diff --git a/src/main/groovy/com/spidasoftware/schema/conversion/changeset/calc/CalcResultConverter.groovy b/src/main/groovy/com/spidasoftware/schema/conversion/changeset/calc/CalcResultConverter.groovy
@@ -17,12 +17,12 @@ class CalcResultConverter extends AbstractCalcConverter {
 	}
 
 	@Override
-	void applyChangeset(ChangeSet changeSet, Map json) {
-		//noop: currently no change sets for results
+	boolean applyChangeset(ChangeSet changeSet, Map json) {
+		return false //noop: currently no change sets for results
 	}
 
 	@Override
-	void revertChangeset(ChangeSet changeSet, Map json) {
-		//noop: currently no change sets for results
+	boolean revertChangeset(ChangeSet changeSet, Map json) {
+		return false //noop: currently no change sets for results
 	}
 }
diff --git a/src/main/groovy/com/spidasoftware/schema/conversion/changeset/client/AbstractClientDataChangeSet.groovy b/src/main/groovy/com/spidasoftware/schema/conversion/changeset/client/AbstractClientDataChangeSet.groovy
@@ -15,7 +15,7 @@ import groovy.util.logging.Log4j
  */
 abstract class AbstractClientDataChangeSet extends ChangeSet {
 
-	abstract applyToClientData(Map projectJSON) throws ConversionException
-	abstract revertClientData(Map projectJSON) throws ConversionException
+	abstract boolean applyToClientData(Map clientDataJSON) throws ConversionException
+	abstract boolean revertClientData(Map clientDataJSON) throws ConversionException
 
 }
diff --git a/src/main/groovy/com/spidasoftware/schema/conversion/changeset/client/ClientDataConverter.groovy b/src/main/groovy/com/spidasoftware/schema/conversion/changeset/client/ClientDataConverter.groovy
@@ -3,15 +3,15 @@
  */
 package com.spidasoftware.schema.conversion.changeset.client
 
-import com.spidasoftware.schema.conversion.changeset.AbstractConverter
 import com.spidasoftware.schema.conversion.changeset.ChangeSet
+import com.spidasoftware.schema.conversion.changeset.calc.AbstractCalcConverter
 import groovy.util.logging.Log4j
 
 @Log4j
 /**
  * Converter for clientData json files.
  */
-class ClientDataConverter extends AbstractConverter {
+class ClientDataConverter extends AbstractCalcConverter {
 
     @Override
     String getSchemaPath() {
@@ -20,17 +20,19 @@ class ClientDataConverter extends AbstractConverter {
 
     @Override
     void updateVersion(Map json, int version) {
-        //todo discuss how we want to do changesets
+        if (isVersionAllowedInClientData(version)) {
+            json.put("version", version)
+        }
     }
 
     @Override
-    void applyChangeset(ChangeSet changeSet, Map json) {
-        changeSet.applyToClientData(json)
+    boolean applyChangeset(ChangeSet changeSet, Map json) {
+        return changeSet.applyToClientData(json)
     }
 
     @Override
-    void revertChangeset(ChangeSet changeSet, Map json) {
-        changeSet.revertClientData(json)
+    boolean revertChangeset(ChangeSet changeSet, Map json) {
+        return changeSet.revertClientData(json)
     }
 }
 
diff --git a/src/main/groovy/com/spidasoftware/schema/conversion/changeset/v8/AdvancedWireChangeSet.groovy b/src/main/groovy/com/spidasoftware/schema/conversion/changeset/v8/AdvancedWireChangeSet.groovy
@@ -0,0 +1,89 @@
+/*
+ * ©2009-2020 SPIDAWEB LLC
+ */
+package com.spidasoftware.schema.conversion.changeset.v8
+
+import com.spidasoftware.schema.conversion.changeset.ConversionException
+import com.spidasoftware.schema.conversion.changeset.client.AbstractClientDataChangeSet
+import groovy.transform.CompileDynamic
+import groovy.transform.CompileStatic
+
+@CompileStatic
+/**
+ * Advanced wires were introduced in 7.3.
+ * Down converts all advanced wires to basic when exporting exchange file to a version older than 7.3.
+ */
+class AdvancedWireChangeSet extends AbstractClientDataChangeSet {
+
+	private final static double POUND_FORCE_PER_SQUARE_INCH_TO_PASCAL = 1.450377377302092E-4d
+	private final static double PER_FAHRENHEIT_TO_PER_CELSIUS = 0.5555555555555556d
+
+	@Override
+	boolean applyToClientData(Map clientDataJSON) throws ConversionException {
+		return false //noop: there are no up conversions to 7.3
+	}
+
+	@Override
+	boolean revertClientData(Map clientDataJSON) throws ConversionException {
+		boolean converted = false
+		clientDataJSON.wires.each { Map clientWireJSON ->
+			if (clientWireJSON.calculation == "NONLINEAR_STRESS_STRAIN") {
+				if (revertAdvancedClientWire(clientWireJSON)) {
+					converted = true
+				}
+			}
+		}
+		return converted
+	}
+
+	/**
+	 * Change calculation type from non-linear to dynamic
+	 * Calculate the expansion coeff and modulus
+	 * Throw away all the polynomial data
+	 */
+	@CompileDynamic
+	boolean revertAdvancedClientWire(Map clientWireJSON) {
+		clientWireJSON.calculation = "DYNAMIC"
+		clientWireJSON.put("modulus", [value: calculateModulus(clientWireJSON), unit: "PASCAL"])
+		clientWireJSON.put("expansionCoefficient", [value: calculatedExpansionCoefficient(clientWireJSON), unit: "PER_CELSIUS"])
+		clientWireJSON.conductorProperties = "TOTAL"
+		clientWireJSON.remove("outerModulus")
+		clientWireJSON.remove("coreModulus")
+		clientWireJSON.remove("outerExpansionCoefficient")
+		clientWireJSON.remove("coreExpansionCoefficient")
+		clientWireJSON.remove("stressStrainPolynomials")
+		clientWireJSON.remove("creepPolynomials")
+	}
+
+	/*** All of the below methods should be coupled with the methods in calc client wire. ***/
+
+	protected double calculateModulus(Map clientWireJSON) {
+		return getPascalValue((Map) clientWireJSON.outerModulus) + getPascalValue((Map) clientWireJSON.coreModulus)
+	}
+
+	protected double calculatedExpansionCoefficient(Map clientWireJSON) {
+		double outerExpansionCoefficientPerC = getCelsiusValue((Map) clientWireJSON.outerExpansionCoefficient)
+		double coreExpansionCoefficientPerC = getCelsiusValue((Map) clientWireJSON.coreExpansionCoefficient)
+		double outerModulusPa = getPascalValue((Map) clientWireJSON.outerModulus)
+		double coreModulusPa = getPascalValue((Map) clientWireJSON.coreModulus)
+		return (outerExpansionCoefficientPerC * (outerModulusPa / (outerModulusPa + coreModulusPa))) +
+				(coreExpansionCoefficientPerC * (coreModulusPa / (outerModulusPa + coreModulusPa)))
+	}
+
+	private double getPascalValue(Map measurable) {
+		if (measurable.unit == "POUND_FORCE_PER_SQUARE_INCH") {
+			return (double) measurable.value * POUND_FORCE_PER_SQUARE_INCH_TO_PASCAL
+		} else {
+			return (double) measurable.value
+		}
+	}
+
+	private double getCelsiusValue(Map measurable) {
+		if (measurable.unit == "PER_FAHRENHEIT") {
+			return (double) measurable.value * PER_FAHRENHEIT_TO_PER_CELSIUS
+		} else {
+			return (double) measurable.value
+		}
+	}
+
+}
diff --git a/src/test/groovy/com/spidasoftware/schema/conversion/changeset/ConverterTest.groovy b/src/test/groovy/com/spidasoftware/schema/conversion/changeset/ConverterTest.groovy
@@ -1,6 +1,7 @@
 package com.spidasoftware.schema.conversion.changeset
 
 import com.spidasoftware.schema.conversion.changeset.calc.*
+import com.spidasoftware.schema.conversion.changeset.client.ClientDataConverter
 import spock.lang.Specification
 
 class ConverterTest extends Specification {
@@ -14,6 +15,8 @@ class ConverterTest extends Specification {
 	CalcProjectConverter projectConverter = new CalcProjectConverter(versions: versions)
 	CalcLocationConverter locationConverter = new CalcLocationConverter(versions: versions)
 	CalcDesignConverter designConverter = new CalcDesignConverter(versions: versions)
+	ChangeSet eightToSeven = GroovyMock(){ getClass()>>ChangeSet }
+	ClientDataConverter clientDataConverter = new ClientDataConverter(versions: [8: [eightToSeven]])
 
 	def "Convert null-2"() {
 		when: "projectConverter"
@@ -231,4 +234,15 @@ class ConverterTest extends Specification {
 		then:
 			!json.containsKey("version")
 	}
+
+
+	def "revert client data"() {
+		setup:
+		json = [version: 8]
+		when:
+			clientDataConverter.convert(json, 7)
+		then:
+			1 * eightToSeven.revertClientData(json)
+			0 * eightToSeven.applyToClientData(json)
+	}
 }
diff --git a/src/test/groovy/com/spidasoftware/schema/conversion/changeset/v8/AdvancedWireChangeSetTest.groovy b/src/test/groovy/com/spidasoftware/schema/conversion/changeset/v8/AdvancedWireChangeSetTest.groovy
@@ -0,0 +1,47 @@
+/*
+ * ©2009-2020 SPIDAWEB LLC
+ */
+package com.spidasoftware.schema.conversion.changeset.v8
+
+import groovy.json.JsonSlurper
+import groovy.transform.CompileDynamic
+import spock.lang.Specification
+
+class AdvancedWireChangeSetTest extends Specification {
+
+	@CompileDynamic
+	def "revert client data"() {
+		def stream = AdvancedWireChangeSet.getResourceAsStream("/conversions/v8/AdvancedWireChangeSet.json".toString())
+		Map json = new JsonSlurper().parse(stream)
+		stream.close()
+		when:
+			new AdvancedWireChangeSet().revertClientData(json)
+		then:
+			json.wires[0].calculation == "DYNAMIC"
+			json.wires[0].modulus.value == 7.451508944591707E10
+			json.wires[0].modulus.unit == "PASCAL"
+			json.wires[0].expansionCoefficient.value == 1.8821596113809853E-5
+			json.wires[0].expansionCoefficient.unit == "PER_CELSIUS"
+			json.wires[0].conductorProperties == "TOTAL"
+			json.wires[0].outerModulus == null
+			json.wires[0].coreModulus == null
+			json.wires[0].outerExpansionCoefficient == null
+			json.wires[0].coreExpansionCoefficient == null
+			json.wires[0].stressStrainPolynomials == null
+			json.wires[0].creepPolynomials == null
+
+			//convert imperial to metric values
+			json.wires[1].calculation == "DYNAMIC"
+			json.wires[1].modulus.value == 1.08075E7
+			json.wires[1].modulus.unit == "PASCAL"
+			json.wires[1].expansionCoefficient.value == 1.0456442285449919E-5
+			json.wires[1].expansionCoefficient.unit == "PER_CELSIUS"
+			json.wires[1].conductorProperties == "TOTAL"
+			json.wires[1].outerModulus == null
+			json.wires[1].coreModulus == null
+			json.wires[1].outerExpansionCoefficient == null
+			json.wires[1].coreExpansionCoefficient == null
+			json.wires[1].stressStrainPolynomials == null
+			json.wires[1].creepPolynomials == null
+	}
+}
diff --git a/src/test/resources/conversions/v8/AdvancedWireChangeSet.json b/src/test/resources/conversions/v8/AdvancedWireChangeSet.json

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ class ConverterUtils {`
`23`	`23`	`addCalcConverter(new CalcProjectConverter())`
`24`	`24`	`addCalcConverter(new CalcLocationConverter())`
`25`	`25`	`addCalcConverter(new CalcDesignConverter())`
`26`		`- addClientDataConverter(new ClientDataConverter())`
`27`	`26`	`addCalcConverter(new CalcResultConverter())`
	`27`	`+ addClientDataConverter(new ClientDataConverter())`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`static void addCalcConverter(AbstractCalcConverter converter) {`
`@@ -65,6 +65,7 @@ class ConverterUtils {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`static void addClientDataConverter(ClientDataConverter converter) {`
	`68`	`+ converter.addChangeSet(8, new AdvancedWireChangeSet())`
`68`	`69`	`// add client data changesets here`
`69`	`70`
`70`	`71`	`converter.setCurrentVersion(currentVersion)`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ abstract class AbstractCalcConverter extends AbstractConverter {`
`26`	`26`
`27`	`27`	`private static final int VERSION_ALLOWED_IN_LOCATION_DESIGN = 4`
`28`	`28`	`private static final int VERSION_ALLOWED_IN_DETAILED_RESULTS = 7`
	`29`	`+ private static final int VERSION_ALLOWED_IN_CLIENT_DATA = 7`
`29`	`30`
`30`	`31`	`protected boolean isVersionAllowedInLocationAndDesign(int version) {`
`31`	`32`	`return version >= VERSION_ALLOWED_IN_LOCATION_DESIGN`
`@@ -35,4 +36,7 @@ abstract class AbstractCalcConverter extends AbstractConverter {`
`35`	`36`	`return version >= VERSION_ALLOWED_IN_DETAILED_RESULTS`
`36`	`37`	`}`
`37`	`38`
	`39`	`+ protected boolean isVersionAllowedInClientData(int version) {`
	`40`	`+ return version >= VERSION_ALLOWED_IN_CLIENT_DATA`
	`41`	`+ }`
`38`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,15 @@ class CalcDesignConverter extends AbstractCalcConverter {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`@Override`
`26`		`- void applyChangeset(ChangeSet changeSet, Map json) {`
	`26`	`+ boolean applyChangeset(ChangeSet changeSet, Map json) {`
`27`	`27`	`changeSet.applyToDesign(json)`
	`28`	`+ return true // always return true for now because there is no use case to check if it has been converted/not converted`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`@Override`
`31`		`- void revertChangeset(ChangeSet changeSet, Map json) {`
	`32`	`+ boolean revertChangeset(ChangeSet changeSet, Map json) {`
`32`	`33`	`changeSet.revertDesign(json)`
	`34`	`+ return true // always return true for now because there is no use case to check if it has been converted/not converted`
`33`	`35`	`}`
`34`	`36`	`}`
`35`	`37`
Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,14 @@ class CalcLocationConverter extends AbstractCalcConverter {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
`30`		`- void applyChangeset(ChangeSet changeSet, Map json) {`
	`30`	`+ boolean applyChangeset(ChangeSet changeSet, Map json) {`
`31`	`31`	`changeSet.applyToLocation(json)`
	`32`	`+ return true // always return true for now because there is no use case to check if it has been converted/not converted`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`@Override`
`35`		`- void revertChangeset(ChangeSet changeSet, Map json) {`
	`36`	`+ boolean revertChangeset(ChangeSet changeSet, Map json) {`
`36`	`37`	`changeSet.revertLocation(json)`
	`38`	`+ return true // always return true for now because there is no use case to check if it has been converted/not converted`
`37`	`39`	`}`
`38`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,14 @@ class CalcProjectConverter extends AbstractCalcConverter {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
`35`		`- void applyChangeset(ChangeSet changeSet, Map json) {`
	`35`	`+ boolean applyChangeset(ChangeSet changeSet, Map json) {`
`36`	`36`	`changeSet.applyToProject(json)`
	`37`	`+ return true // always return true for now because there is no use case to check if it has been converted/not converted`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`@Override`
`40`		`- void revertChangeset(ChangeSet changeSet, Map json) {`
	`41`	`+ boolean revertChangeset(ChangeSet changeSet, Map json) {`
`41`	`42`	`changeSet.revertProject(json)`
	`43`	`+ return true // always return true for now because there is no use case to check if it has been converted/not converted`
`42`	`44`	`}`
`43`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,12 @@ class CalcResultConverter extends AbstractCalcConverter {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`@Override`
`20`		`- void applyChangeset(ChangeSet changeSet, Map json) {`
`21`		`- //noop: currently no change sets for results`
	`20`	`+ boolean applyChangeset(ChangeSet changeSet, Map json) {`
	`21`	`+ return false //noop: currently no change sets for results`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@Override`
`25`		`- void revertChangeset(ChangeSet changeSet, Map json) {`
`26`		`- //noop: currently no change sets for results`
	`25`	`+ boolean revertChangeset(ChangeSet changeSet, Map json) {`
	`26`	`+ return false //noop: currently no change sets for results`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import groovy.util.logging.Log4j`
`15`	`15`	`*/`
`16`	`16`	`abstract class AbstractClientDataChangeSet extends ChangeSet {`
`17`	`17`
`18`		`- abstract applyToClientData(Map projectJSON) throws ConversionException`
`19`		`- abstract revertClientData(Map projectJSON) throws ConversionException`
	`18`	`+ abstract boolean applyToClientData(Map clientDataJSON) throws ConversionException`
	`19`	`+ abstract boolean revertClientData(Map clientDataJSON) throws ConversionException`
`20`	`20`
`21`	`21`	`}`