This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch ignite-17580 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 6f7e4c42fff81c2c28af1d7abd40e8b7c358fd70 Author: amashenkov <[email protected]> AuthorDate: Mon Aug 29 17:02:49 2022 +0300 Move schema builders API to test package. --- .../ignite/schema/definition/TableDefinition.java | 8 ---- .../schema/definition/TableDefinitionImpl.java | 8 ---- .../org/apache/ignite/schema/package-info.java | 22 ---------- .../internal/schema/SchemaConfigurationTest.java | 51 +--------------------- .../builder/ColumnDefinitionBuilderTest.java | 4 +- .../builder/HashIndexDefinitionBuilderTest.java | 4 +- .../PrimaryKeyDefinitionDefinitionBuilderTest.java | 4 +- .../builder/SortedIndexDefinitionBuilderTest.java | 4 +- .../schema/builder/TableDefinitionBuilderTest.java | 4 +- .../SchemaConfigurationConverterTest.java | 8 ++-- .../SchemaDescriptorConverterTest.java | 6 +-- .../utils}/builder/AbstractIndexBuilder.java | 2 +- .../utils}/builder/ColumnDefinitionBuilder.java | 2 +- .../builder/ColumnDefinitionBuilderImpl.java | 5 +-- .../utils}/builder/HashIndexDefinitionBuilder.java | 2 +- .../builder/HashIndexDefinitionBuilderImpl.java | 5 +-- .../builder/PrimaryKeyDefinitionBuilder.java | 2 +- .../builder/PrimaryKeyDefinitionBuilderImpl.java | 6 +-- .../schema/utils/builder}/SchemaBuilders.java | 12 +---- .../schema/utils}/builder/SchemaObjectBuilder.java | 2 +- .../builder/SortedIndexDefinitionBuilder.java | 2 +- .../builder/SortedIndexDefinitionBuilderImpl.java | 5 +-- .../utils}/builder/TableDefinitionBuilder.java | 2 +- .../utils}/builder/TableDefinitionBuilderImpl.java | 6 +-- .../storage/AbstractMvTableStorageTest.java | 2 +- .../index/AbstractHashIndexStorageTest.java | 6 +-- .../index/AbstractSortedIndexStorageTest.java | 10 ++--- .../table/distributed/TableManagerTest.java | 2 +- 28 files changed, 47 insertions(+), 149 deletions(-) diff --git a/modules/api/src/main/java/org/apache/ignite/schema/definition/TableDefinition.java b/modules/api/src/main/java/org/apache/ignite/schema/definition/TableDefinition.java index f82bd45a0c..a9774c7d9e 100644 --- a/modules/api/src/main/java/org/apache/ignite/schema/definition/TableDefinition.java +++ b/modules/api/src/main/java/org/apache/ignite/schema/definition/TableDefinition.java @@ -21,7 +21,6 @@ import java.util.Collection; import java.util.List; import java.util.Set; import org.apache.ignite.schema.definition.index.IndexDefinition; -import org.apache.ignite.schema.modification.TableModificationBuilder; /** * Table schema configuration. @@ -63,11 +62,4 @@ public interface TableDefinition extends SchemaObject { * @return Collection of indexes. */ Collection<IndexDefinition> indices(); - - /** - * Converts table descriptor to table modification builder. - * - * @return Table modification builder. - */ - TableModificationBuilder toBuilder(); } diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/TableDefinitionImpl.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/TableDefinitionImpl.java index 3e8ac14368..7006bc60ba 100644 --- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/TableDefinitionImpl.java +++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/TableDefinitionImpl.java @@ -24,13 +24,11 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.ignite.internal.schema.modification.TableModificationBuilderImpl; import org.apache.ignite.internal.tostring.S; import org.apache.ignite.schema.definition.ColumnDefinition; import org.apache.ignite.schema.definition.PrimaryKeyDefinition; import org.apache.ignite.schema.definition.TableDefinition; import org.apache.ignite.schema.definition.index.IndexDefinition; -import org.apache.ignite.schema.modification.TableModificationBuilder; import org.jetbrains.annotations.NotNull; /** @@ -124,12 +122,6 @@ public class TableDefinitionImpl extends AbstractSchemaObject implements TableDe return Collections.unmodifiableCollection(indices.values()); } - /** {@inheritDoc} */ - @Override - public TableModificationBuilder toBuilder() { - return new TableModificationBuilderImpl(this); - } - /** * Check if specified column already exists. * diff --git a/modules/schema/src/main/java/org/apache/ignite/schema/package-info.java b/modules/schema/src/main/java/org/apache/ignite/schema/package-info.java deleted file mode 100644 index a039260186..0000000000 --- a/modules/schema/src/main/java/org/apache/ignite/schema/package-info.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Contains public schema definition helpers. - */ - -package org.apache.ignite.schema; diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/SchemaConfigurationTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/SchemaConfigurationTest.java index 2337f53ec3..fdc3b2e710 100644 --- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/SchemaConfigurationTest.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/SchemaConfigurationTest.java @@ -22,11 +22,10 @@ import static org.hamcrest.Matchers.containsString; import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.Map; -import org.apache.ignite.schema.SchemaBuilders; +import org.apache.ignite.internal.schema.utils.builder.SchemaBuilders; +import org.apache.ignite.internal.schema.utils.builder.TableDefinitionBuilder; import org.apache.ignite.schema.definition.ColumnType; import org.apache.ignite.schema.definition.SchemaObject; -import org.apache.ignite.schema.definition.TableDefinition; -import org.apache.ignite.schema.definition.builder.TableDefinitionBuilder; import org.junit.jupiter.api.Test; /** @@ -79,52 +78,6 @@ public class SchemaConfigurationTest { .build(); } - /** - * TestSchemaModification. - * TODO Documentation https://issues.apache.org/jira/browse/IGNITE-15859 - */ - @Test - public void testSchemaModification() { - final TableDefinition table = SchemaBuilders.tableBuilder("PUBLIC", "table1") - .columns( - // Declaring columns in user order. - SchemaBuilders.column("id", ColumnType.INT64).build(), - SchemaBuilders.column("name", ColumnType.string()).build() - ) - .withPrimaryKey("id") - .build(); - - table.toBuilder() - .addColumn( - SchemaBuilders.column("firstName", ColumnType.string()) - .build() - ) - .addKeyColumn( - // It looks safe to add non-affinity column to key. - SchemaBuilders.column("subId", ColumnType.string()) - .build() - ) - - .alterColumn("firstName") - .withNewName("lastName") - .withNewDefault("ivanov") - .asNullable() - .convertTo(ColumnType.stringOf(100)) - .done() - - .dropColumn("name") // Key column can't be dropped. - - .addIndex( - SchemaBuilders.sortedIndex("sortedIdx") - .addIndexColumn("subId").done() - .withHints(Map.of("INLINE_SIZE", "73")) - .build() - ) - - .dropIndex("hash_idx") - .apply(); - } - /** * Check invalid colocation columns configuration: * - not PK columns; diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/ColumnDefinitionBuilderTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/ColumnDefinitionBuilderTest.java index 1c76ca7701..e652a25f5b 100644 --- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/ColumnDefinitionBuilderTest.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/ColumnDefinitionBuilderTest.java @@ -21,12 +21,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import java.time.LocalDate; -import org.apache.ignite.schema.SchemaBuilders; +import org.apache.ignite.internal.schema.utils.builder.SchemaBuilders; import org.apache.ignite.schema.definition.ColumnDefinition; import org.apache.ignite.schema.definition.ColumnType; import org.apache.ignite.schema.definition.DefaultValueDefinition.ConstantValue; import org.apache.ignite.schema.definition.DefaultValueDefinition.DefaultValueType; -import org.apache.ignite.schema.definition.builder.ColumnDefinitionBuilder; +import org.apache.ignite.internal.schema.utils.builder.ColumnDefinitionBuilder; import org.junit.jupiter.api.Test; /** diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/HashIndexDefinitionBuilderTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/HashIndexDefinitionBuilderTest.java index af1575ae3b..db03fc0325 100644 --- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/HashIndexDefinitionBuilderTest.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/HashIndexDefinitionBuilderTest.java @@ -21,8 +21,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.Collections; -import org.apache.ignite.schema.SchemaBuilders; -import org.apache.ignite.schema.definition.builder.HashIndexDefinitionBuilder; +import org.apache.ignite.internal.schema.utils.builder.SchemaBuilders; +import org.apache.ignite.internal.schema.utils.builder.HashIndexDefinitionBuilder; import org.apache.ignite.schema.definition.index.HashIndexDefinition; import org.junit.jupiter.api.Test; diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/PrimaryKeyDefinitionDefinitionBuilderTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/PrimaryKeyDefinitionDefinitionBuilderTest.java index d47eb66d5b..1b1140ea92 100644 --- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/PrimaryKeyDefinitionDefinitionBuilderTest.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/PrimaryKeyDefinitionDefinitionBuilderTest.java @@ -23,9 +23,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import org.apache.ignite.schema.SchemaBuilders; +import org.apache.ignite.internal.schema.utils.builder.SchemaBuilders; import org.apache.ignite.schema.definition.PrimaryKeyDefinition; -import org.apache.ignite.schema.definition.builder.PrimaryKeyDefinitionBuilder; +import org.apache.ignite.internal.schema.utils.builder.PrimaryKeyDefinitionBuilder; import org.junit.jupiter.api.Test; /** diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/SortedIndexDefinitionBuilderTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/SortedIndexDefinitionBuilderTest.java index 05534e6037..2fa0aabae2 100644 --- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/SortedIndexDefinitionBuilderTest.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/SortedIndexDefinitionBuilderTest.java @@ -20,8 +20,8 @@ package org.apache.ignite.internal.schema.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import org.apache.ignite.schema.SchemaBuilders; -import org.apache.ignite.schema.definition.builder.SortedIndexDefinitionBuilder; +import org.apache.ignite.internal.schema.utils.builder.SchemaBuilders; +import org.apache.ignite.internal.schema.utils.builder.SortedIndexDefinitionBuilder; import org.apache.ignite.schema.definition.index.SortOrder; import org.apache.ignite.schema.definition.index.SortedIndexDefinition; import org.junit.jupiter.api.Test; diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/TableDefinitionBuilderTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/TableDefinitionBuilderTest.java index 2bf212ad12..3040a910cd 100644 --- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/TableDefinitionBuilderTest.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/builder/TableDefinitionBuilderTest.java @@ -19,10 +19,10 @@ package org.apache.ignite.internal.schema.builder; import static org.junit.jupiter.api.Assertions.assertEquals; -import org.apache.ignite.schema.SchemaBuilders; +import org.apache.ignite.internal.schema.utils.builder.SchemaBuilders; import org.apache.ignite.schema.definition.ColumnType; import org.apache.ignite.schema.definition.TableDefinition; -import org.apache.ignite.schema.definition.builder.TableDefinitionBuilder; +import org.apache.ignite.internal.schema.utils.builder.TableDefinitionBuilder; import org.junit.jupiter.api.Test; /** diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaConfigurationConverterTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaConfigurationConverterTest.java index 638129bb05..e72ec27860 100644 --- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaConfigurationConverterTest.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaConfigurationConverterTest.java @@ -48,16 +48,16 @@ import org.apache.ignite.configuration.schemas.table.UnlimitedBudgetConfiguratio import org.apache.ignite.internal.configuration.ConfigurationRegistry; import org.apache.ignite.internal.configuration.storage.TestConfigurationStorage; import org.apache.ignite.internal.schema.definition.ColumnDefinitionImpl; -import org.apache.ignite.schema.SchemaBuilders; +import org.apache.ignite.internal.schema.utils.builder.SchemaBuilders; import org.apache.ignite.schema.definition.ColumnType; import org.apache.ignite.schema.definition.DefaultValueDefinition; import org.apache.ignite.schema.definition.DefaultValueDefinition.ConstantValue; import org.apache.ignite.schema.definition.DefaultValueDefinition.FunctionCall; import org.apache.ignite.schema.definition.DefaultValueGenerators; import org.apache.ignite.schema.definition.TableDefinition; -import org.apache.ignite.schema.definition.builder.HashIndexDefinitionBuilder; -import org.apache.ignite.schema.definition.builder.SortedIndexDefinitionBuilder; -import org.apache.ignite.schema.definition.builder.TableDefinitionBuilder; +import org.apache.ignite.internal.schema.utils.builder.HashIndexDefinitionBuilder; +import org.apache.ignite.internal.schema.utils.builder.SortedIndexDefinitionBuilder; +import org.apache.ignite.internal.schema.utils.builder.TableDefinitionBuilder; import org.apache.ignite.schema.definition.index.HashIndexDefinition; import org.apache.ignite.schema.definition.index.IndexColumnDefinition; import org.apache.ignite.schema.definition.index.IndexDefinition; diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaDescriptorConverterTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaDescriptorConverterTest.java index e96d1d5eb5..d2a47f83bb 100644 --- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaDescriptorConverterTest.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaDescriptorConverterTest.java @@ -34,14 +34,14 @@ import org.apache.ignite.internal.schema.DefaultValueProvider.Type; import org.apache.ignite.internal.schema.NativeTypeSpec; import org.apache.ignite.internal.schema.SchemaDescriptor; import org.apache.ignite.internal.schema.definition.ColumnDefinitionImpl; -import org.apache.ignite.schema.SchemaBuilders; +import org.apache.ignite.internal.schema.utils.builder.SchemaBuilders; import org.apache.ignite.schema.definition.ColumnDefinition; import org.apache.ignite.schema.definition.ColumnType; import org.apache.ignite.schema.definition.DefaultValueDefinition; import org.apache.ignite.schema.definition.DefaultValueGenerators; import org.apache.ignite.schema.definition.TableDefinition; -import org.apache.ignite.schema.definition.builder.ColumnDefinitionBuilder; -import org.apache.ignite.schema.definition.builder.TableDefinitionBuilder; +import org.apache.ignite.internal.schema.utils.builder.ColumnDefinitionBuilder; +import org.apache.ignite.internal.schema.utils.builder.TableDefinitionBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/AbstractIndexBuilder.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/AbstractIndexBuilder.java similarity index 97% rename from modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/AbstractIndexBuilder.java rename to modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/AbstractIndexBuilder.java index b73390d3be..64bc9817b1 100644 --- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/AbstractIndexBuilder.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/AbstractIndexBuilder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.schema.definition.builder; +package org.apache.ignite.internal.schema.utils.builder; import java.util.Collections; import java.util.Map; diff --git a/modules/api/src/main/java/org/apache/ignite/schema/definition/builder/ColumnDefinitionBuilder.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/ColumnDefinitionBuilder.java similarity index 96% rename from modules/api/src/main/java/org/apache/ignite/schema/definition/builder/ColumnDefinitionBuilder.java rename to modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/ColumnDefinitionBuilder.java index 9f06c28479..4173c8095a 100644 --- a/modules/api/src/main/java/org/apache/ignite/schema/definition/builder/ColumnDefinitionBuilder.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/ColumnDefinitionBuilder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.schema.definition.builder; +package org.apache.ignite.internal.schema.utils.builder; import java.util.Map; import org.apache.ignite.schema.definition.ColumnDefinition; diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/ColumnDefinitionBuilderImpl.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/ColumnDefinitionBuilderImpl.java similarity index 92% rename from modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/ColumnDefinitionBuilderImpl.java rename to modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/ColumnDefinitionBuilderImpl.java index f5af66e271..97457080fd 100644 --- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/ColumnDefinitionBuilderImpl.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/ColumnDefinitionBuilderImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.schema.definition.builder; +package org.apache.ignite.internal.schema.utils.builder; import java.util.Map; import org.apache.ignite.internal.schema.definition.ColumnDefinitionImpl; @@ -23,13 +23,12 @@ import org.apache.ignite.internal.util.IgniteObjectName; import org.apache.ignite.schema.definition.ColumnDefinition; import org.apache.ignite.schema.definition.ColumnType; import org.apache.ignite.schema.definition.DefaultValueDefinition; -import org.apache.ignite.schema.definition.builder.ColumnDefinitionBuilder; import org.jetbrains.annotations.Nullable; /** * Column builder. */ -public class ColumnDefinitionBuilderImpl implements ColumnDefinitionBuilder { +class ColumnDefinitionBuilderImpl implements ColumnDefinitionBuilder { /** Column name. */ private final String colName; diff --git a/modules/api/src/main/java/org/apache/ignite/schema/definition/builder/HashIndexDefinitionBuilder.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/HashIndexDefinitionBuilder.java similarity index 96% rename from modules/api/src/main/java/org/apache/ignite/schema/definition/builder/HashIndexDefinitionBuilder.java rename to modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/HashIndexDefinitionBuilder.java index ae84169c51..a1bab6416c 100644 --- a/modules/api/src/main/java/org/apache/ignite/schema/definition/builder/HashIndexDefinitionBuilder.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/HashIndexDefinitionBuilder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.schema.definition.builder; +package org.apache.ignite.internal.schema.utils.builder; import java.util.List; import java.util.Map; diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/HashIndexDefinitionBuilderImpl.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/HashIndexDefinitionBuilderImpl.java similarity index 89% rename from modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/HashIndexDefinitionBuilderImpl.java rename to modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/HashIndexDefinitionBuilderImpl.java index 13225428c1..88c2c647ce 100644 --- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/HashIndexDefinitionBuilderImpl.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/HashIndexDefinitionBuilderImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.schema.definition.builder; +package org.apache.ignite.internal.schema.utils.builder; import java.util.Arrays; import java.util.List; @@ -23,13 +23,12 @@ import java.util.Map; import java.util.stream.Collectors; import org.apache.ignite.internal.schema.definition.index.HashIndexDefinitionImpl; import org.apache.ignite.internal.util.IgniteObjectName; -import org.apache.ignite.schema.definition.builder.HashIndexDefinitionBuilder; import org.apache.ignite.schema.definition.index.HashIndexDefinition; /** * Hash index builder. */ -public class HashIndexDefinitionBuilderImpl extends AbstractIndexBuilder implements HashIndexDefinitionBuilder { +class HashIndexDefinitionBuilderImpl extends AbstractIndexBuilder implements HashIndexDefinitionBuilder { /** Index columns. */ private List<String> columns; diff --git a/modules/api/src/main/java/org/apache/ignite/schema/definition/builder/PrimaryKeyDefinitionBuilder.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/PrimaryKeyDefinitionBuilder.java similarity index 97% rename from modules/api/src/main/java/org/apache/ignite/schema/definition/builder/PrimaryKeyDefinitionBuilder.java rename to modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/PrimaryKeyDefinitionBuilder.java index ff4ab00613..2276671c65 100644 --- a/modules/api/src/main/java/org/apache/ignite/schema/definition/builder/PrimaryKeyDefinitionBuilder.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/PrimaryKeyDefinitionBuilder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.schema.definition.builder; +package org.apache.ignite.internal.schema.utils.builder; import java.util.List; import org.apache.ignite.schema.definition.PrimaryKeyDefinition; diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/PrimaryKeyDefinitionBuilderImpl.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/PrimaryKeyDefinitionBuilderImpl.java similarity index 91% rename from modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/PrimaryKeyDefinitionBuilderImpl.java rename to modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/PrimaryKeyDefinitionBuilderImpl.java index 760cefe08b..0b194275cd 100644 --- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/PrimaryKeyDefinitionBuilderImpl.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/PrimaryKeyDefinitionBuilderImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.schema.definition.builder; +package org.apache.ignite.internal.schema.utils.builder; import java.util.Arrays; import java.util.List; @@ -27,13 +27,11 @@ import org.apache.ignite.internal.tostring.IgniteToStringInclude; import org.apache.ignite.internal.util.CollectionUtils; import org.apache.ignite.internal.util.IgniteObjectName; import org.apache.ignite.schema.definition.PrimaryKeyDefinition; -import org.apache.ignite.schema.definition.builder.PrimaryKeyDefinitionBuilder; -import org.apache.ignite.schema.definition.builder.SchemaObjectBuilder; /** * Primary key builder. */ -public class PrimaryKeyDefinitionBuilderImpl implements SchemaObjectBuilder, PrimaryKeyDefinitionBuilder { +class PrimaryKeyDefinitionBuilderImpl implements SchemaObjectBuilder, PrimaryKeyDefinitionBuilder { /** Index columns. */ @IgniteToStringInclude private List<String> columns; diff --git a/modules/schema/src/main/java/org/apache/ignite/schema/SchemaBuilders.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/SchemaBuilders.java similarity index 76% rename from modules/schema/src/main/java/org/apache/ignite/schema/SchemaBuilders.java rename to modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/SchemaBuilders.java index 570460e191..9ed02cb104 100644 --- a/modules/schema/src/main/java/org/apache/ignite/schema/SchemaBuilders.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/SchemaBuilders.java @@ -15,20 +15,10 @@ * limitations under the License. */ -package org.apache.ignite.schema; +package org.apache.ignite.internal.schema.utils.builder; -import org.apache.ignite.internal.schema.definition.builder.ColumnDefinitionBuilderImpl; -import org.apache.ignite.internal.schema.definition.builder.HashIndexDefinitionBuilderImpl; -import org.apache.ignite.internal.schema.definition.builder.PrimaryKeyDefinitionBuilderImpl; -import org.apache.ignite.internal.schema.definition.builder.SortedIndexDefinitionBuilderImpl; -import org.apache.ignite.internal.schema.definition.builder.TableDefinitionBuilderImpl; import org.apache.ignite.schema.definition.ColumnType; import org.apache.ignite.schema.definition.TableDefinition; -import org.apache.ignite.schema.definition.builder.ColumnDefinitionBuilder; -import org.apache.ignite.schema.definition.builder.HashIndexDefinitionBuilder; -import org.apache.ignite.schema.definition.builder.PrimaryKeyDefinitionBuilder; -import org.apache.ignite.schema.definition.builder.SortedIndexDefinitionBuilder; -import org.apache.ignite.schema.definition.builder.TableDefinitionBuilder; /** * Schema builder helper. diff --git a/modules/api/src/main/java/org/apache/ignite/schema/definition/builder/SchemaObjectBuilder.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/SchemaObjectBuilder.java similarity index 95% rename from modules/api/src/main/java/org/apache/ignite/schema/definition/builder/SchemaObjectBuilder.java rename to modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/SchemaObjectBuilder.java index cc923b9af7..8a56e1d69d 100644 --- a/modules/api/src/main/java/org/apache/ignite/schema/definition/builder/SchemaObjectBuilder.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/SchemaObjectBuilder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.schema.definition.builder; +package org.apache.ignite.internal.schema.utils.builder; import java.util.Map; diff --git a/modules/api/src/main/java/org/apache/ignite/schema/definition/builder/SortedIndexDefinitionBuilder.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/SortedIndexDefinitionBuilder.java similarity index 97% rename from modules/api/src/main/java/org/apache/ignite/schema/definition/builder/SortedIndexDefinitionBuilder.java rename to modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/SortedIndexDefinitionBuilder.java index ed425a5a1b..f3a809ff6b 100644 --- a/modules/api/src/main/java/org/apache/ignite/schema/definition/builder/SortedIndexDefinitionBuilder.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/SortedIndexDefinitionBuilder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.schema.definition.builder; +package org.apache.ignite.internal.schema.utils.builder; import java.util.Map; import org.apache.ignite.schema.definition.index.SortedIndexDefinition; diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/SortedIndexDefinitionBuilderImpl.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/SortedIndexDefinitionBuilderImpl.java similarity index 94% rename from modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/SortedIndexDefinitionBuilderImpl.java rename to modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/SortedIndexDefinitionBuilderImpl.java index 1d9ef61b2b..f384190b74 100644 --- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/SortedIndexDefinitionBuilderImpl.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/SortedIndexDefinitionBuilderImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.schema.definition.builder; +package org.apache.ignite.internal.schema.utils.builder; import java.util.LinkedHashMap; import java.util.List; @@ -24,7 +24,6 @@ import java.util.stream.Collectors; import org.apache.ignite.internal.schema.definition.index.SortedIndexColumnDefinitionImpl; import org.apache.ignite.internal.schema.definition.index.SortedIndexDefinitionImpl; import org.apache.ignite.internal.util.IgniteObjectName; -import org.apache.ignite.schema.definition.builder.SortedIndexDefinitionBuilder; import org.apache.ignite.schema.definition.index.SortOrder; import org.apache.ignite.schema.definition.index.SortedIndexColumnDefinition; import org.apache.ignite.schema.definition.index.SortedIndexDefinition; @@ -32,7 +31,7 @@ import org.apache.ignite.schema.definition.index.SortedIndexDefinition; /** * Sorted index builder. */ -public class SortedIndexDefinitionBuilderImpl extends AbstractIndexBuilder implements SortedIndexDefinitionBuilder { +class SortedIndexDefinitionBuilderImpl extends AbstractIndexBuilder implements SortedIndexDefinitionBuilder { /** Index columns. */ protected final Map<String, SortedIndexColumnBuilderImpl> cols = new LinkedHashMap<>(); diff --git a/modules/api/src/main/java/org/apache/ignite/schema/definition/builder/TableDefinitionBuilder.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/TableDefinitionBuilder.java similarity index 97% rename from modules/api/src/main/java/org/apache/ignite/schema/definition/builder/TableDefinitionBuilder.java rename to modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/TableDefinitionBuilder.java index 7d72554e2b..a9cfb7a506 100644 --- a/modules/api/src/main/java/org/apache/ignite/schema/definition/builder/TableDefinitionBuilder.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/TableDefinitionBuilder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.schema.definition.builder; +package org.apache.ignite.internal.schema.utils.builder; import java.util.List; import java.util.Map; diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/TableDefinitionBuilderImpl.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/TableDefinitionBuilderImpl.java similarity index 96% rename from modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/TableDefinitionBuilderImpl.java rename to modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/TableDefinitionBuilderImpl.java index 44575c6bfc..d13af9a521 100644 --- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/definition/builder/TableDefinitionBuilderImpl.java +++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/utils/builder/TableDefinitionBuilderImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.schema.definition.builder; +package org.apache.ignite.internal.schema.utils.builder; import java.util.Arrays; import java.util.Collection; @@ -28,11 +28,9 @@ import java.util.Set; import java.util.stream.Collectors; import org.apache.ignite.internal.schema.definition.TableDefinitionImpl; import org.apache.ignite.internal.util.IgniteObjectName; -import org.apache.ignite.schema.SchemaBuilders; import org.apache.ignite.schema.definition.ColumnDefinition; import org.apache.ignite.schema.definition.PrimaryKeyDefinition; import org.apache.ignite.schema.definition.TableDefinition; -import org.apache.ignite.schema.definition.builder.TableDefinitionBuilder; import org.apache.ignite.schema.definition.index.ColumnarIndexDefinition; import org.apache.ignite.schema.definition.index.IndexColumnDefinition; import org.apache.ignite.schema.definition.index.IndexDefinition; @@ -40,7 +38,7 @@ import org.apache.ignite.schema.definition.index.IndexDefinition; /** * Table builder. */ -public class TableDefinitionBuilderImpl implements TableDefinitionBuilder { +class TableDefinitionBuilderImpl implements TableDefinitionBuilder { /** Schema name. */ private final String schemaName; diff --git a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java index 442b8a4a7d..fb0f4507c9 100644 --- a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java +++ b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java @@ -44,7 +44,7 @@ import org.apache.ignite.internal.storage.engine.MvTableStorage; import org.apache.ignite.internal.storage.index.HashIndexStorage; import org.apache.ignite.internal.storage.index.IndexRowImpl; import org.apache.ignite.internal.util.Cursor; -import org.apache.ignite.schema.SchemaBuilders; +import org.apache.ignite.internal.schema.utils.builder.SchemaBuilders; import org.apache.ignite.schema.definition.ColumnType; import org.apache.ignite.schema.definition.TableDefinition; import org.junit.jupiter.api.AfterEach; diff --git a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/index/AbstractHashIndexStorageTest.java b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/index/AbstractHashIndexStorageTest.java index 0e363f0a68..2912a574f3 100644 --- a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/index/AbstractHashIndexStorageTest.java +++ b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/index/AbstractHashIndexStorageTest.java @@ -20,8 +20,8 @@ package org.apache.ignite.internal.storage.index; import static java.util.stream.Collectors.toList; import static org.apache.ignite.internal.schema.configuration.SchemaConfigurationConverter.convert; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully; -import static org.apache.ignite.schema.SchemaBuilders.column; -import static org.apache.ignite.schema.SchemaBuilders.tableBuilder; +import static org.apache.ignite.internal.schema.utils.builder.SchemaBuilders.column; +import static org.apache.ignite.internal.schema.utils.builder.SchemaBuilders.tableBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; @@ -38,7 +38,7 @@ import org.apache.ignite.internal.storage.RowId; import org.apache.ignite.internal.storage.engine.MvTableStorage; import org.apache.ignite.internal.storage.index.impl.BinaryTupleRowSerializer; import org.apache.ignite.internal.util.Cursor; -import org.apache.ignite.schema.SchemaBuilders; +import org.apache.ignite.internal.schema.utils.builder.SchemaBuilders; import org.apache.ignite.schema.definition.ColumnDefinition; import org.apache.ignite.schema.definition.ColumnType; import org.apache.ignite.schema.definition.TableDefinition; diff --git a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/index/AbstractSortedIndexStorageTest.java b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/index/AbstractSortedIndexStorageTest.java index dfd0353e26..f396dbe6f7 100644 --- a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/index/AbstractSortedIndexStorageTest.java +++ b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/index/AbstractSortedIndexStorageTest.java @@ -29,8 +29,8 @@ import static org.apache.ignite.internal.storage.index.SortedIndexStorage.LESS_O import static org.apache.ignite.internal.testframework.IgniteTestUtils.randomString; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willBe; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully; -import static org.apache.ignite.schema.SchemaBuilders.column; -import static org.apache.ignite.schema.SchemaBuilders.tableBuilder; +import static org.apache.ignite.internal.schema.utils.builder.SchemaBuilders.column; +import static org.apache.ignite.internal.schema.utils.builder.SchemaBuilders.tableBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; @@ -73,12 +73,12 @@ import org.apache.ignite.internal.storage.index.impl.BinaryTupleRowSerializer; import org.apache.ignite.internal.storage.index.impl.TestIndexRow; import org.apache.ignite.internal.testframework.VariableSource; import org.apache.ignite.internal.util.Cursor; -import org.apache.ignite.schema.SchemaBuilders; +import org.apache.ignite.internal.schema.utils.builder.SchemaBuilders; import org.apache.ignite.schema.definition.ColumnDefinition; import org.apache.ignite.schema.definition.ColumnType; import org.apache.ignite.schema.definition.TableDefinition; -import org.apache.ignite.schema.definition.builder.SortedIndexDefinitionBuilder; -import org.apache.ignite.schema.definition.builder.SortedIndexDefinitionBuilder.SortedIndexColumnBuilder; +import org.apache.ignite.internal.schema.utils.builder.SortedIndexDefinitionBuilder; +import org.apache.ignite.internal.schema.utils.builder.SortedIndexDefinitionBuilder.SortedIndexColumnBuilder; import org.apache.ignite.schema.definition.index.ColumnarIndexDefinition; import org.apache.ignite.schema.definition.index.SortedIndexDefinition; import org.intellij.lang.annotations.MagicConstant; diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java index f694cc0ea8..753a9c4ffc 100644 --- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java +++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java @@ -122,7 +122,7 @@ import org.apache.ignite.raft.jraft.entity.PeerId; import org.apache.ignite.raft.jraft.error.RaftError; import org.apache.ignite.raft.jraft.rpc.CliRequests; import org.apache.ignite.raft.jraft.rpc.impl.RaftGroupServiceImpl; -import org.apache.ignite.schema.SchemaBuilders; +import org.apache.ignite.internal.schema.utils.builder.SchemaBuilders; import org.apache.ignite.schema.definition.ColumnType; import org.apache.ignite.schema.definition.TableDefinition; import org.apache.ignite.table.Table;
