Fix imports in the component module

finos · Jun 8, 2023 · c9ca920 · c9ca920
1 parent 35c1955
commit c9ca920
Show file tree

Hide file tree

Showing 12 changed files with 246 additions and 148 deletions.
diff --git a/...s/legend/engine/persistence/components/ingestmode/DeriveMainDatasetSchemaFromStaging.java b/...s/legend/engine/persistence/components/ingestmode/DeriveMainDatasetSchemaFromStaging.java
@@ -33,7 +33,12 @@
 import org.finos.legend.engine.persistence.components.ingestmode.validitymilestoning.derivation.SourceSpecifiesFromAndThruDateTimeAbstract;
 import org.finos.legend.engine.persistence.components.ingestmode.validitymilestoning.derivation.SourceSpecifiesFromDateTimeAbstract;
 import org.finos.legend.engine.persistence.components.ingestmode.validitymilestoning.derivation.ValidityDerivationVisitor;
-import org.finos.legend.engine.persistence.components.logicalplan.datasets.*;
+import org.finos.legend.engine.persistence.components.logicalplan.datasets.DataType;
+import org.finos.legend.engine.persistence.components.logicalplan.datasets.Dataset;
+import org.finos.legend.engine.persistence.components.logicalplan.datasets.DatasetDefinition;
+import org.finos.legend.engine.persistence.components.logicalplan.datasets.Field;
+import org.finos.legend.engine.persistence.components.logicalplan.datasets.FieldType;
+import org.finos.legend.engine.persistence.components.logicalplan.datasets.SchemaDefinition;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/.../legend/engine/persistence/components/ingestmode/IngestModeOptimizationColumnHandler.java b/.../legend/engine/persistence/components/ingestmode/IngestModeOptimizationColumnHandler.java
@@ -22,7 +22,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.finos.legend.engine.persistence.components.util.LogicalPlanUtils.*;
+import static org.finos.legend.engine.persistence.components.util.LogicalPlanUtils.SUPPORTED_DATA_TYPES_FOR_OPTIMIZATION_COLUMNS;
+import static org.finos.legend.engine.persistence.components.util.LogicalPlanUtils.findCommonPrimaryFieldsBetweenMainAndStaging;
 
 public class IngestModeOptimizationColumnHandler implements IngestModeVisitor<IngestMode>
 {
@@ -92,9 +93,9 @@ private List<OptimizationFilter> deriveOptimizationFilters(UnitemporalDeltaAbstr
  List<Field> primaryKeys = findCommonPrimaryFieldsBetweenMainAndStaging(datasets.mainDataset(), datasets.stagingDataset());
  List<Field> comparablePrimaryKeys = primaryKeys.stream().filter(field -> SUPPORTED_DATA_TYPES_FOR_OPTIMIZATION_COLUMNS.contains(field.type().dataType())).collect(Collectors.toList());
  optimizationFilters = new ArrayList<>();
- for (Field field: comparablePrimaryKeys)
+ for (Field field : comparablePrimaryKeys)
  {
- OptimizationFilter filter = OptimizationFilter.of(field.name(),field.name().toUpperCase() + "_LOWER", field.name().toUpperCase() + "_UPPER");
+ OptimizationFilter filter = OptimizationFilter.of(field.name(), field.name().toUpperCase() + "_LOWER", field.name().toUpperCase() + "_UPPER");
  optimizationFilters.add(filter);
  }
  }

diff --git a/...os/legend/engine/persistence/components/ingestmode/deduplication/DatasetDeduplicator.java b/...os/legend/engine/persistence/components/ingestmode/deduplication/DatasetDeduplicator.java
@@ -18,7 +18,14 @@
 import org.finos.legend.engine.persistence.components.logicalplan.conditions.Equals;
 import org.finos.legend.engine.persistence.components.logicalplan.datasets.Dataset;
 import org.finos.legend.engine.persistence.components.logicalplan.datasets.Selection;
-import org.finos.legend.engine.persistence.components.logicalplan.values.*;
+import org.finos.legend.engine.persistence.components.logicalplan.values.FieldValue;
+import org.finos.legend.engine.persistence.components.logicalplan.values.FunctionImpl;
+import org.finos.legend.engine.persistence.components.logicalplan.values.FunctionName;
+import org.finos.legend.engine.persistence.components.logicalplan.values.ObjectValue;
+import org.finos.legend.engine.persistence.components.logicalplan.values.Order;
+import org.finos.legend.engine.persistence.components.logicalplan.values.OrderedField;
+import org.finos.legend.engine.persistence.components.logicalplan.values.Value;
+import org.finos.legend.engine.persistence.components.logicalplan.values.WindowFunction;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...nos/legend/engine/persistence/components/relational/bigquery/executor/BigQueryHelper.java b/...nos/legend/engine/persistence/components/relational/bigquery/executor/BigQueryHelper.java
@@ -14,10 +14,15 @@
 
 package org.finos.legend.engine.persistence.components.relational.bigquery.executor;
 
-import com.google.cloud.bigquery.*;
-import org.finos.legend.engine.persistence.components.logicalplan.datasets.*;
+import com.google.cloud.bigquery.BigQuery;
+import com.google.cloud.bigquery.FieldList;
+import com.google.cloud.bigquery.Table;
+import com.google.cloud.bigquery.TableId;
 import org.finos.legend.engine.persistence.components.logicalplan.datasets.Dataset;
+import org.finos.legend.engine.persistence.components.logicalplan.datasets.DatasetDefinition;
 import org.finos.legend.engine.persistence.components.logicalplan.datasets.Field;
+import org.finos.legend.engine.persistence.components.logicalplan.datasets.FieldType;
+import org.finos.legend.engine.persistence.components.logicalplan.datasets.SchemaDefinition;
 import org.finos.legend.engine.persistence.components.relational.executor.RelationalExecutionHelper;
 import org.finos.legend.engine.persistence.components.relational.sql.DataTypeMapping;
 import org.finos.legend.engine.persistence.components.relational.sql.JdbcPropertiesToLogicalDataTypeMapping;
@@ -28,7 +33,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 public class BigQueryHelper implements RelationalExecutionHelper
 {

diff --git a/...ngine/persistence/components/relational/bigquery/executor/BigQueryTransactionManager.java b/...ngine/persistence/components/relational/bigquery/executor/BigQueryTransactionManager.java
@@ -14,8 +14,21 @@
 
 package org.finos.legend.engine.persistence.components.relational.bigquery.executor;
 
-import com.google.cloud.bigquery.*;
-import java.util.*;
+import com.google.cloud.bigquery.BigQuery;
+import com.google.cloud.bigquery.ConnectionProperty;
+import com.google.cloud.bigquery.Field;
+import com.google.cloud.bigquery.FieldValueList;
+import com.google.cloud.bigquery.Job;
+import com.google.cloud.bigquery.JobId;
+import com.google.cloud.bigquery.JobInfo;
+import com.google.cloud.bigquery.QueryJobConfiguration;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 public class BigQueryTransactionManager
 {
@@ -57,7 +70,7 @@ public void commitTransaction() throws InterruptedException
  {
  if (this.sessionId != null)
  {
-  executeSql("COMMIT TRANSACTION");
+ executeSql("COMMIT TRANSACTION");
  }
  }
 

diff --git a/...ne/persistence/components/relational/bigquery/sql/visitor/BatchStartTimestampVisitor.java b/...ne/persistence/components/relational/bigquery/sql/visitor/BatchStartTimestampVisitor.java
@@ -14,7 +14,10 @@
 
 package org.finos.legend.engine.persistence.components.relational.bigquery.sql.visitor;
 
-import org.finos.legend.engine.persistence.components.logicalplan.values.*;
+import org.finos.legend.engine.persistence.components.logicalplan.values.BatchStartTimestamp;
+import org.finos.legend.engine.persistence.components.logicalplan.values.FunctionImpl;
+import org.finos.legend.engine.persistence.components.logicalplan.values.FunctionName;
+import org.finos.legend.engine.persistence.components.logicalplan.values.StringValue;
 import org.finos.legend.engine.persistence.components.physicalplan.PhysicalPlanNode;
 import org.finos.legend.engine.persistence.components.relational.ansi.sql.visitors.FunctionVisitor;
 import org.finos.legend.engine.persistence.components.transformer.LogicalPlanVisitor;

diff --git a/...e/persistence/components/relational/bigquery/sqldom/schemaops/statements/CreateTable.java b/...e/persistence/components/relational/bigquery/sqldom/schemaops/statements/CreateTable.java
@@ -29,7 +29,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.finos.legend.engine.persistence.components.relational.sqldom.utils.SqlGenUtils.*;
+import static org.finos.legend.engine.persistence.components.relational.sqldom.utils.SqlGenUtils.CLOSING_PARENTHESIS;
+import static org.finos.legend.engine.persistence.components.relational.sqldom.utils.SqlGenUtils.COMMA;
+import static org.finos.legend.engine.persistence.components.relational.sqldom.utils.SqlGenUtils.EMPTY;
+import static org.finos.legend.engine.persistence.components.relational.sqldom.utils.SqlGenUtils.OPEN_PARENTHESIS;
+import static org.finos.legend.engine.persistence.components.relational.sqldom.utils.SqlGenUtils.WHITE_SPACE;
 
 public class CreateTable implements DDLStatement
 {

diff --git a/...rc/test/java/org/finos/legend/engine/persistence/components/e2e/BigQueryEndToEndTest.java b/...rc/test/java/org/finos/legend/engine/persistence/components/e2e/BigQueryEndToEndTest.java
@@ -15,7 +15,12 @@
 package org.finos.legend.engine.persistence.components.e2e;
 
 import com.google.auth.oauth2.GoogleCredentials;
-import com.google.cloud.bigquery.*;
+import com.google.cloud.bigquery.BigQuery;
+import com.google.cloud.bigquery.BigQueryOptions;
+import com.google.cloud.bigquery.InsertAllRequest;
+import com.google.cloud.bigquery.InsertAllResponse;
+import com.google.cloud.bigquery.QueryJobConfiguration;
+import com.google.cloud.bigquery.TableId;
 import com.opencsv.CSVReader;
 import org.finos.legend.engine.persistence.components.common.DatasetFilter;
 import org.finos.legend.engine.persistence.components.common.Datasets;
@@ -38,7 +43,11 @@
 import java.io.IOException;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 public class BigQueryEndToEndTest