Consolidate Utilities (#15)

afs/blobstore/src/main/java/org/eclipse/store/afs/blobstore/types/BlobStoreFileSystem.java

@@ -29,8 +29,8 @@
 import org.eclipse.serializer.afs.types.AReadableFile;
 import org.eclipse.serializer.afs.types.AResolver;
 import org.eclipse.serializer.afs.types.AWritableFile;
-import org.eclipse.serializer.chars.CharsUtils;
 import org.eclipse.serializer.chars.VarString;
+import org.eclipse.serializer.chars.XChars;
 import org.eclipse.serializer.io.XIO;
 
 
@@ -179,7 +179,7 @@ protected VarString assembleItemPath(
 			final VarString vs
 		)
 		{
-			return CharsUtils.assembleSeparated(
+			return XChars.assembleSeparated(
 				vs,
 				BlobStorePath.SEPARATOR_CHAR,
 				item.toPath()

afs/blobstore/src/main/java/org/eclipse/store/afs/blobstore/types/BlobStorePath.java

@@ -24,8 +24,8 @@
 
 import java.util.Arrays;
 
-import org.eclipse.serializer.chars.CharsUtils;
-import org.eclipse.serializer.collections.ArraysUtils;
+import org.eclipse.serializer.chars.XChars;
+import org.eclipse.serializer.collections.XArrays;
 
 
 public interface BlobStorePath
@@ -61,7 +61,7 @@ public static String[] splitPath(
 		final String fullQualifiedPath
 	)
 	{
-		return CharsUtils.splitSimple(fullQualifiedPath, SEPARATOR);
+		return XChars.splitSimple(fullQualifiedPath, SEPARATOR);
 	}
 
 	public static BlobStorePath New(
@@ -136,7 +136,7 @@ public BlobStorePath parentPath()
 		{
 			return this.pathElements.length > 1
 				? new BlobStorePath.Default(
-					ArraysUtils.copyRange(this.pathElements, 0, this.pathElements.length - 1)
+					XArrays.copyRange(this.pathElements, 0, this.pathElements.length - 1)
 				)
 				: null;
 		}

afs/sql/src/main/java/org/eclipse/store/afs/sql/types/SqlFileSystem.java

@@ -29,8 +29,8 @@
 import org.eclipse.serializer.afs.types.AReadableFile;
 import org.eclipse.serializer.afs.types.AResolver;
 import org.eclipse.serializer.afs.types.AWritableFile;
-import org.eclipse.serializer.chars.CharsUtils;
 import org.eclipse.serializer.chars.VarString;
+import org.eclipse.serializer.chars.XChars;
 import org.eclipse.serializer.io.XIO;
 
 
@@ -183,7 +183,7 @@ protected VarString assembleItemPath(
 			final VarString vs
 		)
 		{
-			return CharsUtils.assembleSeparated(
+			return XChars.assembleSeparated(
 				vs,
 				SqlPath.DIRECTORY_TABLE_NAME_SEPARATOR_CHAR,
 				item.toPath()

afs/sql/src/main/java/org/eclipse/store/afs/sql/types/SqlPath.java

@@ -25,8 +25,8 @@
 
 import java.util.Arrays;
 
-import org.eclipse.serializer.chars.CharsUtils;
-import org.eclipse.serializer.collections.ArraysUtils;
+import org.eclipse.serializer.chars.XChars;
+import org.eclipse.serializer.collections.XArrays;
 
 
 public interface SqlPath
@@ -47,7 +47,7 @@ public static String[] splitPath(
 		final String fullQualifiedPath
 	)
 	{
-		return CharsUtils.splitSimple(fullQualifiedPath, DIRECTORY_TABLE_NAME_SEPARATOR);
+		return XChars.splitSimple(fullQualifiedPath, DIRECTORY_TABLE_NAME_SEPARATOR);
 	}
 
 	public static SqlPath New(
@@ -104,7 +104,7 @@ public SqlPath parentPath()
 		{
 			return this.pathElements.length > 1
 				? new SqlPath.Default(
-					ArraysUtils.copyRange(this.pathElements, 0, this.pathElements.length - 1)
+					XArrays.copyRange(this.pathElements, 0, this.pathElements.length - 1)
 				)
 				: null;
 		}

configuration/configuration/src/main/java/org/eclipse/store/configuration/types/ConfigurationLoader.java

@@ -34,7 +34,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import org.eclipse.serializer.chars.CharsUtils;
+import org.eclipse.serializer.chars.XChars;
 import org.eclipse.serializer.exceptions.IORuntimeException;
 import org.eclipse.serializer.util.logging.Logging;
 import org.eclipse.store.configuration.exceptions.ConfigurationException;
@@ -319,7 +319,7 @@ public String loadConfiguration()
 
 			try
 			{
-				return CharsUtils.readStringFromInputStream(this.inputStream, this.charset);
+				return XChars.readStringFromInputStream(this.inputStream, this.charset);
 			}
 			catch(final IOException e)
 			{
@@ -357,7 +357,7 @@ public String loadConfiguration()
 
 			try(InputStream in = this.url.openStream())
 			{
-				return CharsUtils.readStringFromInputStream(in, this.charset);
+				return XChars.readStringFromInputStream(in, this.charset);
 			}
 			catch(final IOException e)
 			{
@@ -395,7 +395,7 @@ public String loadConfiguration()
 
 			try(InputStream in = Files.newInputStream(this.path))
 			{
-				return CharsUtils.readStringFromInputStream(in, this.charset);
+				return XChars.readStringFromInputStream(in, this.charset);
 			}
 			catch(final IOException e)
 			{
@@ -433,7 +433,7 @@ public String loadConfiguration()
 
 			try(InputStream in = new FileInputStream(this.file))
 			{
-				return CharsUtils.readStringFromInputStream(in, this.charset);
+				return XChars.readStringFromInputStream(in, this.charset);
 			}
 			catch(final IOException e)
 			{

storage/storage/src/main/java/org/eclipse/store/storage/types/StorageChannelCountProvider.java

@@ -1,27 +1,7 @@
 package org.eclipse.store.storage.types;
 
-/*-
- * #%L
- * Eclipse Store Storage
- * %%
- * Copyright (C) 2023 Eclipse Foundation
- * %%
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- * 
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License, v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is
- * available at https://www.gnu.org/software/classpath/license.html.
- * 
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- * #L%
- */
-
-import org.eclipse.serializer.chars.CharsUtils;
 import org.eclipse.serializer.chars.VarString;
+import org.eclipse.serializer.chars.XChars;
 import org.eclipse.serializer.math.XMath;
 import org.eclipse.serializer.persistence.binary.types.BinaryChannelCountProvider;
 
@@ -97,7 +77,7 @@ public static void validateParameters(
 				throw new IllegalArgumentException(
 					"Specified channel count " + channelCount
 					+ " is not in the range of valid channel counts: "
-					+ CharsUtils.mathRangeIncInc(minimumChannelCount(), maximumChannelCount())
+					+ XChars.mathRangeIncInc(minimumChannelCount(), maximumChannelCount())
 					+ "."
 				);
 			}

storage/storage/src/main/java/org/eclipse/store/storage/types/StorageDataConverterTypeCsvToBinary.java

@@ -25,12 +25,9 @@
 import java.nio.ByteBuffer;
 import java.util.Iterator;
 
-import org.eclipse.store.afs.base.AFSUtils;
-import org.eclipse.store.storage.exceptions.StorageException;
 import org.eclipse.serializer.afs.types.AFS;
 import org.eclipse.serializer.afs.types.AFile;
 import org.eclipse.serializer.afs.types.AWritableFile;
-import org.eclipse.serializer.chars.CharsUtils;
 import org.eclipse.serializer.chars.EscapeHandler;
 import org.eclipse.serializer.chars.VarString;
 import org.eclipse.serializer.chars.XChars;
@@ -53,6 +50,8 @@
 import org.eclipse.serializer.util.xcsv.XCsvRecordParserCharArray;
 import org.eclipse.serializer.util.xcsv.XCsvRowCollector;
 import org.eclipse.serializer.util.xcsv.XCsvSegmentsParser;
+import org.eclipse.store.afs.base.AFSUtils;
+import org.eclipse.store.storage.exceptions.StorageException;
 
 
 public interface StorageDataConverterTypeCsvToBinary<S>
@@ -295,7 +294,7 @@ final int parse_byte(
 			{
 				j--;
 			}
-			this.write_byte(CharsUtils.parse_byteDecimal(data, offset, j - offset + 1));
+			this.write_byte(XChars.parse_byteDecimal(data, offset, j - offset + 1));
 			return i;
 		}
 
@@ -320,14 +319,14 @@ final int parse_boolean(
 
 			final int literalLength = j - offset + 1;
 			if(literalLength == this.literalTrue.length
-			&& CharsUtils.equals(data, offset, this.literalTrue, 0, this.literalTrue.length)
+			&& XChars.equals(data, offset, this.literalTrue, 0, this.literalTrue.length)
 			)
 			{
 				this.write_boolean(true);
 				return i;
 			}
 			if(literalLength == this.literalFalse.length
-			&& CharsUtils.equals(data, offset, this.literalFalse, 0, this.literalFalse.length)
+			&& XChars.equals(data, offset, this.literalFalse, 0, this.literalFalse.length)
 			)
 			{
 				this.write_boolean(false);
@@ -355,7 +354,7 @@ final int parse_short(
 			{
 				j--;
 			}
-			this.write_short(CharsUtils.parse_shortDecimal(data, offset, j - offset + 1));
+			this.write_short(XChars.parse_shortDecimal(data, offset, j - offset + 1));
 			return i;
 		}
 
@@ -441,7 +440,7 @@ final int parse_int(
 			{
 				j--;
 			}
-			this.write_int(CharsUtils.parse_intLiteral(data, offset, j - offset + 1));
+			this.write_int(XChars.parse_intLiteral(data, offset, j - offset + 1));
 			return i;
 		}
 
@@ -463,7 +462,7 @@ final int parse_float(
 			{
 				j--;
 			}
-			this.write_float(CharsUtils.parse_float(data, offset, j - offset + 1));
+			this.write_float(XChars.parse_float(data, offset, j - offset + 1));
 			return i;
 		}
 
@@ -485,7 +484,7 @@ final int parse_long(
 			{
 				j--;
 			}
-			this.write_long(CharsUtils.parse_longDecimal(data, offset, j - offset + 1));
+			this.write_long(XChars.parse_longDecimal(data, offset, j - offset + 1));
 			return i;
 		}
 
@@ -507,7 +506,7 @@ final int parse_double(
 			{
 				j--;
 			}
-			this.write_double(CharsUtils.parse_double(data, offset, j - offset + 1));
+			this.write_double(XChars.parse_double(data, offset, j - offset + 1));
 			return i;
 		}
 
@@ -649,7 +648,7 @@ final int parseArray_byte(
 				// parse literal
 				final int currentElementStart = i;
 				i = seekSimpleLiteralEnd(data, i, bound, listSeparator, listTerminator);
-				this.write_byte(CharsUtils.parse_byteDecimal(data, currentElementStart, i - currentElementStart));
+				this.write_byte(XChars.parse_byteDecimal(data, currentElementStart, i - currentElementStart));
 
 				// find literal terminating character (not the same as literal end: there might be white spaces)
 				i = seekListElementCompletion(data, i, bound, listSeparator, listTerminator);
@@ -697,12 +696,12 @@ final int parseArray_boolean(
 				i = seekSimpleLiteralEnd(data, i, bound, listSeparator, listTerminator);
 
 				// parse literal. A little more complex for boolean literals.
-				if(i - elementStart == lengthTrue && CharsUtils.equals(data, elementStart, literalTrue, 0, lengthTrue))
+				if(i - elementStart == lengthTrue && XChars.equals(data, elementStart, literalTrue, 0, lengthTrue))
 				{
 					this.write_boolean(true);
 				}
 				else if(i - elementStart == lengthFalse
-					&& CharsUtils.equals(data, elementStart, literalFalse, 0, lengthFalse)
+					&& XChars.equals(data, elementStart, literalFalse, 0, lengthFalse)
 				)
 				{
 					this.write_boolean(false);
@@ -753,7 +752,7 @@ final int parseArray_short(
 				// parse literal
 				final int currentElementStart = i;
 				i = seekSimpleLiteralEnd(data, i, bound, listSeparator, listTerminator);
-				this.write_short(CharsUtils.parse_shortDecimal(data, currentElementStart, i - currentElementStart));
+				this.write_short(XChars.parse_shortDecimal(data, currentElementStart, i - currentElementStart));
 
 				// find literal terminating character (not the same as literal end: there might be white spaces)
 				i = seekListElementCompletion(data, i, bound, listSeparator, listTerminator);
@@ -791,7 +790,7 @@ final int parseArray_int(
 				// parse literal
 				final int currentElementStart = i;
 				i = seekSimpleLiteralEnd(data, i, bound, listSeparator, listTerminator);
-				this.write_int(CharsUtils.parse_intLiteral(data, currentElementStart, i - currentElementStart));
+				this.write_int(XChars.parse_intLiteral(data, currentElementStart, i - currentElementStart));
 
 				// find literal terminating character (not the same as literal end: there might be white spaces)
 				i = seekListElementCompletion(data, i, bound, listSeparator, listTerminator);
@@ -829,7 +828,7 @@ final int parseArray_float(
 				// parse literal
 				final int currentElementStart = i;
 				i = seekSimpleLiteralEnd(data, i, bound, listSeparator, listTerminator);
-				this.write_float(CharsUtils.parse_float(data, currentElementStart, i - currentElementStart));
+				this.write_float(XChars.parse_float(data, currentElementStart, i - currentElementStart));
 
 				// find literal terminating character (not the same as literal end: there might be white spaces)
 				i = seekListElementCompletion(data, i, bound, listSeparator, listTerminator);
@@ -867,7 +866,7 @@ final int parseArray_long(
 				// parse literal
 				final int currentElementStart = i;
 				i = seekSimpleLiteralEnd(data, i, bound, listSeparator, listTerminator);
-				this.write_long(CharsUtils.parse_longDecimal(data, currentElementStart, i - currentElementStart));
+				this.write_long(XChars.parse_longDecimal(data, currentElementStart, i - currentElementStart));
 
 				// find literal terminating character (not the same as literal end: there might be white spaces)
 				i = seekListElementCompletion(data, i, bound, listSeparator, listTerminator);
@@ -905,7 +904,7 @@ final int parseArray_double(
 				// parse literal
 				final int currentElementStart = i;
 				i = seekSimpleLiteralEnd(data, i, bound, listSeparator, listTerminator);
-				this.write_double(CharsUtils.parse_double(data, currentElementStart, i - currentElementStart));
+				this.write_double(XChars.parse_double(data, currentElementStart, i - currentElementStart));
 
 				// find literal terminating character (not the same as literal end: there might be white spaces)
 				i = seekListElementCompletion(data, i, bound, listSeparator, listTerminator);

storage/storage/src/main/java/org/eclipse/store/storage/types/StorageEntityTypeExportStatistics.java

@@ -21,8 +21,8 @@
  */
 
 import org.eclipse.serializer.afs.types.AFile;
-import org.eclipse.serializer.chars.CharsUtils;
 import org.eclipse.serializer.chars.VarString;
+import org.eclipse.serializer.chars.XChars;
 import org.eclipse.serializer.collections.EqConstHashTable;
 import org.eclipse.serializer.collections.EqHashTable;
 import org.eclipse.serializer.collections.types.XGettingTable;
@@ -70,7 +70,7 @@ public final class Default extends AbstractStatistic implements StorageEntityTyp
 
 		public static final void assembleTableHeader(final VarString vs)
 		{
-			CharsUtils.assembleNewLinedTabbed(vs, TABLE_COLUMN_NAMES);
+			XChars.assembleNewLinedTabbed(vs, TABLE_COLUMN_NAMES);
 		}
 
 

storage/storage/src/main/java/org/eclipse/store/storage/types/StorageLiveFile.java

@@ -23,7 +23,6 @@
 import java.util.function.Consumer;
 
 import org.eclipse.serializer.afs.types.AFile;
-import org.eclipse.serializer.collections.ArraysUtils;
 import org.eclipse.serializer.collections.XArrays;
 
 
@@ -175,7 +174,7 @@ public final synchronized boolean clearUsages(final StorageFileUser fileUser)
 			{
 				if(this.usages[i].user == fileUser)
 				{
-					ArraysUtils.removeFromIndex(this.usages, this.usagesSize--, i);
+					XArrays.removeFromIndex(this.usages, this.usagesSize--, i);
 					this.checkForUsagesArrayClearing();
 
 					return true;
@@ -195,7 +194,7 @@ public final synchronized boolean unregisterUsage(final StorageFileUser fileUser
 				{
 					if(this.usages[i].decrement())
 					{
-						ArraysUtils.removeFromIndex(this.usages, this.usagesSize--, i);
+						XArrays.removeFromIndex(this.usages, this.usagesSize--, i);
 						this.checkForUsagesArrayClearing();
 
 						return true;