Skip to content

Commit

Permalink
Merge branch 'master' into release/5.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
zdenek-jonas committed Jul 15, 2021
2 parents 2dbe1ae + c801597 commit a7080cc
Show file tree
Hide file tree
Showing 60 changed files with 133 additions and 67 deletions.
3 changes: 3 additions & 0 deletions afs/afs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@

<artifactId>microstream-afs</artifactId>

<name>MicroStream Abstract File System</name>
<description>Abstract File System Implementation</description>

<dependencies>
<dependency>
<groupId>one.microstream</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ public default boolean exists()

/**
* Removes all child items ({@link ADirectory} or {@link AFile}) that have no physical equivalent.
* @return
*/
public int consolidate();

Expand Down
5 changes: 0 additions & 5 deletions afs/afs/src/main/java/one/microstream/afs/types/AItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,9 @@ public interface AItem

/**
* The value that uniquely identifies the item locally in its {@link #parent()} directory.
* <p>
* Note that this value might be a combination of {@link #name()} and {@link #type()},
* but such a relation is not mandatory.
*
* @see #parent()
* @see #toPathString()
* @see #name()
* @see #type()
*
* @return the item's locally unique identifier.
*/
Expand Down
1 change: 0 additions & 1 deletion afs/afs/src/main/java/one/microstream/afs/types/ARoot.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ public default String protocol()
* @param protocol
* @param identifier
*
* @return
*/
public static ARoot New(
final AFileSystem fileSystem,
Expand Down
5 changes: 4 additions & 1 deletion afs/nio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
</parent>

<artifactId>microstream-afs-nio</artifactId>


<name>MicroStream Abstract File System - Java NIO</name>
<description>Java NIO Adapter for the MicroStream Abstract File System</description>

<dependencies>
<dependency>
<groupId>one.microstream</groupId>
Expand Down
3 changes: 3 additions & 0 deletions afs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@

<artifactId>microstream-afs-parent</artifactId>
<packaging>pom</packaging>

<name>MicroStream Abstract File System</name>
<description>File System Abstraction Project</description>

<modules>
<module>afs</module>
Expand Down
3 changes: 3 additions & 0 deletions afs/sql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@

<artifactId>microstream-afs-sql</artifactId>

<name>MicroStream Abstract File System - SQL</name>
<description>SQL Adapter for the MicroStream Abstract File System</description>

<dependencies>
<dependency>
<groupId>one.microstream</groupId>
Expand Down
3 changes: 3 additions & 0 deletions base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@
</parent>

<artifactId>microstream-base</artifactId>

<name>MicroStream Base</name>
<description>Commons Module of the MicroStream Framework</description>

</project>
1 change: 0 additions & 1 deletion base/src/main/java/one/microstream/X.java
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,6 @@ public static <T> WeakReference<T>[] WeakReferences(final T... referents)
*
* @param <T>
* @param array
* @return
*/
public static <T> WeakReference<T>[] consolidateWeakReferences(final WeakReference<T>[] array)
{
Expand Down
6 changes: 3 additions & 3 deletions base/src/main/java/one/microstream/chars/XChars.java
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public static final boolean isNonWhitespace(final char c)
* Arbitrary threshold of 1000 to discrimate "short" strings from "long" strings.<br>
* The rationale behind that is that "short" strings usually allow for simpler and faster algorithms,
* which become inefficient on larger strings. For example a two-pass processing of a splitting algorithm.
* @return
* @return 1000
*/
public static final int shortStringLength()
{
Expand Down Expand Up @@ -253,8 +253,8 @@ public static final Charset standardCharset()

/**
* Alias for {@link Charset#defaultCharset()}, which returns sometimes the one thing and sometimes another.
* It is strongly advised to use a reliable {@link Charset} querying method, like {@link utf8}, which also
* is the only reasonable choice for the {@link standardCharset}.
* It is strongly advised to use a reliable {@link Charset} querying method, like UTF-8, which also
* is the only reasonable choice for the standard charset.
*
* @return {@link Charset#defaultCharset()}
*/
Expand Down
10 changes: 5 additions & 5 deletions base/src/main/java/one/microstream/collections/BulkList.java
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ public static final <E> BulkList<E> NewFromSingle(final E initialElement)
* Pseudo-constructor method to create a new {@link BulkList} instance containing all elements of the passed
* array. The element size of the new instance will be equal to the passed arrays length.
*
* @param elements the initial elements for the new instance.
* @param initialElements the initial elements for the new instance.
* @return a new {@link BulkList} instance.
* @throws NullPointerException if an explicit {@code null} array reference was passed.
*/
Expand All @@ -193,7 +193,7 @@ public static final <E> BulkList<E> New(final E... initialElements)
/**
* Pseudo-constructor method to create a new {@link BulkList} instance and adds all the given elements to it.
*
* @param elements to add to the created instance
* @param initialElements to add to the created instance
* @return a new {@link BulkList} instance.
*/
public static final <E> BulkList<E> New(final XIterable<? extends E> initialElements)
Expand All @@ -206,7 +206,7 @@ public static final <E> BulkList<E> New(final XIterable<? extends E> initialElem
/**
* Pseudo-constructor method to create a new {@link BulkList} instance and adds all the given elements to it.
*
* @param elements to add to the created instance
* @param initialElements to add to the created instance
* @return a new {@link BulkList} instance.
*/
public static final <E> BulkList<E> New(final Iterable<? extends E> initialElements)
Expand All @@ -220,7 +220,7 @@ public static final <E> BulkList<E> New(final Iterable<? extends E> initialEleme
* Pseudo-constructor method to create a new {@link BulkList} instance with the needed amount of capacity and adds all
* elements to it.
*
* @param elements to add to the created instance
* @param initialElements to add to the created instance
* @return a new {@link BulkList} instance.
*/
public static final <E> BulkList<E> New(final XGettingCollection<? extends E> initialElements)
Expand Down Expand Up @@ -784,7 +784,7 @@ public final <P extends Consumer<? super E>> P iterate(final P procedure)

/**
* {@inheritDoc}
* @see {@link AbstractArrayStorage#join}
* @see AbstractArrayStorage#join(Object[], int, BiConsumer, Object)
*/
@Override
public final <A> A join(final BiConsumer<? super E, ? super A> joiner, final A aggregate)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,8 @@ public final <P extends IndexedAcceptor<? super E>> P iterateIndexed(final P pro

/**
* {@inheritDoc}
* @see {@link AbstractArrayStorage#join}
*
* @see AbstractArrayStorage#join(Object[], int, BiConsumer, Object)
*/
@Override
public final <A> A join(final BiConsumer<? super E, ? super A> joiner, final A aggregate)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@

import java.util.function.BiConsumer;

/**
*
* @param <E> type of data to join
*/
public interface XJoinable<E>
{
/**
Expand All @@ -30,7 +34,6 @@ public interface XJoinable<E>
*
* @param joiner is the actual function to do the joining
* @param aggregate where to join into
* @param <E> type of data to join
* @param <A> type of aggregate
*/
public <A> A join(BiConsumer<? super E, ? super A> joiner, A aggregate);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,6 @@ public E remove()
*
* @return {@code null}.
* @see #get()
* @see #addForCurrentThread(Object)
*/
protected E lookupMissFallbackElement()
{
Expand Down
9 changes: 1 addition & 8 deletions base/src/main/java/one/microstream/io/XIO.java
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,6 @@ public static <C extends Consumer<? super Path>> C listEntries(
* @param <C>
* @param directory
* @param logic
* @return
* @throws IOException
*/
public static <C extends Consumer<? super Path>> C iterateEntries(
Expand All @@ -506,7 +505,6 @@ public static <C extends Consumer<? super Path>> C iterateEntries(
* @param directory
* @param logic
* @param selector
* @return
* @throws IOException
*/
public static <C extends Consumer<? super Path>> C iterateEntries(
Expand Down Expand Up @@ -674,7 +672,6 @@ public static final <T> T readOneShot(final Path file, final IoOperationSR<FileC
* strings right away?
*
* @param filePath
* @return
* @throws IOException
*/
public static String readString(final String filePath)
Expand All @@ -693,7 +690,6 @@ public static String readString(final String filePath)
*
* @param filePath
* @param charSet
* @return
* @throws IOException
*/
public static String readString(final String filePath, final Charset charSet)
Expand Down Expand Up @@ -1308,7 +1304,7 @@ public static long copyFile(
* @throws IOException as specified by {@link FileChannel#transferFrom(java.nio.channels.ReadableByteChannel, long, long)}
*
* @see FileChannel#transferFrom(java.nio.channels.ReadableByteChannel, long, long)
* @see #copyFile(Path, Path)
* @see #copyFile(Path, Path, OpenOption...)
*/
public static long copyFile(
final FileChannel sourceChannel,
Expand All @@ -1324,7 +1320,6 @@ public static long copyFile(
* @param sourceChannel
* @param targetChannel
* @param targetPosition
* @return
* @throws IOException
*/
public static long copyFile(
Expand Down Expand Up @@ -1578,7 +1573,6 @@ public static final <C extends Consumer<? super Path>> C listEntries(
* @param <C>
* @param directory
* @param logic
* @return
* @throws IORuntimeException
*/
public static <C extends Consumer<? super Path>> C iterateEntries(
Expand Down Expand Up @@ -1606,7 +1600,6 @@ public static <C extends Consumer<? super Path>> C iterateEntries(
* @param directory
* @param logic
* @param selector
* @return
* @throws IORuntimeException
*/
public static <C extends Consumer<? super Path>> C iterateEntries(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@ public default byte[] asByteArray(final long value)
*
* @param objectClass
* @param field
* @return
*/
public long objectFieldOffset(Class<?> objectClass, Field field);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ public default <T extends S> T copyTo(final T targetInstance)

/**
* Does not necessarily have to be S. S could be an interface.
* @return
*/
public Class<?> sourceClass();

Expand Down
5 changes: 0 additions & 5 deletions base/src/main/java/one/microstream/reflect/XReflect.java
Original file line number Diff line number Diff line change
Expand Up @@ -802,8 +802,6 @@ public static final Class<?> resolveType(final String typeName, final ClassLoade
*
* @param typeName
*
* @return
*
* @throws LinkageError
* @throws ExceptionInInitializerError
* @throws ClassNotFoundException
Expand Down Expand Up @@ -935,7 +933,6 @@ public static final ClassLoader defaultTypeResolvingClassLoader()
* Make sure this is a suitable {@link ClassLoader} when using this method.
*
* @param typeName
* @return
*/
public static final Class<?> resolveType(final String typeName)
throws LinkageError, ExceptionInInitializerError, ClassNotFoundException
Expand All @@ -948,7 +945,6 @@ public static final Class<?> resolveType(final String typeName)
* Make sure this is a suitable {@link ClassLoader} when using this method.
*
* @param className
* @return
*/
public static final Class<?> tryResolveType(final String className)
{
Expand All @@ -960,7 +956,6 @@ public static final Class<?> tryResolveType(final String className)
* Make sure this is a suitable {@link ClassLoader} when using this method.
*
* @param typeNames
* @return
*/
public static final Class<?> iterativeResolveType(final String... typeNames)
throws ClassNotFoundException
Expand Down
1 change: 0 additions & 1 deletion base/src/main/java/one/microstream/util/BundleInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ public static BundleInfo LoadBase()
/**
*
* @param bundleName the name of the bundle, in Maven environments the artifact id
* @return
*/
public static BundleInfo Load(final String bundleName)
{
Expand Down
3 changes: 3 additions & 0 deletions cache/cache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
</parent>

<artifactId>microstream-cache</artifactId>

<name>MicroStream Cache</name>
<description>JSR-107 (JCache) Implementation</description>

<dependencies>
<dependency>
Expand Down
3 changes: 3 additions & 0 deletions cache/hibernate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@

<artifactId>microstream-cache-hibernate</artifactId>

<name>MicroStream Cache for Hibernate</name>
<description>Hibernate Cache Region Factory</description>

<dependencies>
<dependency>
<groupId>one.microstream</groupId>
Expand Down
3 changes: 3 additions & 0 deletions cache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@

<artifactId>microstream-cache-parent</artifactId>
<packaging>pom</packaging>

<name>MicroStream Cache</name>
<description>MicroStream Cache Project</description>

<modules>
<module>cache</module>
Expand Down
3 changes: 3 additions & 0 deletions communication/binary/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@

<artifactId>microstream-communication-binary</artifactId>

<name>MicroStream Communication Binary</name>
<description>MicroStream Object Graph Communication Binary Implementation</description>

<dependencies>
<dependency>
<groupId>one.microstream</groupId>
Expand Down
3 changes: 3 additions & 0 deletions communication/communication/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@

<artifactId>microstream-communication</artifactId>

<name>MicroStream Communication</name>
<description>MicroStream Object Graph Communication</description>

<dependencies>
<dependency>
<groupId>one.microstream</groupId>
Expand Down
3 changes: 3 additions & 0 deletions communication/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@

<artifactId>microstream-communication-parent</artifactId>
<packaging>pom</packaging>

<name>MicroStream Communication</name>
<description>MicroStream Communication Project</description>

<modules>
<module>communication</module>
Expand Down
3 changes: 3 additions & 0 deletions configuration/configuration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
</parent>

<artifactId>microstream-configuration</artifactId>

<name>MicroStream Configuration</name>
<description>MicroStream General Purpose Configuration</description>

<dependencies>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ private ByteUnit(
* Returns the number of bytes, which this unit multiplied by <code>value</code> yield
*
* @param value
* @return
*/
public long toBytes(
final double value
Expand Down
Loading

0 comments on commit a7080cc

Please sign in to comment.