#1184 move common schema utils to vuu.util.schema

finos · Feb 21, 2024 · ff550f7 · ff550f7
1 parent b57ebf1
commit ff550f7
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 78 deletions.
diff --git a/...ignite/src/main/scala/org/finos/vuu/example/ignite/provider/IgniteOrderDataProvider.scala b/...ignite/src/main/scala/org/finos/vuu/example/ignite/provider/IgniteOrderDataProvider.scala
@@ -8,9 +8,9 @@ import org.finos.vuu.example.ignite.module.IgniteOrderDataModule
 import org.finos.vuu.example.ignite.provider.IgniteOrderDataProvider.columnNameByExternalField
 import org.finos.vuu.example.ignite.query.IndexCalculator
 import org.finos.vuu.example.ignite.schema.ChildOrderEntityObject
-import org.finos.vuu.feature.ignite.schema.SchemaMapper
 import org.finos.vuu.plugin.virtualized.table.{VirtualizedRange, VirtualizedSessionTable, VirtualizedViewPortKeys}
 import org.finos.vuu.provider.VirtualizedProvider
+import org.finos.vuu.util.schema.SchemaMapper
 import org.finos.vuu.viewport.ViewPort
 
 import java.util.concurrent.atomic.AtomicInteger

diff --git a/...he-ignite/src/main/scala/org/finos/vuu/example/ignite/provider/IgniteOrderDataQuery.scala b/...he-ignite/src/main/scala/org/finos/vuu/example/ignite/provider/IgniteOrderDataQuery.scala
@@ -4,8 +4,8 @@ import org.finos.vuu.core.module.simul.model.ChildOrder
 import org.finos.vuu.core.sort.ModelType.SortSpecInternal
 import org.finos.vuu.example.ignite.IgniteOrderStore
 import org.finos.vuu.feature.ignite.FilterAndSortSpecToSql
-import org.finos.vuu.feature.ignite.schema.SchemaMapper
 import org.finos.vuu.net.FilterSpec
