This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 9697746355d IGNITE-26507 Move builders package to ignite-binary-impl
(#12369)
9697746355d is described below
commit 9697746355dd050357c44af936d4a2bc6613ebc5
Author: Nikolay <[email protected]>
AuthorDate: Thu Sep 25 10:53:04 2025 +0300
IGNITE-26507 Move builders package to ignite-binary-impl (#12369)
---
.../binary/builder/BinaryObjectBuilders.java | 52 ++++++++--------------
...bject.java => BinaryObjectBuildersFactory.java} | 38 ++++++++--------
.../binary/builder/BinaryAbstractLazyValue.java | 0
.../internal/binary/builder/BinaryBuilderEnum.java | 0
.../binary/builder/BinaryBuilderReader.java | 3 +-
.../builder/BinaryBuilderSerializationAware.java | 0
.../binary/builder/BinaryBuilderSerializer.java | 0
.../binary/builder/BinaryEnumArrayLazyValue.java | 0
.../binary/builder/BinaryLazyArrayList.java | 8 ++--
.../binary/builder/BinaryLazyLinkedList.java | 15 ++++---
.../internal/binary/builder/BinaryLazyMap.java | 10 +++--
.../internal/binary/builder/BinaryLazySet.java | 4 +-
.../internal/binary/builder/BinaryLazyValue.java | 0
.../binary/builder/BinaryModifiableLazyValue.java | 0
.../binary/builder/BinaryObjectArrayLazyValue.java | 0
.../binary/builder/BinaryObjectBuilderImpl.java | 4 +-
.../builder/BinaryObjectBuildersFactoryImpl.java} | 21 ++++-----
.../binary/builder/BinaryPlainBinaryObject.java | 0
.../binary/builder/BinaryPlainLazyValue.java | 0
.../binary/builder/BinaryValueWithType.java | 0
...rnal.binary.builder.BinaryObjectBuildersFactory | 1 +
21 files changed, 73 insertions(+), 83 deletions(-)
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilders.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilders.java
index c02f880432e..68a1eb62bba 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilders.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilders.java
@@ -21,18 +21,33 @@ import java.util.Iterator;
import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryObjectBuilder;
import org.apache.ignite.internal.binary.BinaryContext;
-import org.jetbrains.annotations.Nullable;
+import org.apache.ignite.internal.util.CommonUtils;
+import org.apache.ignite.internal.util.typedef.internal.A;
/**
* Utility class to provide static methods to create {@link
BinaryObjectBuilder}.
*/
public class BinaryObjectBuilders {
+ /** Streams factory implementation. */
+ private static final BinaryObjectBuildersFactory factory;
+
+ static {
+ Iterator<BinaryObjectBuildersFactory> factories =
CommonUtils.loadService(BinaryObjectBuildersFactory.class).iterator();
+
+ A.ensure(
+ factories.hasNext(),
+ "Implementation for BinaryObjectBuildersFactory service not found.
Please add ignite-binary-impl to classpath"
+ );
+
+ factory = factories.next();
+ }
+
/**
* @param obj Object to convert to builder.
* @return Builder instance.
*/
public static BinaryObjectBuilder builder(BinaryObject obj) {
- return BinaryObjectBuilderImpl.wrap(obj);
+ return factory.builder(obj);
}
/**
@@ -41,37 +56,6 @@ public class BinaryObjectBuilders {
* @return Builder instance.
*/
public static BinaryObjectBuilder builder(BinaryContext binaryCtx, String
clsName) {
- return new BinaryObjectBuilderImpl(binaryCtx, clsName);
- }
-
- /**
- * @param obj Value to unwrap.
- * @return Unwrapped value.
- */
- static Object unwrapLazy(@Nullable Object obj) {
- if (obj instanceof BinaryLazyValue)
- return ((BinaryLazyValue)obj).value();
-
- return obj;
- }
-
- /**
- * @param delegate Iterator to delegate.
- * @return New iterator.
- */
- static Iterator<Object> unwrapLazyIterator(final Iterator<Object>
delegate) {
- return new Iterator<Object>() {
- @Override public boolean hasNext() {
- return delegate.hasNext();
- }
-
- @Override public Object next() {
- return unwrapLazy(delegate.next());
- }
-
- @Override public void remove() {
- delegate.remove();
- }
- };
+ return factory.builder(binaryCtx, clsName);
}
}
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuildersFactory.java
similarity index 55%
copy from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
copy to
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuildersFactory.java
index 8de3514b872..9798e5ac9ba 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuildersFactory.java
@@ -17,32 +17,30 @@
package org.apache.ignite.internal.binary.builder;
+import java.util.ServiceLoader;
import org.apache.ignite.binary.BinaryObject;
-import org.apache.ignite.internal.binary.BinaryObjectEx;
-import org.apache.ignite.internal.binary.BinaryUtils;
-import org.apache.ignite.internal.binary.BinaryWriterEx;
+import org.apache.ignite.binary.BinaryObjectBuilder;
+import org.apache.ignite.internal.binary.BinaryContext;
+import org.apache.ignite.internal.util.CommonUtils;
/**
+ * Binary object builders factory.
+ * Implementation loaded via {@link ServiceLoader} mechanism.
*
+ * @see CommonUtils#loadService(Class)
+ * @see BinaryObjectBuilder
*/
-class BinaryPlainBinaryObject implements BinaryLazyValue {
- /** */
- private final BinaryObject binaryObj;
-
+public interface BinaryObjectBuildersFactory {
/**
- * @param binaryObj Binary object.
+ * @param obj Object to convert to builder.
+ * @return Builder instance.
*/
- public BinaryPlainBinaryObject(BinaryObject binaryObj) {
- this.binaryObj = binaryObj;
- }
-
- /** {@inheritDoc} */
- @Override public Object value() {
- return binaryObj;
- }
+ public BinaryObjectBuilder builder(BinaryObject obj);
- /** {@inheritDoc} */
- @Override public void writeTo(BinaryWriterEx writer,
BinaryBuilderSerializer ctx) {
-
writer.writeBinaryObject((BinaryObjectEx)BinaryUtils.unwrapTemporary(binaryObj));
- }
+ /**
+ * @param binaryCtx Binary context.
+ * @param clsName Class name.
+ * @return Builder instance.
+ */
+ public BinaryObjectBuilder builder(BinaryContext binaryCtx, String
clsName);
}
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryAbstractLazyValue.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryAbstractLazyValue.java
similarity index 100%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryAbstractLazyValue.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryAbstractLazyValue.java
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
similarity index 100%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
similarity index 99%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
index 818285c1b83..5a9d80e13d7 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
@@ -37,6 +37,7 @@ import
org.apache.ignite.internal.binary.streams.BinaryStreams;
import org.apache.ignite.internal.util.CommonUtils;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static
org.apache.ignite.internal.binary.builder.BinaryObjectBuildersFactoryImpl.unwrapLazy;
/**
*
@@ -938,7 +939,7 @@ class BinaryBuilderReader implements BinaryPositionReadable
{
/** {@inheritDoc} */
@Override public Object value() {
- return BinaryObjectBuilders.unwrapLazy(wrappedCollection());
+ return unwrapLazy(wrappedCollection());
}
}
}
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializationAware.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializationAware.java
similarity index 100%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializationAware.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializationAware.java
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
similarity index 100%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
similarity index 100%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
similarity index 94%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
index 46f5278d7ae..1e7cdfe4af3 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
@@ -24,6 +24,8 @@ import java.util.List;
import org.apache.ignite.internal.binary.BinaryWriterEx;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
+import static
org.apache.ignite.internal.binary.builder.BinaryObjectBuildersFactoryImpl.unwrapLazy;
+
/**
*
*/
@@ -71,7 +73,7 @@ class BinaryLazyArrayList extends AbstractList<Object>
implements BinaryBuilderS
@Override public Object get(int idx) {
ensureDelegateInit();
- return BinaryObjectBuilders.unwrapLazy(delegate.get(idx));
+ return unwrapLazy(delegate.get(idx));
}
/** {@inheritDoc} */
@@ -92,14 +94,14 @@ class BinaryLazyArrayList extends AbstractList<Object>
implements BinaryBuilderS
@Override public Object set(int idx, Object element) {
ensureDelegateInit();
- return BinaryObjectBuilders.unwrapLazy(delegate.set(idx, element));
+ return unwrapLazy(delegate.set(idx, element));
}
/** {@inheritDoc} */
@Override public Object remove(int idx) {
ensureDelegateInit();
- return BinaryObjectBuilders.unwrapLazy(delegate.remove(idx));
+ return unwrapLazy(delegate.remove(idx));
}
/** {@inheritDoc} */
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyLinkedList.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyLinkedList.java
similarity index 91%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyLinkedList.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyLinkedList.java
index 3418217bd6e..c6b4a7f8531 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyLinkedList.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyLinkedList.java
@@ -26,6 +26,9 @@ import java.util.ListIterator;
import org.apache.ignite.internal.binary.BinaryWriterEx;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
+import static
org.apache.ignite.internal.binary.builder.BinaryObjectBuildersFactoryImpl.unwrapLazy;
+import static
org.apache.ignite.internal.binary.builder.BinaryObjectBuildersFactoryImpl.unwrapLazyIterator;
+
/**
*
*/
@@ -73,7 +76,7 @@ class BinaryLazyLinkedList extends AbstractList<Object>
implements BinaryBuilder
@Override public Object get(int idx) {
ensureDelegateInit();
- return BinaryObjectBuilders.unwrapLazy(delegate.get(idx));
+ return unwrapLazy(delegate.get(idx));
}
/** {@inheritDoc} */
@@ -94,14 +97,14 @@ class BinaryLazyLinkedList extends AbstractList<Object>
implements BinaryBuilder
@Override public Object set(int idx, Object element) {
ensureDelegateInit();
- return BinaryObjectBuilders.unwrapLazy(delegate.set(idx, element));
+ return unwrapLazy(delegate.set(idx, element));
}
/** {@inheritDoc} */
@Override public Object remove(int idx) {
ensureDelegateInit();
- return BinaryObjectBuilders.unwrapLazy(delegate.remove(idx));
+ return unwrapLazy(delegate.remove(idx));
}
/** {@inheritDoc} */
@@ -147,7 +150,7 @@ class BinaryLazyLinkedList extends AbstractList<Object>
implements BinaryBuilder
}
@Override public Object next() {
- return BinaryObjectBuilders.unwrapLazy(delegate.next());
+ return unwrapLazy(delegate.next());
}
@Override public boolean hasPrevious() {
@@ -155,7 +158,7 @@ class BinaryLazyLinkedList extends AbstractList<Object>
implements BinaryBuilder
}
@Override public Object previous() {
- return BinaryObjectBuilders.unwrapLazy(delegate.previous());
+ return unwrapLazy(delegate.previous());
}
@Override public int nextIndex() {
@@ -184,7 +187,7 @@ class BinaryLazyLinkedList extends AbstractList<Object>
implements BinaryBuilder
@Override public Iterator<Object> iterator() {
ensureDelegateInit();
- return BinaryObjectBuilders.unwrapLazyIterator(super.iterator());
+ return unwrapLazyIterator(super.iterator());
}
/** {@inheritDoc} */
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
similarity index 95%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
index 56fee140d9f..4214f10daca 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
@@ -27,6 +27,8 @@ import org.apache.ignite.internal.binary.BinaryWriterEx;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import org.jetbrains.annotations.Nullable;
+import static
org.apache.ignite.internal.binary.builder.BinaryObjectBuildersFactoryImpl.unwrapLazy;
+
/**
*
*/
@@ -80,7 +82,7 @@ class BinaryLazyMap extends AbstractMap<Object, Object>
implements BinaryBuilder
delegate = new LinkedHashMap<>();
for (int i = 0; i < size; i++)
-
delegate.put(BinaryObjectBuilders.unwrapLazy(reader.parseValue()),
reader.parseValue());
+ delegate.put(unwrapLazy(reader.parseValue()),
reader.parseValue());
}
}
@@ -153,21 +155,21 @@ class BinaryLazyMap extends AbstractMap<Object, Object>
implements BinaryBuilder
@Override public Object get(Object key) {
ensureDelegateInit();
- return BinaryObjectBuilders.unwrapLazy(delegate.get(key));
+ return unwrapLazy(delegate.get(key));
}
/** {@inheritDoc} */
@Override public Object put(Object key, Object val) {
ensureDelegateInit();
- return BinaryObjectBuilders.unwrapLazy(delegate.put(key, val));
+ return unwrapLazy(delegate.put(key, val));
}
/** {@inheritDoc} */
@Override public Object remove(Object key) {
ensureDelegateInit();
- return BinaryObjectBuilders.unwrapLazy(delegate.remove(key));
+ return unwrapLazy(delegate.remove(key));
}
/** {@inheritDoc} */
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazySet.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazySet.java
similarity index 94%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazySet.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazySet.java
index 76f557e60cd..d4a1c8c06d9 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazySet.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazySet.java
@@ -23,6 +23,8 @@ import org.apache.ignite.internal.binary.BinaryWriterEx;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import org.apache.ignite.internal.util.CommonUtils;
+import static
org.apache.ignite.internal.binary.builder.BinaryObjectBuildersFactoryImpl.unwrapLazy;
+
/**
*
*/
@@ -84,7 +86,7 @@ class BinaryLazySet extends BinaryAbstractLazyValue {
Set<Object> res = CommonUtils.newLinkedHashSet(size);
for (int i = 0; i < size; i++)
- res.add(BinaryObjectBuilders.unwrapLazy(reader.parseValue()));
+ res.add(unwrapLazy(reader.parseValue()));
return res;
}
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyValue.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyValue.java
similarity index 100%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyValue.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyValue.java
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryModifiableLazyValue.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryModifiableLazyValue.java
similarity index 100%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryModifiableLazyValue.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryModifiableLazyValue.java
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
similarity index 100%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
similarity index 99%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
index 734972ea66c..1993d1b01c1 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
@@ -43,6 +43,8 @@ import org.apache.ignite.marshaller.Marshallers;
import org.apache.ignite.thread.IgniteThread;
import org.jetbrains.annotations.Nullable;
+import static
org.apache.ignite.internal.binary.builder.BinaryObjectBuildersFactoryImpl.unwrapLazy;
+
/**
*
*/
@@ -522,7 +524,7 @@ class BinaryObjectBuilderImpl implements
BinaryObjectBuilderEx {
else
return null;
- return (T)BinaryObjectBuilders.unwrapLazy(val);
+ return (T)unwrapLazy(val);
}
/** {@inheritDoc} */
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilders.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuildersFactoryImpl.java
similarity index 80%
copy from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilders.java
copy to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuildersFactoryImpl.java
index c02f880432e..8b33a76b7b2 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilders.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuildersFactoryImpl.java
@@ -21,26 +21,21 @@ import java.util.Iterator;
import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryObjectBuilder;
import org.apache.ignite.internal.binary.BinaryContext;
+import org.apache.ignite.internal.util.CommonUtils;
import org.jetbrains.annotations.Nullable;
/**
- * Utility class to provide static methods to create {@link
BinaryObjectBuilder}.
+ * Binary object builders factory implementation.
+ * @see CommonUtils#loadService(Class)
*/
-public class BinaryObjectBuilders {
- /**
- * @param obj Object to convert to builder.
- * @return Builder instance.
- */
- public static BinaryObjectBuilder builder(BinaryObject obj) {
+public class BinaryObjectBuildersFactoryImpl implements
BinaryObjectBuildersFactory {
+ /** {@inheritDoc} */
+ @Override public BinaryObjectBuilder builder(BinaryObject obj) {
return BinaryObjectBuilderImpl.wrap(obj);
}
- /**
- * @param binaryCtx Binary context.
- * @param clsName Class name.
- * @return Builder instance.
- */
- public static BinaryObjectBuilder builder(BinaryContext binaryCtx, String
clsName) {
+ /** {@inheritDoc} */
+ @Override public BinaryObjectBuilder builder(BinaryContext binaryCtx,
String clsName) {
return new BinaryObjectBuilderImpl(binaryCtx, clsName);
}
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
similarity index 100%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainLazyValue.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainLazyValue.java
similarity index 100%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainLazyValue.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainLazyValue.java
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryValueWithType.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryValueWithType.java
similarity index 100%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/builder/BinaryValueWithType.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryValueWithType.java
diff --git
a/modules/binary/impl/src/main/resources/META-INF/services/org.apache.ignite.internal.binary.builder.BinaryObjectBuildersFactory
b/modules/binary/impl/src/main/resources/META-INF/services/org.apache.ignite.internal.binary.builder.BinaryObjectBuildersFactory
new file mode 100644
index 00000000000..253eacc0f17
--- /dev/null
+++
b/modules/binary/impl/src/main/resources/META-INF/services/org.apache.ignite.internal.binary.builder.BinaryObjectBuildersFactory
@@ -0,0 +1 @@
+org.apache.ignite.internal.binary.builder.BinaryObjectBuildersFactoryImpl
\ No newline at end of file
