You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2021/07/19 16:28:18 UTC
[ignite-3] 02/02: Fix javadoc styles.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-15153
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit c125769e56ced337904bc6d4e95c0e6aac0980fe
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Mon Jul 19 19:28:06 2021 +0300
Fix javadoc styles.
---
check-rules/checkstyle-disabled-modules.xml | 1 -
.../org/apache/ignite/app/IgnitionManager.java | 1 +
.../KeyMapper.java => app/package-info.java} | 7 +--
.../org/apache/ignite/binary/BinaryObject.java | 4 +-
.../KeyMapper.java => binary/package-info.java} | 7 +--
.../schemas/network/package-info.java} | 7 +--
.../schemas/rest/package-info.java} | 7 +--
.../schemas/runner/package-info.java} | 7 +--
.../schemas/table/package-info.java} | 7 +--
.../org/apache/ignite/lang/IgniteException.java | 2 +-
.../KeyMapper.java => lang/package-info.java} | 7 +--
.../main/java/org/apache/ignite/schema/Column.java | 10 +++-
.../java/org/apache/ignite/schema/ColumnType.java | 63 ++++++++++++++++++++--
.../org/apache/ignite/schema/ColumnarIndex.java | 5 ++
.../java/org/apache/ignite/schema/IndexColumn.java | 4 +-
.../org/apache/ignite/schema/PrimaryIndex.java | 4 +-
.../java/org/apache/ignite/schema/SchemaMode.java | 13 +++--
.../{SchemaObject.java => SchemaNamedObject.java} | 6 ++-
.../java/org/apache/ignite/schema/SchemaTable.java | 26 ++++++---
.../apache/ignite/schema/SortedIndexColumn.java | 2 +
.../java/org/apache/ignite/schema/TableIndex.java | 6 ++-
.../ignite/schema/builder/HashIndexBuilder.java | 4 ++
.../ignite/schema/builder/PartialIndexBuilder.java | 4 ++
.../ignite/schema/builder/PrimaryIndexBuilder.java | 2 +
.../ignite/schema/builder/SchemaObjectBuilder.java | 2 +
.../ignite/schema/builder/SchemaTableBuilder.java | 8 +--
.../ignite/schema/builder/SortedIndexBuilder.java | 6 +++
.../builder/package-info.java} | 7 +--
.../schema/modification/AlterColumnBuilder.java | 2 +
.../modification/package-info.java} | 7 +--
.../KeyMapper.java => schema/package-info.java} | 7 +--
.../org/apache/ignite/table/InvocationContext.java | 8 ++-
.../java/org/apache/ignite/table/KeyValueView.java | 2 +
.../main/java/org/apache/ignite/table/Table.java | 2 +-
.../java/org/apache/ignite/table/TableView.java | 2 +
.../main/java/org/apache/ignite/table/Tuple.java | 3 +-
.../java/org/apache/ignite/table/TupleBuilder.java | 2 +
.../KeyMapper.java => manager/package-info.java} | 7 +--
.../org/apache/ignite/table/mapper/KeyMapper.java | 4 +-
.../org/apache/ignite/table/mapper/Mappers.java | 51 ++++++++++++++++--
.../apache/ignite/table/mapper/RecordMapper.java | 29 +++++++++-
.../apache/ignite/table/mapper/ValueMapper.java | 39 ++++++++++++--
.../mapper/{KeyMapper.java => package-info.java} | 7 +--
.../mapper/KeyMapper.java => tx/package-info.java} | 7 +--
.../internal/schema/AbstractSchemaObject.java | 4 +-
.../internal/schema/SchemaConfigurationTest.java | 4 +-
.../org/apache/ignite/internal/table/Example.java | 4 +-
47 files changed, 307 insertions(+), 113 deletions(-)
diff --git a/check-rules/checkstyle-disabled-modules.xml b/check-rules/checkstyle-disabled-modules.xml
index 637c29f..5a13c45 100644
--- a/check-rules/checkstyle-disabled-modules.xml
+++ b/check-rules/checkstyle-disabled-modules.xml
@@ -24,7 +24,6 @@
<!-- To be removed once all javadoc issues will be fixed. -->
<suppressions>
<suppress files="[/\\]examples[/\\]" checks=".*" />
- <suppress files="[/\\]modules/api[/\\]" checks=".*" />
<suppress files="[/\\]modules/calcite[/\\]" checks=".*" />
<suppress files="[/\\]modules/cli[/\\]" checks=".*" />
<suppress files="[/\\]modules/core[/\\]" checks=".*" />
diff --git a/modules/api/src/main/java/org/apache/ignite/app/IgnitionManager.java b/modules/api/src/main/java/org/apache/ignite/app/IgnitionManager.java
index a3b1ee8..835fc2c 100644
--- a/modules/api/src/main/java/org/apache/ignite/app/IgnitionManager.java
+++ b/modules/api/src/main/java/org/apache/ignite/app/IgnitionManager.java
@@ -41,6 +41,7 @@ public class IgnitionManager {
* @param configStr Node configuration in the HOCON format. Can be {@code null}.
* @param workDir Work directory for the started node. Must not be {@code null}.
* @return Started Ignite node.
+ * @throws IgniteException If error occurs while reading node configuration.
*/
// TODO IGNITE-14580 Add exception handling logic to IgnitionProcessor.
public static synchronized Ignite start(String nodeName, @Nullable String configStr, Path workDir) {
diff --git a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java b/modules/api/src/main/java/org/apache/ignite/app/package-info.java
similarity index 88%
copy from modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
copy to modules/api/src/main/java/org/apache/ignite/app/package-info.java
index 6ab45e9..a0535ba 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
+++ b/modules/api/src/main/java/org/apache/ignite/app/package-info.java
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.table.mapper;
-
/**
- *
+ * Contains Ignite node API and classes for node lifecycle management.
*/
-public interface KeyMapper<T> {
-}
+package org.apache.ignite.app;
\ No newline at end of file
diff --git a/modules/api/src/main/java/org/apache/ignite/binary/BinaryObject.java b/modules/api/src/main/java/org/apache/ignite/binary/BinaryObject.java
index b6648c4..3eee5ff 100644
--- a/modules/api/src/main/java/org/apache/ignite/binary/BinaryObject.java
+++ b/modules/api/src/main/java/org/apache/ignite/binary/BinaryObject.java
@@ -23,7 +23,9 @@ package org.apache.ignite.binary;
//TODO: IGNITE-14316: Replace this stub with a proper interface.
public interface BinaryObject {
/**
+ * Return binary object bytes.
+ *
* @return Serialized data.
*/
- byte[] toBytes();
+ byte[] bytes();
}
diff --git a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java b/modules/api/src/main/java/org/apache/ignite/binary/package-info.java
similarity index 91%
copy from modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
copy to modules/api/src/main/java/org/apache/ignite/binary/package-info.java
index 6ab45e9..e267a89 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
+++ b/modules/api/src/main/java/org/apache/ignite/binary/package-info.java
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.table.mapper;
-
/**
- *
+ * User binary objects API.
*/
-public interface KeyMapper<T> {
-}
+package org.apache.ignite.binary;
\ No newline at end of file
diff --git a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java b/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/package-info.java
similarity index 88%
copy from modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
copy to modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/package-info.java
index 6ab45e9..2ba1f5b 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
+++ b/modules/api/src/main/java/org/apache/ignite/configuration/schemas/network/package-info.java
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.table.mapper;
-
/**
- *
+ * Configuration schemas for Network components.
*/
-public interface KeyMapper<T> {
-}
+package org.apache.ignite.configuration.schemas.network;
\ No newline at end of file
diff --git a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java b/modules/api/src/main/java/org/apache/ignite/configuration/schemas/rest/package-info.java
similarity index 89%
copy from modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
copy to modules/api/src/main/java/org/apache/ignite/configuration/schemas/rest/package-info.java
index 6ab45e9..ace5c83 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
+++ b/modules/api/src/main/java/org/apache/ignite/configuration/schemas/rest/package-info.java
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.table.mapper;
-
/**
- *
+ * Configuration schemas for Rest component.
*/
-public interface KeyMapper<T> {
-}
+package org.apache.ignite.configuration.schemas.rest;
\ No newline at end of file
diff --git a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java b/modules/api/src/main/java/org/apache/ignite/configuration/schemas/runner/package-info.java
similarity index 89%
copy from modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
copy to modules/api/src/main/java/org/apache/ignite/configuration/schemas/runner/package-info.java
index 6ab45e9..6f7e1e0 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
+++ b/modules/api/src/main/java/org/apache/ignite/configuration/schemas/runner/package-info.java
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.table.mapper;
-
/**
- *
+ * Configuration schemas for Cluster node.
*/
-public interface KeyMapper<T> {
-}
+package org.apache.ignite.configuration.schemas.runner;
\ No newline at end of file
diff --git a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java b/modules/api/src/main/java/org/apache/ignite/configuration/schemas/table/package-info.java
similarity index 87%
copy from modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
copy to modules/api/src/main/java/org/apache/ignite/configuration/schemas/table/package-info.java
index 6ab45e9..dcded5e 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
+++ b/modules/api/src/main/java/org/apache/ignite/configuration/schemas/table/package-info.java
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.table.mapper;
-
/**
- *
+ * Configuration schemas for Table and Schema components.
*/
-public interface KeyMapper<T> {
-}
+package org.apache.ignite.configuration.schemas.table;
\ No newline at end of file
diff --git a/modules/api/src/main/java/org/apache/ignite/lang/IgniteException.java b/modules/api/src/main/java/org/apache/ignite/lang/IgniteException.java
index 9afa9ba..d5d5739 100644
--- a/modules/api/src/main/java/org/apache/ignite/lang/IgniteException.java
+++ b/modules/api/src/main/java/org/apache/ignite/lang/IgniteException.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.Nullable;
* General Ignite exception. This exception is used to indicate any error condition within the node.
*/
public class IgniteException extends RuntimeException {
- /** */
+ /** Serial version uid. */
private static final long serialVersionUID = 0L;
/**
diff --git a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java b/modules/api/src/main/java/org/apache/ignite/lang/package-info.java
similarity index 90%
copy from modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
copy to modules/api/src/main/java/org/apache/ignite/lang/package-info.java
index 6ab45e9..0692c51 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
+++ b/modules/api/src/main/java/org/apache/ignite/lang/package-info.java
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.table.mapper;
-
/**
- *
+ * Ignite general purpose classes and interfaces.
*/
-public interface KeyMapper<T> {
-}
+package org.apache.ignite.lang;
\ No newline at end of file
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/Column.java b/modules/api/src/main/java/org/apache/ignite/schema/Column.java
index 6ca400f..72092fb 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/Column.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/Column.java
@@ -20,25 +20,31 @@ package org.apache.ignite.schema;
/**
* Table column descriptor.
*/
-public interface Column extends SchemaObject {
+public interface Column extends SchemaNamedObject {
/**
+ * Returns column name.
+ *
* @return Column name.
*/
@Override String name();
/**
+ * Returns column type.
+ *
* @return Column type.
*/
ColumnType type();
/**
- * {@code Nullable} flag.
+ * Returns {@code Nullable} flag value.
*
* @return {@code True} if null-values is allowed, {@code false} otherwise.
*/
boolean nullable();
/**
+ * Returns column default value.
+ *
* @return Default column value.
*/
Object defaultValue();
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/ColumnType.java b/modules/api/src/main/java/org/apache/ignite/schema/ColumnType.java
index 11bc798..ea1fa28 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/ColumnType.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/ColumnType.java
@@ -123,7 +123,12 @@ public class ColumnType {
/** Max length. */
private final int length;
- /** Constructor. */
+ /**
+ * Creates variable-length column type.
+ *
+ * @param typeSpec Type spec.
+ * @param length Type max length.
+ */
private VarLenColumnType(ColumnTypeSpec typeSpec, int length) {
super(typeSpec);
@@ -131,7 +136,9 @@ public class ColumnType {
}
/**
- * @return Max column value length.
+ * Max column value length.
+ *
+ * @return Max column value length or {@code 0} if unlimited.
*/
public int length() {
return length;
@@ -141,11 +148,15 @@ public class ColumnType {
@Override public boolean equals(Object o) {
if (this == o)
return true;
+
if (o == null || getClass() != o.getClass())
return false;
+
if (!super.equals(o))
return false;
+
VarLenColumnType type = (VarLenColumnType)o;
+
return length == type.length;
}
@@ -165,7 +176,13 @@ public class ColumnType {
/** Scale. */
private final int scale;
- /** Constructor. */
+ /**
+ * Creates numeric column type.
+ *
+ * @param typeSpec Type spec.
+ * @param precision Precision.
+ * @param scale Scale.
+ */
private NumericColumnType(ColumnTypeSpec typeSpec, int precision, int scale) {
super(typeSpec);
@@ -174,6 +191,8 @@ public class ColumnType {
}
/**
+ * Returns column precision.
+ *
* @return Precision.
*/
public int precision() {
@@ -181,6 +200,8 @@ public class ColumnType {
}
/**
+ * Returns column scale.
+ *
* @return Scale.
*/
public int scale() {
@@ -191,11 +212,15 @@ public class ColumnType {
@Override public boolean equals(Object o) {
if (this == o)
return true;
+
if (o == null || getClass() != o.getClass())
return false;
+
if (!super.equals(o))
return false;
+
NumericColumnType type = (NumericColumnType)o;
+
return precision == type.precision &&
scale == type.scale;
}
@@ -210,37 +235,67 @@ public class ColumnType {
* Column type spec.
*/
public enum ColumnTypeSpec {
+ /** 8-bit signed integer. */
INT8,
+
+ /** 16-bit signed integer. */
INT16,
+
+ /** 32-bit signed integer. */
INT32,
+
+ /** 64-bit signed integer. */
INT64,
+ /** 8-bit unsigned integer. */
UINT8,
+
+ /** 16-bit unsigned integer. */
UINT16,
+
+ /** 32-bit unsigned integer. */
UINT32,
+
+ /** 64-bit unsigned integer. */
UINT64,
+ /** 32-bit single-precision floating-point number. */
FLOAT,
+
+ /** 64-bit double-precision floating-point number. */
DOUBLE,
+ /** A decimal floating-point number. */
DECIMAL,
+ /** 128-bitUUID. */
UUID,
+ /** Bit mask. */
BITMASK,
+
+ /** String. */
STRING,
+
+ /** Binary data. */
BLOB,
}
/** Type spec. */
private final ColumnTypeSpec typeSpec;
- /** Constructor. */
+ /**
+ * Creates column type.
+ *
+ * @param typeSpec Type spec.
+ */
private ColumnType(ColumnTypeSpec typeSpec) {
this.typeSpec = typeSpec;
}
/**
+ * Returns column type spec.
+ *
* @return Type spec.
*/
public ColumnTypeSpec typeSpec() {
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/ColumnarIndex.java b/modules/api/src/main/java/org/apache/ignite/schema/ColumnarIndex.java
index 5fdeb3e..f187bb6 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/ColumnarIndex.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/ColumnarIndex.java
@@ -19,8 +19,13 @@ package org.apache.ignite.schema;
import java.util.List;
+/**
+ * Columnar index interface.
+ */
public interface ColumnarIndex {
/**
+ * Configured index columns.
+ *
* @return Index columns.
*/
List<? extends IndexColumn> columns();
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/IndexColumn.java b/modules/api/src/main/java/org/apache/ignite/schema/IndexColumn.java
index b944bdd..bea735b 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/IndexColumn.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/IndexColumn.java
@@ -20,8 +20,10 @@ package org.apache.ignite.schema;
/**
* Index column descriptor.
*/
-public interface IndexColumn extends SchemaObject {
+public interface IndexColumn extends SchemaNamedObject {
/**
+ * Returns column name.
+ *
* @return Column name.
*/
@Override String name();
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/PrimaryIndex.java b/modules/api/src/main/java/org/apache/ignite/schema/PrimaryIndex.java
index 882ea98..8584a47 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/PrimaryIndex.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/PrimaryIndex.java
@@ -27,7 +27,9 @@ public interface PrimaryIndex extends SortedIndex {
String PRIMARY_KEY_INDEX_NAME = "PK";
/**
- * @return Affinity columns
+ * Returns affinity columns.
+ *
+ * @return Columns list.
*/
List<String> affinityColumns();
}
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/SchemaMode.java b/modules/api/src/main/java/org/apache/ignite/schema/SchemaMode.java
index c7aab32..a3fc604 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/SchemaMode.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/SchemaMode.java
@@ -19,13 +19,20 @@ package org.apache.ignite.schema;
/**
* Schema mode.
- *
+ * <p>
* Defines the way inserting data will be validated against the schema and schema evolution capabilities.
*/
public enum SchemaMode {
- /** Normal mode offers strong validation for the inserting data. Explicit schema changes only are allowed. */
+ /**
+ * Normal mode offers strong validation for the inserting data.
+ * Explicit schema changes only are allowed.
+ */
STRICT_SCHEMA,
- /** Extended mode that allows the schema to be fit the inserting data automatically. Only safe implicit schema changes are allowed, e.g. adding extra columns and widening column type. Changes like column removal or narrowing column type won't be applied implicitly. */
+ /**
+ * Extended mode that allows the schema to be fit the inserting data automatically.
+ * Only safe implicit schema changes are allowed, e.g. adding extra columns and widening column type.
+ * Changes like column removal or narrowing column type won't be applied implicitly.
+ */
LIVE_SCHEMA
}
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/SchemaObject.java b/modules/api/src/main/java/org/apache/ignite/schema/SchemaNamedObject.java
similarity index 90%
rename from modules/api/src/main/java/org/apache/ignite/schema/SchemaObject.java
rename to modules/api/src/main/java/org/apache/ignite/schema/SchemaNamedObject.java
index 8a924ec..d876c2b 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/SchemaObject.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/SchemaNamedObject.java
@@ -18,10 +18,12 @@
package org.apache.ignite.schema;
/**
- * Schema object.
+ * Schema named object.
*/
-public interface SchemaObject {
+public interface SchemaNamedObject {
/**
+ * Returns object name.
+ *
* @return Schema object name.
*/
String name();
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/SchemaTable.java b/modules/api/src/main/java/org/apache/ignite/schema/SchemaTable.java
index a71fbc3..9d3ac56 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/SchemaTable.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/SchemaTable.java
@@ -23,44 +23,56 @@ import org.apache.ignite.schema.modification.TableModificationBuilder;
/**
* Schema table descriptor.
*/
-public interface SchemaTable extends SchemaObject {
+public interface SchemaTable extends SchemaNamedObject {
/** Default schema name. */
String DEFAULT_SCHEMA_NAME = "PUBLIC";
/**
+ * Returns table name.
+ *
* @return Table name.
*/
@Override String name();
/**
- * @return Key columns.
+ * Returns key columns.
+ *
+ * @return List of columns.
*/
Collection<Column> keyColumns();
/**
- * @return Affinity columns.
+ * Returns affinity columns.
+ *
+ * @return List of columns.
*/
Collection<Column> affinityColumns();
/**
- * @return Value columns.
+ * Returns value columns.
+ *
+ * @return List of columns.
*/
Collection<Column> valueColumns();
/**
- * Schema name + Table name
+ * Returns canonical table name (Concatenation of schema name and table name).
*
* @return Canonical table name.
*/
String canonicalName();
/**
- * @return Table indexes.
+ * Returns table indices.
+ *
+ * @return Collection of indexes.
*/
Collection<TableIndex> indices();
/**
- * @return Schema modification builder.
+ * Converts table descriptor to table modification builder.
+ *
+ * @return Table modification builder.
*/
TableModificationBuilder toBuilder();
}
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/SortedIndexColumn.java b/modules/api/src/main/java/org/apache/ignite/schema/SortedIndexColumn.java
index 731fdbd..ccc148f 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/SortedIndexColumn.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/SortedIndexColumn.java
@@ -22,6 +22,8 @@ package org.apache.ignite.schema;
*/
public interface SortedIndexColumn extends IndexColumn {
/**
+ * Returns column sort order.
+ *
* @return Column sort order.
*/
SortOrder sortOrder();
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/TableIndex.java b/modules/api/src/main/java/org/apache/ignite/schema/TableIndex.java
index 7345277..f693590 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/TableIndex.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/TableIndex.java
@@ -20,14 +20,16 @@ package org.apache.ignite.schema;
/**
* Table index base interface.
*/
-public interface TableIndex extends SchemaObject {
+public interface TableIndex extends SchemaNamedObject {
/**
+ * Returns index name.
+ *
* @return Index name.
*/
@Override String name();
/**
- * Index type.
+ * Returns index type.
*
* @return Index type.
*/
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/builder/HashIndexBuilder.java b/modules/api/src/main/java/org/apache/ignite/schema/builder/HashIndexBuilder.java
index 6b82dff..4ed2565 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/builder/HashIndexBuilder.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/builder/HashIndexBuilder.java
@@ -25,6 +25,8 @@ import org.apache.ignite.schema.HashIndex;
*/
public interface HashIndexBuilder extends SchemaObjectBuilder {
/**
+ * Sets indexed columns.
+ *
* @param columns Indexed columns.
* @return {@code this} for chaining.
*/
@@ -34,6 +36,8 @@ public interface HashIndexBuilder extends SchemaObjectBuilder {
@Override HashIndexBuilder withHints(Map<String, String> hints);
/**
+ * Builds hash index.
+ *
* @return Hash index.
*/
@Override HashIndex build();
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/builder/PartialIndexBuilder.java b/modules/api/src/main/java/org/apache/ignite/schema/builder/PartialIndexBuilder.java
index 90f2eb5..5ce2376 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/builder/PartialIndexBuilder.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/builder/PartialIndexBuilder.java
@@ -25,6 +25,8 @@ import org.apache.ignite.schema.PartialIndex;
*/
public interface PartialIndexBuilder extends SortedIndexBuilder {
/**
+ * Sets partial index expression.
+ *
* @param expr Partial index expression.
* @return {@code this} for chaining.
*/
@@ -37,6 +39,8 @@ public interface PartialIndexBuilder extends SortedIndexBuilder {
@Override PartialIndexBuilder withHints(Map<String, String> hints);
/**
+ * Builds partial index.
+ *
* @return Partial index.
*/
@Override PartialIndex build();
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/builder/PrimaryIndexBuilder.java b/modules/api/src/main/java/org/apache/ignite/schema/builder/PrimaryIndexBuilder.java
index eb4a555..d45b266 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/builder/PrimaryIndexBuilder.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/builder/PrimaryIndexBuilder.java
@@ -35,6 +35,8 @@ public interface PrimaryIndexBuilder extends SortedIndexBuilder {
@Override PrimaryIndexColumnBuilder addIndexColumn(String name);
/**
+ * Builds primary index.
+ *
* @return Primary index.
*/
@Override PrimaryIndex build();
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/builder/SchemaObjectBuilder.java b/modules/api/src/main/java/org/apache/ignite/schema/builder/SchemaObjectBuilder.java
index c8f352f..3d468bd 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/builder/SchemaObjectBuilder.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/builder/SchemaObjectBuilder.java
@@ -32,6 +32,8 @@ public interface SchemaObjectBuilder {
SchemaObjectBuilder withHints(Map<String, String> hints);
/**
+ * Builds schema object.
+ *
* @return Built object.
*/
Object build();
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/builder/SchemaTableBuilder.java b/modules/api/src/main/java/org/apache/ignite/schema/builder/SchemaTableBuilder.java
index 7e5a204..ef87443 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/builder/SchemaTableBuilder.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/builder/SchemaTableBuilder.java
@@ -28,6 +28,8 @@ import org.apache.ignite.schema.TableIndex;
*/
public interface SchemaTableBuilder extends SchemaObjectBuilder {
/**
+ * Adds columns to the table.
+ *
* @param columns Table columns.
* @return {@code This} for chaining.
*/
@@ -42,7 +44,7 @@ public interface SchemaTableBuilder extends SchemaObjectBuilder {
SchemaTableBuilder withIndex(TableIndex index);
/**
- * Shortcut method for adding {@link PrimaryIndex} via {@link #withIndex(TableIndex)}
+ * Shortcut method for adding {@link PrimaryIndex} via {@link #withIndex(TableIndex)}.
*
* @param colName Key column name.
* @return {@code This} for chaining.
@@ -53,9 +55,9 @@ public interface SchemaTableBuilder extends SchemaObjectBuilder {
@Override SchemaTableBuilder withHints(Map<String, String> hints);
/**
- * Builds table schema.
+ * Builds table.
*
- * @return Table schema.
+ * @return Table.
*/
@Override SchemaTable build();
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/builder/SortedIndexBuilder.java b/modules/api/src/main/java/org/apache/ignite/schema/builder/SortedIndexBuilder.java
index 96dcd65..1bacea8 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/builder/SortedIndexBuilder.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/builder/SortedIndexBuilder.java
@@ -43,6 +43,8 @@ public interface SortedIndexBuilder extends SchemaObjectBuilder {
@Override SortedIndexBuilder withHints(Map<String, String> hints);
/**
+ * Builds sorted index.
+ *
* @return Sorted index.
*/
@Override SortedIndex build();
@@ -67,12 +69,16 @@ public interface SortedIndexBuilder extends SchemaObjectBuilder {
SortedIndexColumnBuilder asc();
/**
+ * Sets column name.
+ *
* @param name Column name.
* @return {@code this} for chaining.
*/
SortedIndexColumnBuilder withName(String name);
/**
+ * Builds and adds the column to the index.
+ *
* @return Parent builder for chaining.
*/
SortedIndexBuilder done();
diff --git a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java b/modules/api/src/main/java/org/apache/ignite/schema/builder/package-info.java
similarity index 90%
copy from modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
copy to modules/api/src/main/java/org/apache/ignite/schema/builder/package-info.java
index 6ab45e9..784073f 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/builder/package-info.java
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.table.mapper;
-
/**
- *
+ * Contains table schema definition builders.
*/
-public interface KeyMapper<T> {
-}
+package org.apache.ignite.schema.builder;
\ No newline at end of file
diff --git a/modules/api/src/main/java/org/apache/ignite/schema/modification/AlterColumnBuilder.java b/modules/api/src/main/java/org/apache/ignite/schema/modification/AlterColumnBuilder.java
index 94ff66e..1c8916d 100644
--- a/modules/api/src/main/java/org/apache/ignite/schema/modification/AlterColumnBuilder.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/modification/AlterColumnBuilder.java
@@ -70,6 +70,8 @@ public interface AlterColumnBuilder {
AlterColumnBuilder asNonNullable(Object replacement);
/**
+ * Builds alter column descriptor and pass it to parent table modification builder.
+ *
* @return Parent builder.
*/
TableModificationBuilder done();
diff --git a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java b/modules/api/src/main/java/org/apache/ignite/schema/modification/package-info.java
similarity index 91%
copy from modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
copy to modules/api/src/main/java/org/apache/ignite/schema/modification/package-info.java
index 6ab45e9..35136a6 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/modification/package-info.java
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.table.mapper;
-
/**
- *
+ * Table schema manipulation API.
*/
-public interface KeyMapper<T> {
-}
+package org.apache.ignite.schema.modification;
\ No newline at end of file
diff --git a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java b/modules/api/src/main/java/org/apache/ignite/schema/package-info.java
similarity index 89%
copy from modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
copy to modules/api/src/main/java/org/apache/ignite/schema/package-info.java
index 6ab45e9..27f81e5 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
+++ b/modules/api/src/main/java/org/apache/ignite/schema/package-info.java
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.table.mapper;
-
/**
- *
+ * Contains table schema definition interfaces and classes.
*/
-public interface KeyMapper<T> {
-}
+package org.apache.ignite.schema;
\ No newline at end of file
diff --git a/modules/api/src/main/java/org/apache/ignite/table/InvocationContext.java b/modules/api/src/main/java/org/apache/ignite/table/InvocationContext.java
index 8a3bda0..ba79b0e 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/InvocationContext.java
+++ b/modules/api/src/main/java/org/apache/ignite/table/InvocationContext.java
@@ -24,14 +24,18 @@ package org.apache.ignite.table;
* InvokeProcessor executes atomically under lock which makes impossible
* to trigger 'live-schema' upgrade within the invoke operation.
* Any try to update the row leading to schema change will end up with {@link InvokeProcessorException}.
+ * <p>
+ * New value MUST BE compliant with the current schema version.
*
* @param <K> Target object type.
* @param <V> Value object type.
- * @apiNote New value MUST BE compliant with the current schema version.
+ * @see InvokeProcessor
*/
public interface InvocationContext<K, V> {
/**
- * @return Processor invocation arguments provided by user to invoke operation.
+ * Returns arguments provided by user for invoke operation.
+ *
+ * @return Agruments for invocation processor.
*/
Object[] args();
diff --git a/modules/api/src/main/java/org/apache/ignite/table/KeyValueView.java b/modules/api/src/main/java/org/apache/ignite/table/KeyValueView.java
index f7cc98c..b8d730b 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/KeyValueView.java
+++ b/modules/api/src/main/java/org/apache/ignite/table/KeyValueView.java
@@ -383,6 +383,8 @@ public interface KeyValueView<K, V> {
Serializable... args);
/**
+ * Returns current transaction.
+ *
* @return Current transaction or null if the view is not enlisted in a transaction.
*/
@Nullable Transaction transaction();
diff --git a/modules/api/src/main/java/org/apache/ignite/table/Table.java b/modules/api/src/main/java/org/apache/ignite/table/Table.java
index 5a8974b..06ae0c2 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/Table.java
+++ b/modules/api/src/main/java/org/apache/ignite/table/Table.java
@@ -93,7 +93,7 @@ public interface Table extends TableView<Tuple> {
* @return Table record view.
*/
default <R> RecordView<R> recordView(Class<R> recCls) {
- return recordView(Mappers.ofRowClass(recCls));
+ return recordView(Mappers.ofRecordClass(recCls));
}
/**
diff --git a/modules/api/src/main/java/org/apache/ignite/table/TableView.java b/modules/api/src/main/java/org/apache/ignite/table/TableView.java
index 77258e8..ff17bd6 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/TableView.java
+++ b/modules/api/src/main/java/org/apache/ignite/table/TableView.java
@@ -355,6 +355,8 @@ public interface TableView<R> {
InvokeProcessor<R, R, T> proc);
/**
+ * Returns current transaction.
+ *
* @return Current transaction or null if a table is not enlisted in a transaction.
*/
@Nullable Transaction transaction();
diff --git a/modules/api/src/main/java/org/apache/ignite/table/Tuple.java b/modules/api/src/main/java/org/apache/ignite/table/Tuple.java
index 93605d5..2b63d01 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/Tuple.java
+++ b/modules/api/src/main/java/org/apache/ignite/table/Tuple.java
@@ -23,7 +23,7 @@ import org.apache.ignite.binary.BinaryObject;
/**
* Tuple represents arbitrary set of columns whose values is accessible by column name.
- *
+ * <p>
* Provides specialized method for some value-types to avoid boxing/unboxing.
*/
public interface Tuple {
@@ -32,6 +32,7 @@ public interface Tuple {
*
* @param colName Column name.
* @param def Default value.
+ * @param <T> Column default value type.
* @return Column value if this tuple contains a column with the specified name. Otherwise returns {@code default}.
*/
<T> T valueOrDefault(String colName, T def);
diff --git a/modules/api/src/main/java/org/apache/ignite/table/TupleBuilder.java b/modules/api/src/main/java/org/apache/ignite/table/TupleBuilder.java
index 266f0d5..db3e527 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/TupleBuilder.java
+++ b/modules/api/src/main/java/org/apache/ignite/table/TupleBuilder.java
@@ -31,6 +31,8 @@ public interface TupleBuilder {
TupleBuilder set(String colName, Object value);
/**
+ * Builds tuple.
+ *
* @return Tuple.
*/
Tuple build();
diff --git a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java b/modules/api/src/main/java/org/apache/ignite/table/manager/package-info.java
similarity index 90%
copy from modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
copy to modules/api/src/main/java/org/apache/ignite/table/manager/package-info.java
index 6ab45e9..61d694c 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
+++ b/modules/api/src/main/java/org/apache/ignite/table/manager/package-info.java
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.table.mapper;
-
/**
- *
+ * Contains API classes for table management.
*/
-public interface KeyMapper<T> {
-}
+package org.apache.ignite.table.manager;
\ No newline at end of file
diff --git a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java b/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
index 6ab45e9..8b48507 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
+++ b/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
@@ -18,7 +18,9 @@
package org.apache.ignite.table.mapper;
/**
+ * Key mapper interface.
*
+ * @param <K> Key type.
*/
-public interface KeyMapper<T> {
+public interface KeyMapper<K> {
}
diff --git a/modules/api/src/main/java/org/apache/ignite/table/mapper/Mappers.java b/modules/api/src/main/java/org/apache/ignite/table/mapper/Mappers.java
index c2e461c..557efff 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/Mappers.java
+++ b/modules/api/src/main/java/org/apache/ignite/table/mapper/Mappers.java
@@ -21,27 +21,68 @@ package org.apache.ignite.table.mapper;
* Mappers shortcut methods.
*/
public final class Mappers {
- public static <K> KeyMapper<K> ofKeyClass(Class<K> keyCls) {
+ /**
+ * Factory method for key mapper.
+ *
+ * @param cls Key class.
+ * @param <K> Key type.
+ * @return Mapper for key.
+ */
+ public static <K> KeyMapper<K> ofKeyClass(Class<K> cls) {
return null;
}
- public static <V> ValueMapper<V> ofValueClass(Class<V> keyCls) {
+ /**
+ * Factory method for value mapper.
+ *
+ * @param cls Value class.
+ * @param <V> Value type.
+ * @return Mapper for value.
+ */
+ public static <V> ValueMapper<V> ofValueClass(Class<V> cls) {
return null;
}
- public static <V> ValueMapper.Builder<V> ofValueClassBuilder(Class<V> valCls) {
+ /**
+ * Factory method for value mapper builder.
+ *
+ * @param cls Value class.
+ * @param <V> Value type.
+ * @return Mapper builder for value.
+ */
+ public static <V> ValueMapper.Builder<V> ofValueClassBuilder(Class<V> cls) {
return null;
}
+ /**
+ * Identity key mapper.
+ *
+ * @param <R> Record type.
+ * @return Identity key mapper.
+ */
public static <R> KeyMapper<R> identity() {
return null;
}
- public static <R> RecordMapper<R> ofRowClass(Class<R> rowCls) {
+ /**
+ * Factory method for record mapper builder.
+ *
+ * @param cls Record class.
+ * @param <R> Record type.
+ * @return Mapper builder for record.
+ */
+ public static <R> RecordMapper<R> ofRecordClass(Class<R> cls) {
return null;
}
- public static <R> RecordMapper.Builder<R> ofRowClassBuilder(Class<R> targetClass) {
+ /**
+ * Factory method for value mapper builder.
+ *
+ * @param cls Record class.
+ * @param <R> Record type.
+ * @return Mapper builder for record.
+ */
+ public static <R> RecordMapper.Builder<R> ofRecordClassBuilder(Class<R> cls) {
return null;
}
diff --git a/modules/api/src/main/java/org/apache/ignite/table/mapper/RecordMapper.java b/modules/api/src/main/java/org/apache/ignite/table/mapper/RecordMapper.java
index 96655df..fb7b52f 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/RecordMapper.java
+++ b/modules/api/src/main/java/org/apache/ignite/table/mapper/RecordMapper.java
@@ -21,14 +21,41 @@ import java.util.function.Function;
import org.apache.ignite.table.Tuple;
/**
+ * Record mapper interface.
*
+ * @param <R> Record type.
*/
public interface RecordMapper<R> {
+ /**
+ * Record mapper builder.
+ *
+ * @param <R> Record type.
+ */
public interface Builder<R> {
+ /**
+ * Map a field to a type of given class.
+ *
+ * @param fieldName Field name.
+ * @param targetClass Target class.
+ * @return {@code this} for chaining.
+ */
public Builder<R> map(String fieldName, Class<?> targetClass);
- public Builder<R> map(String fieldName, Function<Tuple, Object> mapping);
+ /**
+ * Adds a functional mapping for a field,
+ * the result depends on function call for every particular row.
+ *
+ * @param fieldName Field name.
+ * @param mappingFunction Mapper function.
+ * @return {@code this} for chaining.
+ */
+ public Builder<R> map(String fieldName, Function<Tuple, Object> mappingFunction);
+ /**
+ * Builds record mapper.
+ *
+ * @return Mapper.
+ */
public RecordMapper<R> build();
}
}
diff --git a/modules/api/src/main/java/org/apache/ignite/table/mapper/ValueMapper.java b/modules/api/src/main/java/org/apache/ignite/table/mapper/ValueMapper.java
index da4b402..2a9e900 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/ValueMapper.java
+++ b/modules/api/src/main/java/org/apache/ignite/table/mapper/ValueMapper.java
@@ -21,16 +21,49 @@ import java.util.function.Function;
import org.apache.ignite.table.Tuple;
/**
+ * Value mapper interface.
*
+ * @param <V> Value type.
*/
public interface ValueMapper<V> {
+ /**
+ * Value mapper builder.
+ *
+ * @param <V> Value type.
+ */
public interface Builder<V> {
- public Builder<V> deserializeTo(Class<?> cls);
+ /**
+ * Sets a target class to deserialize to.
+ *
+ * @param targetClass Target class.
+ * @return {@code this} for chaining.
+ */
+ public Builder<V> deserializeTo(Class<?> targetClass);
- public Builder<V> map(String fieldName, Class<?> cls);
+ /**
+ * Map a field to a type of given class.
+ *
+ * @param fieldName Field name.
+ * @param targetClass Target class.
+ * @return {@code this} for chaining.
+ */
+ public Builder<V> map(String fieldName, Class<?> targetClass);
- public Builder<V> map(String fieldName, Function<Tuple, Object> mapper);
+ /**
+ * Adds a functional mapping for a field,
+ * the result depends on function call for every particular row.
+ *
+ * @param fieldName Field name.
+ * @param mapperFunction Mapper function.
+ * @return {@code this} for chaining.
+ */
+ public Builder<V> map(String fieldName, Function<Tuple, Object> mapperFunction);
+ /**
+ * Builds value mapper.
+ *
+ * @return Mapper.
+ */
public ValueMapper<V> build();
}
}
diff --git a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java b/modules/api/src/main/java/org/apache/ignite/table/mapper/package-info.java
similarity index 88%
copy from modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
copy to modules/api/src/main/java/org/apache/ignite/table/mapper/package-info.java
index 6ab45e9..5072f7e 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
+++ b/modules/api/src/main/java/org/apache/ignite/table/mapper/package-info.java
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.table.mapper;
-
/**
- *
+ * Contains user classes mapping API classes and mapper builders.
*/
-public interface KeyMapper<T> {
-}
+package org.apache.ignite.table.mapper;
\ No newline at end of file
diff --git a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java b/modules/api/src/main/java/org/apache/ignite/tx/package-info.java
similarity index 90%
copy from modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
copy to modules/api/src/main/java/org/apache/ignite/tx/package-info.java
index 6ab45e9..a51057a 100644
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
+++ b/modules/api/src/main/java/org/apache/ignite/tx/package-info.java
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.table.mapper;
-
/**
- *
+ * Contains Transaction API classes and interfaces.
*/
-public interface KeyMapper<T> {
-}
+package org.apache.ignite.tx;
\ No newline at end of file
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/AbstractSchemaObject.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/AbstractSchemaObject.java
index 2c1ecbb..4e9eac1 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/AbstractSchemaObject.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/AbstractSchemaObject.java
@@ -18,12 +18,12 @@
package org.apache.ignite.internal.schema;
import org.apache.ignite.internal.tostring.S;
-import org.apache.ignite.schema.SchemaObject;
+import org.apache.ignite.schema.SchemaNamedObject;
/**
* Schema object base class.
*/
-public abstract class AbstractSchemaObject implements SchemaObject {
+public abstract class AbstractSchemaObject implements SchemaNamedObject {
/** Schema object name. */
private final String name;
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 50dffcf..085a11a 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
@@ -87,7 +87,7 @@ public class SchemaConfigurationTest {
*/
@Test
public void testSchemaModification() {
- final SchemaTable table = SchemaBuilders.tableBuilder("PUBLIC", "table1")
+ final SchemaTable schemaTable = SchemaBuilders.tableBuilder("PUBLIC", "table1")
.columns(
// Declaring columns in user order.
SchemaBuilders.column("id", ColumnType.INT64).build(),
@@ -96,7 +96,7 @@ public class SchemaConfigurationTest {
.withPrimaryKey("id")
.build();
- table.toBuilder()
+ schemaTable.toBuilder()
.addColumn(
SchemaBuilders.column("firstName", ColumnType.string())
.asNonNull()
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/Example.java b/modules/table/src/test/java/org/apache/ignite/internal/table/Example.java
index 9836e12..38dabb4 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/Example.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/Example.java
@@ -373,12 +373,12 @@ public class Example {
}
RecordView<TruncatedRecord> truncatedView = t.recordView(
- Mappers.ofRowClassBuilder(TruncatedRecord.class)
+ Mappers.ofRecordClassBuilder(TruncatedRecord.class)
.map("upgradedObject", JavaPersonV2.class).build());
// Or we can have a custom conditional type selection.
RecordView<TruncatedRecord> truncatedView2 = t.recordView(
- Mappers.ofRowClassBuilder(TruncatedRecord.class)
+ Mappers.ofRecordClassBuilder(TruncatedRecord.class)
.map("upgradedObject", (row) -> {
BinaryObject bObj = row.binaryObjectField("upgradedObject");
int dept = row.intValue("department");