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/10/27 09:42:06 UTC
[ignite-3] 01/04: Drop useless classes.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-15783
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 9c0c77d731165e3ba1801bedc3813069e3a4a248
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Tue Oct 26 13:59:03 2021 +0300
Drop useless classes.
---
.../main/java/org/apache/ignite/table/Table.java | 8 ++-
.../org/apache/ignite/table/mapper/KeyMapper.java | 26 ---------
.../table/mapper/{ValueMapper.java => Mapper.java} | 36 ++++++-------
.../org/apache/ignite/table/mapper/Mappers.java | 12 ++---
.../apache/ignite/table/mapper/RecordMapper.java | 61 ----------------------
.../ignite/internal/client/table/ClientTable.java | 8 ++-
.../ignite/internal/table/KeyValueViewImpl.java | 7 ++-
.../ignite/internal/table/RecordViewImpl.java | 4 +-
.../apache/ignite/internal/table/TableImpl.java | 8 ++-
9 files changed, 38 insertions(+), 132 deletions(-)
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 cd5be9e..14e6f75 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
@@ -17,10 +17,8 @@
package org.apache.ignite.table;
-import org.apache.ignite.table.mapper.KeyMapper;
+import org.apache.ignite.table.mapper.Mapper;
import org.apache.ignite.table.mapper.Mappers;
-import org.apache.ignite.table.mapper.RecordMapper;
-import org.apache.ignite.table.mapper.ValueMapper;
import org.jetbrains.annotations.NotNull;
/**
@@ -47,7 +45,7 @@ public interface Table {
* @param <R> Record type.
* @return Table record view.
*/
- <R> RecordView<R> recordView(RecordMapper<R> recMapper);
+ <R> RecordView<R> recordView(Mapper<R> recMapper);
/**
* Creates record view of table regarding the binary object concept.
@@ -65,7 +63,7 @@ public interface Table {
* @param <V> Value type.
* @return Table key-value view.
*/
- <K, V> KeyValueView<K, V> keyValueView(KeyMapper<K> keyMapper, ValueMapper<V> valMapper);
+ <K, V> KeyValueView<K, V> keyValueView(Mapper<K> keyMapper, Mapper<V> valMapper);
/**
* Creates key-value view of table regarding the binary object concept.
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
deleted file mode 100644
index 8b48507..0000000
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java
+++ /dev/null
@@ -1,26 +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.
- */
-
-package org.apache.ignite.table.mapper;
-
-/**
- * Key mapper interface.
- *
- * @param <K> Key type.
- */
-public interface KeyMapper<K> {
-}
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/Mapper.java
similarity index 76%
rename from modules/api/src/main/java/org/apache/ignite/table/mapper/ValueMapper.java
rename to modules/api/src/main/java/org/apache/ignite/table/mapper/Mapper.java
index 2a9e900..7210378 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/Mapper.java
@@ -21,49 +21,49 @@ import java.util.function.Function;
import org.apache.ignite.table.Tuple;
/**
- * Value mapper interface.
+ * Mapper interface.
*
- * @param <V> Value type.
+ * @param <R> Record type.
*/
-public interface ValueMapper<V> {
+public interface Mapper<R> {
/**
- * Value mapper builder.
+ * Mapper builder.
*
- * @param <V> Value type.
+ * @param <T> Type.
*/
- public interface Builder<V> {
+ interface Builder<T> {
/**
- * Sets a target class to deserialize to.
+ * 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> deserializeTo(Class<?> targetClass);
+ Builder<T> map(String fieldName, Class<?> targetClass);
/**
- * Map a field to a type of given class.
+ * Adds a functional mapping for a field,
+ * the result depends on function call for every particular row.
*
* @param fieldName Field name.
- * @param targetClass Target class.
+ * @param mappingFunction Mapper function.
* @return {@code this} for chaining.
*/
- public Builder<V> map(String fieldName, Class<?> targetClass);
+ Builder<T> map(String fieldName, Function<Tuple, Object> mappingFunction);
/**
- * Adds a functional mapping for a field,
- * the result depends on function call for every particular row.
+ * Sets a target class to deserialize to.
*
- * @param fieldName Field name.
- * @param mapperFunction Mapper function.
+ * @param targetClass Target class.
* @return {@code this} for chaining.
*/
- public Builder<V> map(String fieldName, Function<Tuple, Object> mapperFunction);
+ Builder<T> deserializeTo(Class<?> targetClass);
/**
- * Builds value mapper.
+ * Builds mapper.
*
* @return Mapper.
*/
- public ValueMapper<V> build();
+ Mapper<T> build();
}
}
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 557efff..c4bc6cc 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
@@ -28,7 +28,7 @@ public final class Mappers {
* @param <K> Key type.
* @return Mapper for key.
*/
- public static <K> KeyMapper<K> ofKeyClass(Class<K> cls) {
+ public static <K> Mapper<K> ofKeyClass(Class<K> cls) {
return null;
}
@@ -39,7 +39,7 @@ public final class Mappers {
* @param <V> Value type.
* @return Mapper for value.
*/
- public static <V> ValueMapper<V> ofValueClass(Class<V> cls) {
+ public static <V> Mapper<V> ofValueClass(Class<V> cls) {
return null;
}
@@ -50,7 +50,7 @@ public final class Mappers {
* @param <V> Value type.
* @return Mapper builder for value.
*/
- public static <V> ValueMapper.Builder<V> ofValueClassBuilder(Class<V> cls) {
+ public static <V> Mapper.Builder<V> ofValueClassBuilder(Class<V> cls) {
return null;
}
@@ -60,7 +60,7 @@ public final class Mappers {
* @param <R> Record type.
* @return Identity key mapper.
*/
- public static <R> KeyMapper<R> identity() {
+ public static <R> Mapper<R> identity() {
return null;
}
@@ -71,7 +71,7 @@ public final class Mappers {
* @param <R> Record type.
* @return Mapper builder for record.
*/
- public static <R> RecordMapper<R> ofRecordClass(Class<R> cls) {
+ public static <R> Mapper<R> ofRecordClass(Class<R> cls) {
return null;
}
@@ -82,7 +82,7 @@ public final class Mappers {
* @param <R> Record type.
* @return Mapper builder for record.
*/
- public static <R> RecordMapper.Builder<R> ofRecordClassBuilder(Class<R> cls) {
+ public static <R> Mapper.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
deleted file mode 100644
index fb7b52f..0000000
--- a/modules/api/src/main/java/org/apache/ignite/table/mapper/RecordMapper.java
+++ /dev/null
@@ -1,61 +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.
- */
-
-package org.apache.ignite.table.mapper;
-
-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);
-
- /**
- * 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/client/src/main/java/org/apache/ignite/internal/client/table/ClientTable.java b/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientTable.java
index 188f775..faae660 100644
--- a/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientTable.java
+++ b/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientTable.java
@@ -39,9 +39,7 @@ import org.apache.ignite.table.KeyValueView;
import org.apache.ignite.table.RecordView;
import org.apache.ignite.table.Table;
import org.apache.ignite.table.Tuple;
-import org.apache.ignite.table.mapper.KeyMapper;
-import org.apache.ignite.table.mapper.RecordMapper;
-import org.apache.ignite.table.mapper.ValueMapper;
+import org.apache.ignite.table.mapper.Mapper;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.msgpack.core.MessageFormat;
@@ -100,12 +98,12 @@ public class ClientTable implements Table {
}
/** {@inheritDoc} */
- @Override public <R> RecordView<R> recordView(RecordMapper<R> recMapper) {
+ @Override public <R> RecordView<R> recordView(Mapper<R> recMapper) {
throw new UnsupportedOperationException("Not implemented yet.");
}
/** {@inheritDoc} */
- @Override public <K, V> KeyValueView<K, V> keyValueView(KeyMapper<K> keyMapper, ValueMapper<V> valMapper) {
+ @Override public <K, V> KeyValueView<K, V> keyValueView(Mapper<K> keyMapper, Mapper<V> valMapper) {
throw new UnsupportedOperationException("Not implemented yet.");
}
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/KeyValueViewImpl.java b/modules/table/src/main/java/org/apache/ignite/internal/table/KeyValueViewImpl.java
index a0c4b5c..44ac174 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/KeyValueViewImpl.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/KeyValueViewImpl.java
@@ -29,8 +29,7 @@ import org.apache.ignite.internal.schema.marshaller.KVSerializer;
import org.apache.ignite.internal.schema.row.Row;
import org.apache.ignite.table.InvokeProcessor;
import org.apache.ignite.table.KeyValueView;
-import org.apache.ignite.table.mapper.KeyMapper;
-import org.apache.ignite.table.mapper.ValueMapper;
+import org.apache.ignite.table.mapper.Mapper;
import org.apache.ignite.tx.Transaction;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -47,8 +46,8 @@ public class KeyValueViewImpl<K, V> extends AbstractTableView implements KeyValu
* @param valueMapper Value class mapper.
* @param tx The transaction.
*/
- public KeyValueViewImpl(InternalTable tbl, SchemaRegistry schemaReg, KeyMapper<K> keyMapper,
- ValueMapper<V> valueMapper, @Nullable Transaction tx) {
+ public KeyValueViewImpl(InternalTable tbl, SchemaRegistry schemaReg, Mapper<K> keyMapper,
+ Mapper<V> valueMapper, @Nullable Transaction tx) {
super(tbl, schemaReg, tx);
}
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/RecordViewImpl.java b/modules/table/src/main/java/org/apache/ignite/internal/table/RecordViewImpl.java
index 8bdcc44..c6d3ed7 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/RecordViewImpl.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/RecordViewImpl.java
@@ -29,7 +29,7 @@ import org.apache.ignite.internal.schema.marshaller.RecordSerializer;
import org.apache.ignite.internal.schema.row.Row;
import org.apache.ignite.table.InvokeProcessor;
import org.apache.ignite.table.RecordView;
-import org.apache.ignite.table.mapper.RecordMapper;
+import org.apache.ignite.table.mapper.Mapper;
import org.apache.ignite.tx.Transaction;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -45,7 +45,7 @@ public class RecordViewImpl<R> extends AbstractTableView implements RecordView<R
* @param mapper Record class mapper.
* @param tx The transaction.
*/
- public RecordViewImpl(InternalTable tbl, SchemaRegistry schemaReg, RecordMapper<R> mapper, @Nullable Transaction tx) {
+ public RecordViewImpl(InternalTable tbl, SchemaRegistry schemaReg, Mapper<R> mapper, @Nullable Transaction tx) {
super(tbl, schemaReg, tx);
}
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/TableImpl.java b/modules/table/src/main/java/org/apache/ignite/internal/table/TableImpl.java
index 22f9b9c..f368c84 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/TableImpl.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/TableImpl.java
@@ -27,9 +27,7 @@ import org.apache.ignite.table.KeyValueView;
import org.apache.ignite.table.RecordView;
import org.apache.ignite.table.Table;
import org.apache.ignite.table.Tuple;
-import org.apache.ignite.table.mapper.KeyMapper;
-import org.apache.ignite.table.mapper.RecordMapper;
-import org.apache.ignite.table.mapper.ValueMapper;
+import org.apache.ignite.table.mapper.Mapper;
import org.jetbrains.annotations.NotNull;
/**
@@ -87,7 +85,7 @@ public class TableImpl implements Table {
}
/** {@inheritDoc} */
- @Override public <R> RecordView<R> recordView(RecordMapper<R> recMapper) {
+ @Override public <R> RecordView<R> recordView(Mapper<R> recMapper) {
return new RecordViewImpl<>(tbl, schemaReg, recMapper, null);
}
@@ -97,7 +95,7 @@ public class TableImpl implements Table {
}
/** {@inheritDoc} */
- @Override public <K, V> KeyValueView<K, V> keyValueView(KeyMapper<K> keyMapper, ValueMapper<V> valMapper) {
+ @Override public <K, V> KeyValueView<K, V> keyValueView(Mapper<K> keyMapper, Mapper<V> valMapper) {
return new KeyValueViewImpl<>(tbl, schemaReg, keyMapper, valMapper, null);
}