#92

carnival-data · May 12, 2022 · c5d3fba · c5d3fba
1 parent 65eb4df
commit c5d3fba
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 118 deletions.
diff --git a/app/carnival-util/src/main/groovy/carnival/util/MappedDataInterface.groovy b/app/carnival-util/src/main/groovy/carnival/util/MappedDataInterface.groovy
diff --git a/app/carnival-util/src/main/groovy/carnival/util/MappedDataTable.groovy b/app/carnival-util/src/main/groovy/carnival/util/MappedDataTable.groovy
@@ -35,7 +35,7 @@ import org.yaml.snakeyaml.representer.Representer
  *
  */
 @ToString(excludes=['data'], includeNames=true)
-class MappedDataTable extends DataTable implements MappedDataInterface {
+class MappedDataTable extends DataTable {
 
 
     ///////////////////////////////////////////////////////////////////////////
@@ -442,18 +442,6 @@ class MappedDataTable extends DataTable implements MappedDataInterface {
     }
 
 
-    /**
-     * Implementation of MappedDataInterface method.
-     *
-     */
-    public void dataAdd(java.sql.ResultSet row, String idField, String dataFieldPrefix) {
-        assert toFieldName(idField) == this.idFieldName
-
-        def vals = toMap(row)
-        dataAddWithModifications(vals, [dataFieldPrefix:dataFieldPrefix])
-    }
-
-
     /**
      * Convert a java.sql.ResultSet to a Map<String,Object>.
      *
@@ -741,20 +729,6 @@ class MappedDataTable extends DataTable implements MappedDataInterface {
         return destFile
     }
 
-
-
-    /**
-     * Implementation of MappedDataInterface method.
-     * Is expected to be called only be legacy code.
-     *
-     */
-    public void writeToFile(Map args = [:]) {
-        log.warn "MappedDataTable writeToFile ignoring args: $args"
-        log.warn "MappedDataTable writing to ${Defaults.dataCacheDirectory}"
-        writeFiles(Defaults.dataCacheDirectory)
-    }
-
-
 }
 
 

diff --git a/app/carnival-util/src/test/groovy/carnival/util/MappedDataTableSpec.groovy b/app/carnival-util/src/test/groovy/carnival/util/MappedDataTableSpec.groovy
@@ -265,7 +265,7 @@ class MappedDataTableSpec extends Specification {
     ///////////////////////////////////////////////////////////////////////////
 
 
-    def "dataAdd ResultSet dataFieldPrefix"() {
+    /*def "dataAdd ResultSet dataFieldPrefix"() {
         given:
         def mdt
         def res
@@ -321,7 +321,7 @@ class MappedDataTableSpec extends Specification {
 
         then:
         mdt.data['id2'].size() == 2
-    }
+    }*/
-Original file line number
+Diff line change
@@ Expand Up / @@ -265,7 +265,7 @@ class MappedDataTableSpec extends Specification { @@
         ///////////////////////////////////////////////////////////////////////////
-        def "dataAdd ResultSet dataFieldPrefix"() {
+        /*def "dataAdd ResultSet dataFieldPrefix"() {
             given:
             def mdt
             def res
@@ Expand Down Expand Up / @@ -321,7 +321,7 @@ class MappedDataTableSpec extends Specification { @@
             then:
             mdt.data['id2'].size() == 2
-        }
+        }*/
@@ Expand Down @@