+import org.finos.vuu.util.schema.SchemaMapper
 
 class IgniteOrderDataQuery private (private val igniteOrderStore: IgniteOrderStore,
                                     private val schemaMapper: SchemaMapper) {

diff --git a/...he-ignite/src/main/scala/org/finos/vuu/example/ignite/schema/BaseIgniteEntityObject.scala b/...he-ignite/src/main/scala/org/finos/vuu/example/ignite/schema/BaseIgniteEntityObject.scala
@@ -1,7 +1,7 @@
 package org.finos.vuu.example.ignite.schema
 
 import org.apache.ignite.cache.{QueryEntity, QueryIndex, QueryIndexType}
-import org.finos.vuu.feature.ignite.schema.ExternalEntitySchema
+import org.finos.vuu.util.schema.ExternalEntitySchema
 
 import scala.collection.mutable
 import scala.jdk.CollectionConverters._

diff --git a/...he-ignite/src/main/scala/org/finos/vuu/example/ignite/schema/ChildOrderEntityObject.scala b/...he-ignite/src/main/scala/org/finos/vuu/example/ignite/schema/ChildOrderEntityObject.scala
@@ -2,7 +2,7 @@ package org.finos.vuu.example.ignite.schema
 
 import org.apache.ignite.cache.QueryEntity
 import org.finos.vuu.core.module.simul.model.ChildOrder
-import org.finos.vuu.feature.ignite.schema.{ExternalEntitySchema, ExternalEntitySchemaBuilder}
+import org.finos.vuu.util.schema.{ExternalEntitySchema, ExternalEntitySchemaBuilder}
 
 object ChildOrderEntityObject {
   private val _schema = createSchema()

diff --git a/...test/scala/org/finos/vuu/example/ignite/provider/IgniteOrderDataQueryFunctionalTest.scala b/...test/scala/org/finos/vuu/example/ignite/provider/IgniteOrderDataQueryFunctionalTest.scala
@@ -6,8 +6,8 @@ import org.finos.vuu.core.sort.SortDirection
 import org.finos.vuu.example.ignite.module.IgniteOrderDataModule
 import org.finos.vuu.example.ignite.schema.ChildOrderEntityObject
 import org.finos.vuu.example.ignite.{IgniteOrderStore, TestUtils}
-import org.finos.vuu.feature.ignite.schema.SchemaMapper
 import org.finos.vuu.net.FilterSpec
+import org.finos.vuu.util.schema.SchemaMapper
 import org.scalatest.funsuite.AnyFunSuiteLike
 import org.scalatest.matchers.should.Matchers
 

diff --git a/...gnite/src/test/scala/org/finos/vuu/example/ignite/provider/IgniteOrderDataQueryTest.scala b/...gnite/src/test/scala/org/finos/vuu/example/ignite/provider/IgniteOrderDataQueryTest.scala
@@ -5,8 +5,8 @@ import org.finos.vuu.core.sort.SortDirection
 import org.finos.vuu.core.table.{Column, Columns}
 import org.finos.vuu.example.ignite.IgniteOrderStore
 import org.finos.vuu.example.ignite.provider.IgniteOrderDataQueryTest.{entitySchema, internalColumns, internalColumnsByExternalFields}
-import org.finos.vuu.feature.ignite.schema.{ExternalEntitySchemaBuilder, ExternalEntitySchema, SchemaMapper}
 import org.finos.vuu.net.FilterSpec
+import org.finos.vuu.util.schema.{ExternalEntitySchema, ExternalEntitySchemaBuilder, SchemaMapper}
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.featurespec.AnyFeatureSpec
 import org.scalatest.matchers.should.Matchers

diff --git a/...gnite/src/test/scala/org/finos/vuu/example/ignite/schema/BaseIgniteEntityObjectTest.scala b/...gnite/src/test/scala/org/finos/vuu/example/ignite/schema/BaseIgniteEntityObjectTest.scala
@@ -1,6 +1,6 @@
 package org.finos.vuu.example.ignite.schema
 
-import org.finos.vuu.feature.ignite.schema.ExternalEntitySchemaBuilder
+import org.finos.vuu.util.schema.ExternalEntitySchemaBuilder
 import org.scalatest.featurespec.AnyFeatureSpec
 import org.scalatest.matchers.should.Matchers
 

diff --git a/example/rest-api/pom.xml b/example/rest-api/pom.xml
@@ -17,58 +17,6 @@
             <artifactId>vuu</artifactId>
             <version>0.9.61-SNAPSHOT</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.finos.vuu.plugin</groupId>
-            <artifactId>ignite-plugin</artifactId>
-            <version>0.9.61-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.finos.vuu</groupId>
-            <artifactId>vuu</artifactId>
-            <version>0.9.61-SNAPSHOT</version>
-            <classifier>tests</classifier>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-            <version>${scala.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-reflect</artifactId>
-            <version>${scala.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.scalatest</groupId>
-            <artifactId>scalatest_2.13</artifactId>
-            <version>${scalatest.version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.scala-lang</groupId>
-                    <artifactId>scala-library</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.scala-lang</groupId>
-                    <artifactId>scala-reflect</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
     </dependencies>
 
     <profiles>
@@ -137,7 +85,6 @@
                 <artifactId>maven-source-plugin</artifactId>
                 <executions>
                     <execution>
-
                         <phase>compile</phase>
                         <goals>
                             <goal>jar</goal>

diff --git a/...ple/rest-api/src/main/scala/org/finos/vuu/example/rest/provider/InstrumentsProvider.scala b/...ple/rest-api/src/main/scala/org/finos/vuu/example/rest/provider/InstrumentsProvider.scala
@@ -6,8 +6,8 @@ import org.finos.vuu.core.table.{DataTable, RowWithData}
 import org.finos.vuu.example.rest.InstrumentServiceClient
 import org.finos.vuu.example.rest.model.Instrument
 import org.finos.vuu.example.rest.provider.InstrumentsProvider.{INSTRUMENTS_COUNT, columnNameByExternalField, externalSchema}
-import org.finos.vuu.feature.ignite.schema.{ExternalEntitySchema, ExternalEntitySchemaBuilder, SchemaMapper}
 import org.finos.vuu.provider.DefaultProvider
+import org.finos.vuu.util.schema.{ExternalEntitySchema, ExternalEntitySchemaBuilder, SchemaMapper}
 
 import scala.util.{Failure, Success}
 

diff --git a/...in/ignite-plugin/src/main/scala/org/finos/vuu/feature/ignite/FilterAndSortSpecToSql.scala b/...in/ignite-plugin/src/main/scala/org/finos/vuu/feature/ignite/FilterAndSortSpecToSql.scala
@@ -3,9 +3,9 @@ package org.finos.vuu.feature.ignite
 import org.finos.vuu.core.filter.FilterSpecParser
 import org.finos.vuu.core.sort.ModelType.SortSpecInternal
 import org.finos.vuu.feature.ignite.filter.{IgniteSqlFilterClause, IgniteSqlFilterTreeVisitor}
-import org.finos.vuu.feature.ignite.schema.SchemaMapper
 import org.finos.vuu.feature.ignite.sort.IgniteSqlSortBuilder
 import org.finos.vuu.net.FilterSpec
+import org.finos.vuu.util.schema.SchemaMapper
 
 trait FilterAndSortSpecToSql {
   def filterToSql(filterSpec: FilterSpec): String

diff --git a/...ite-plugin/src/main/scala/org/finos/vuu/feature/ignite/filter/IgniteSqlFilterClause.scala b/...ite-plugin/src/main/scala/org/finos/vuu/feature/ignite/filter/IgniteSqlFilterClause.scala
@@ -3,7 +3,7 @@ package org.finos.vuu.feature.ignite.filter
 import com.typesafe.scalalogging.StrictLogging
 import org.finos.vuu.core.table.DataType.{CharDataType, StringDataType}
 import org.finos.vuu.feature.ignite.filter.IgniteSqlFilterClause.EMPTY_SQL
-import org.finos.vuu.feature.ignite.schema.SchemaMapper
+import org.finos.vuu.util.schema.SchemaMapper
 
 private object IgniteSqlFilterClause {
   val EMPTY_SQL = ""

diff --git a/...ignite-plugin/src/main/scala/org/finos/vuu/feature/ignite/sort/IgniteSqlSortBuilder.scala b/...ignite-plugin/src/main/scala/org/finos/vuu/feature/ignite/sort/IgniteSqlSortBuilder.scala
@@ -2,7 +2,7 @@ package org.finos.vuu.feature.ignite.sort
 
 import org.finos.vuu.core.sort.ModelType.SortSpecInternal
 import org.finos.vuu.core.sort.SortDirection
-import org.finos.vuu.feature.ignite.schema.{SchemaMapper, SchemaField}
+import org.finos.vuu.util.schema.SchemaMapper
 
 
 //todo design discussions

diff --git a/...te-plugin/src/test/scala/org/finos/vuu/feature/ignite/filter/IgniteSqlFilteringTest.scala b/...te-plugin/src/test/scala/org/finos/vuu/feature/ignite/filter/IgniteSqlFilteringTest.scala
@@ -3,8 +3,8 @@ package org.finos.vuu.feature.ignite.filter
 import org.finos.vuu.core.filter.FilterSpecParser
 import org.finos.vuu.core.table.{Column, SimpleColumn}
 import org.finos.vuu.feature.ignite.TestInput._
-import org.finos.vuu.feature.ignite.schema.{ExternalEntitySchema, SchemaField, SchemaMapper}
 import org.finos.vuu.feature.ignite.{IgniteTestsBase, TestOrderEntity}
+import org.finos.vuu.util.schema.{ExternalEntitySchema, SchemaField, SchemaMapper}
 
 class IgniteSqlFilteringTest extends IgniteTestsBase {
 

diff --git a/...te-plugin/src/test/scala/org/finos/vuu/feature/ignite/sort/IgniteSqlSortBuilderTest.scala b/...te-plugin/src/test/scala/org/finos/vuu/feature/ignite/sort/IgniteSqlSortBuilderTest.scala
@@ -1,7 +1,7 @@
 package org.finos.vuu.feature.ignite.sort
 
 import org.finos.vuu.core.sort.SortDirection
-import org.finos.vuu.feature.ignite.schema.{SchemaField, SchemaMapper}
+import org.finos.vuu.util.schema.{SchemaField, SchemaMapper}
 import org.scalatest.featurespec.AnyFeatureSpec
 import org.scalamock.scalatest.MockFactory
 

diff --git a/...ignite-plugin/src/test/scala/org/finos/vuu/feature/ignite/sort/IgniteSqlSortingTest.scala b/...ignite-plugin/src/test/scala/org/finos/vuu/feature/ignite/sort/IgniteSqlSortingTest.scala
@@ -2,8 +2,8 @@ package org.finos.vuu.feature.ignite.sort
 
 import org.finos.vuu.core.sort.SortDirection
 import org.finos.vuu.feature.ignite.TestInput.createTestOrderEntity
-import org.finos.vuu.feature.ignite.schema.{SchemaField, SchemaMapper}
 import org.finos.vuu.feature.ignite.{IgniteTestsBase, TestOrderEntity}
+import org.finos.vuu.util.schema.{SchemaField, SchemaMapper}
 import org.scalamock.scalatest.MockFactory
 
 class IgniteSqlSortingTest extends IgniteTestsBase with MockFactory {

diff --git a/.../ignite/schema/ExternalEntitySchema.scala → ...uu/util/schema/ExternalEntitySchema.scala b/.../ignite/schema/ExternalEntitySchema.scala → ...uu/util/schema/ExternalEntitySchema.scala
@@ -1,8 +1,8 @@
-package org.finos.vuu.feature.ignite.schema
+package org.finos.vuu.util.schema
 
-import org.finos.vuu.feature.ignite.schema.EntitySchema.{ColumnName, Index, IndexName}
-import org.finos.vuu.feature.ignite.schema.ExternalDataType.{ExternalDataType, fromString}
-import org.finos.vuu.feature.ignite.schema.ExternalEntitySchemaBuilder.InvalidIndexException
+import org.finos.vuu.util.schema.EntitySchema.{ColumnName, Index, IndexName}
+import org.finos.vuu.util.schema.ExternalDataType.{ExternalDataType, fromString}
+import org.finos.vuu.util.schema.ExternalEntitySchemaBuilder.InvalidIndexException
 
 import scala.collection.mutable
 import scala.collection.mutable.ListBuffer

diff --git a/...u/feature/ignite/schema/SchemaField.scala → ...g/finos/vuu/util/schema/SchemaField.scala b/...u/feature/ignite/schema/SchemaField.scala → ...g/finos/vuu/util/schema/SchemaField.scala
@@ -1,3 +1,3 @@
-package org.finos.vuu.feature.ignite.schema
+package org.finos.vuu.util.schema
 
 case class SchemaField(name: String, dType: Class[_], index: Int)
diff --git a/.../feature/ignite/schema/SchemaMapper.scala → .../finos/vuu/util/schema/SchemaMapper.scala b/.../feature/ignite/schema/SchemaMapper.scala → .../finos/vuu/util/schema/SchemaMapper.scala
@@ -1,4 +1,4 @@
-package org.finos.vuu.feature.ignite.schema
+package org.finos.vuu.util.schema
 
 import org.finos.vuu.core.table.Column
 

diff --git a/...ite/schema/ExternalEntitySchemaTest.scala → ...til/schema/ExternalEntitySchemaTest.scala b/...ite/schema/ExternalEntitySchemaTest.scala → ...til/schema/ExternalEntitySchemaTest.scala
@@ -1,6 +1,6 @@
-package org.finos.vuu.feature.ignite.schema
+package org.finos.vuu.util.schema
 
-import org.finos.vuu.feature.ignite.schema.ExternalEntitySchemaBuilder.InvalidIndexException
+import org.finos.vuu.util.schema.ExternalEntitySchemaBuilder.InvalidIndexException
 import org.scalatest.featurespec.AnyFeatureSpec
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.prop.TableDrivenPropertyChecks._

diff --git a/...ture/ignite/schema/SchemaMapperTest.scala → ...os/vuu/util/schema/SchemaMapperTest.scala b/...ture/ignite/schema/SchemaMapperTest.scala → ...os/vuu/util/schema/SchemaMapperTest.scala
@@ -1,9 +1,9 @@
-package org.finos.vuu.feature.ignite.schema
+package org.finos.vuu.util.schema
 
 import org.finos.vuu.core.module.vui.VuiStateModule.stringToFieldDef
 import org.finos.vuu.core.table.{Column, Columns, SimpleColumn}
-import org.finos.vuu.feature.ignite.schema.SchemaMapper.InvalidSchemaMapException
-import org.finos.vuu.feature.ignite.schema.SchemaMapperTest.{fieldsMap, tableColumns}
+import org.finos.vuu.util.schema.SchemaMapper.InvalidSchemaMapException
+import org.finos.vuu.util.schema.SchemaMapperTest.{fieldsMap, tableColumns}
 import org.scalatest.featurespec.AnyFeatureSpec
 import org.scalatest.matchers.should.Matchers