Updated deps, isolated us from possible problems due to scala/scala-module-dependency-sample#14

Author: elfprince13

build.sbt

@@ -9,9 +9,9 @@ lazy val root = (project in hereDir).
 		version := "1.0",
 		scalaVersion := "2.11.8",
 		libraryDependencies ++= Seq(	"org.scala-lang.modules" %% "scala-xml" % "1.0.6",
-						"org.apache.spark" %% "spark-core" % "2.0.1" % "provided",
+						"org.apache.spark" %% "spark-core" % "2.1.0" % "provided",
 						"org.json4s" %% "json4s-native" % "3.4.2",
-						"org.apache.commons" % "commons-io" % "1.3.2"),
+						"commons-io" % "commons-io" % "2.5"),
 		mainClass in assembly := Some("com.geopipe.modeltools.BatchGeometrySingle"),
 		assemblyOption in assembly := (assemblyOption in assembly).value.copy(prependShellScript = Some(defaultShellScript))
 	)

src/main/scala/com/geopipe/modeltools/BatchedGeometryRewriter.scala

@@ -1,7 +1,6 @@
 package com.geopipe.modeltools
 
 import scala.xml._
-import scala.xml.transform._
 
 import org.json4s._
 

src/main/scala/com/geopipe/modeltools/TransformerPipeline.scala

@@ -1,9 +1,10 @@
 package com.geopipe.modeltools
 
 import scala.xml._
-import scala.xml.transform._
+import scala.xml.transform.RewriteRule
 
 import com.geopipe.profiling.TicToc.{tic,toc}
+import com.geopipe.xml.RuleApplicator
 
 abstract class PipelineRuleStage[+T] extends RewriteRule {
 	def sideChannel:Map[Class[_],T]
@@ -19,7 +20,7 @@ class TransformerPipeline[+T](pipeline:Seq[Node => PipelineRuleStage[T]]) {
 				toc(s"rewriterAlloc at stage $i")
 
 				tic
-				val ret = (new RuleTransformer(stage))(collada)
+				val ret = (new RuleApplicator(stage))(collada)
 				toc(s"rewriter execution at stage $i")
 				i += 1
 				(ret, sideChannel ++ stage.sideChannel)

src/main/scala/com/geopipe/modeltools/UniqueEffectsRewriter.scala

@@ -1,9 +1,10 @@
 package com.geopipe.modeltools
 
 import scala.xml._
-import scala.xml.transform._
+import scala.xml.transform.RewriteRule
 
 import com.geopipe.profiling.TicToc.{tic,toc}
+import com.geopipe.xml.RuleApplicator
 
 class UniqueEffectsRewriter(collada:Node) extends PipelineRuleStage[Nothing] {
 
@@ -32,7 +33,7 @@ class UniqueEffectsRewriter(collada:Node) extends PipelineRuleStage[Nothing] {
 			val effectId = nodeHere \@ "id"
 			uniqueEffects.find{case (testId, testNode) =>
 				val tryReplaceWith = Map(effectId -> testId)
-				val replacer = new RuleTransformer(new ReplaceEffectIdRewriter(tryReplaceWith))
+				val replacer = new RuleApplicator(new ReplaceEffectIdRewriter(tryReplaceWith))
 				val replacement = replacer(nodeHere)
 				Utility.trim(testNode) xml_== Utility.trim(replacement) 
 			}.fold( (uniqueEffects + ((effectId, nodeHere)), replaceWith) ){

src/main/scala/com/geopipe/modeltools/UniqueImagesRewriter.scala

@@ -1,7 +1,6 @@
 package com.geopipe.modeltools
 
 import scala.xml._
-import scala.xml.transform._
 
 import com.geopipe.profiling.TicToc.{tic,toc}
 

src/main/scala/com/geopipe/modeltools/UpdateHelpers.scala

@@ -1,7 +1,9 @@
 package com.geopipe.modeltools
 
 import scala.xml._
-import scala.xml.transform._
+import scala.xml.transform.RewriteRule
+
+import com.geopipe.xml.RuleApplicator
 
 trait ElemMatchAndUpdate {
 	private[this] val self = this // Apparently can't use this as an extractor directly???
@@ -139,7 +141,7 @@ class EffectNeedsUpdate(replacements:Map[String,String]) extends ElemMatchAndUpd
 
 				val updatedTextures = textureNeedsUpdate.collectUpdates(textures)
 
-				val techniqueTransformer = new RuleTransformer(new TechniqueRewriter(updatedTextures))
+				val techniqueTransformer = new RuleApplicator(new TechniqueRewriter(updatedTextures))
 				val updatedTechniques = (effectProfile \ "technique").map(t => (t -> techniqueTransformer(t))).toMap
 
 				val paramUpdater = new ParamNeedsUpdate(updatedSurfaces, updatedSamplers, replacements)

src/main/scala/com/geopipe/modeltools/Utilities.scala

@@ -2,7 +2,6 @@ package com.geopipe.modeltools
 
 
 import scala.xml._
-import scala.xml.transform._
 import scala.language.implicitConversions
 
 

src/main/scala/com/geopipe/xml/RuleApplicator.scala

@@ -0,0 +1,8 @@
+package com.geopipe.xml
+
+import scala.xml.Node
+import scala.xml.transform.RewriteRule
+
+class RuleApplicator(rule:RewriteRule) extends SaneTransformer {
+	override def transform(n: Node): Seq[Node] = rule.transform(super.transform(n))
+}

src/main/scala/com/geopipe/xml/SaneTransformer.scala

@@ -0,0 +1,43 @@
+package com.geopipe.xml
+
+import scala.xml.{Node,Group,Elem,NodeBuffer}
+import scala.xml.transform.RewriteRule
+
+class SaneTransformer extends Function1[Node, Node] {
+	protected def unchanged(n: Node, ns: Seq[Node]) = ns.length == 1 && (ns.head == n)
+
+	/**
+	 * Call transform(Node) for each node in ns, append results
+	 *  to NodeBuffer.
+	 */
+	def transform(it: Iterator[Node], nb: NodeBuffer): Seq[Node] = it.foldLeft(nb)(_ ++= transform(_)).toSeq
+
+	/**
+	 * Call transform(Node) to each node in ns, yield ns if nothing changes,
+	 *  otherwise a new sequence of concatenated results.
+	 */
+	def transform(ns: Seq[Node]): Seq[Node] = {
+		val changed = ns flatMap transform
+		if (changed.length != ns.length || (changed, ns).zipped.exists(_ != _)) {
+			changed
+		} else { ns }
+	}
+
+	def transform(n: Node): Seq[Node] = {
+		if (n.doTransform) n match {
+			case Group(xs) => Group(transform(xs)) // un-group the hack Group tag
+			case _ =>
+				val ch = n.child
+				val nch = transform(ch)
+				if (ch eq nch) n
+				else Elem(n.prefix, n.label, n.attributes, n.scope, nch.isEmpty, nch: _*)
+		} else { n }
+	}
+
+	def apply(n: Node): Node = {
+		val seq = transform(n)
+		if (seq.length > 1) {
+			throw new UnsupportedOperationException("transform must return single node for root")
+		} else { seq.head }
+	}
+}