Merge pull request #33 from AMeierDev/develop

eclipsetore

Author: AMeierDev

LICENSE.adoc

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="SonarLintModuleSettings">
+    <option name="uniqueId" value="b7a78b3e-e7ba-42fa-9bfc-3db3c55c6e5c" />
+  </component>
+</module>

README.adoc

@@ -13,6 +13,7 @@
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
 		<telegram.bot.version>6.4.0</telegram.bot.version>
+		<eclipse.store.version>1.3.1</eclipse.store.version>
 		<microstream.version>08.01.01-MS-GA</microstream.version>
 	</properties>
 
@@ -35,62 +36,49 @@
 			<version>${telegram.bot.version}</version>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/one.microstream/microstream-storage-embedded -->
-		<dependency>
-			<groupId>one.microstream</groupId>
-			<artifactId>microstream-storage-embedded</artifactId>
-			<version>${microstream.version}</version>
-		</dependency>
-		<!-- https://mvnrepository.com/artifact/one.microstream/microstream-storage-embedded-configuration -->
-		<dependency>
-			<groupId>one.microstream</groupId>
-			<artifactId>microstream-storage-embedded-configuration</artifactId>
-			<version>${microstream.version}</version>
-		</dependency>
+
+
+
 		<dependency>
-			<groupId>one.microstream</groupId>
-			<artifactId>microstream-persistence-binary-jdk17</artifactId>
-			<version>${microstream.version}</version>
+				<groupId>org.eclipse.store</groupId>
+				<artifactId>storage-embedded</artifactId>
+				<version>${eclipse.store.version}</version>
 		</dependency>
+
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.11</version>
+			<version>3.14.0</version>
 		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>net.sourceforge.htmlunit</groupId> -->
-		<!-- <artifactId>htmlunit</artifactId> -->
-		<!-- <version>2.37.0</version> -->
-		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>2.28.2</version>
+			<version>5.11.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.30</version>
+			<version>2.0.13</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.30</version>
+			<version>2.0.13</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
-			<version>2.17.2</version>
+			<version>2.23.1</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
 		<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.17.2</version>
+			<version>2.23.1</version>
 		</dependency>
 
 		<dependency>

java.telegrambots.iml

@@ -3,10 +3,9 @@
 import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotOrder;
 import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotRoot;
 import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotUser;
-import one.microstream.persistence.binary.jdk17.types.BinaryHandlersJDK17;
-import one.microstream.storage.embedded.configuration.types.EmbeddedStorageConfiguration;
-import one.microstream.storage.embedded.types.EmbeddedStorageFoundation;
-import one.microstream.storage.embedded.types.EmbeddedStorageManager;
+
+import org.eclipse.store.storage.embedded.types.EmbeddedStorage;
+import org.eclipse.store.storage.embedded.types.EmbeddedStorageManager;
 
 import java.nio.file.Paths;
 import java.time.LocalDate;
@@ -36,16 +35,7 @@ public HertlBotRootDao()
 
 	private static EmbeddedStorageManager createStorageManager()
 	{
-		final EmbeddedStorageFoundation<?> foundation = EmbeddedStorageConfiguration.Builder()
-				.setStorageDirectory(Paths.get("data", "microstream", "storage").toString())
-				.setChannelCount(Math.max(
-						1, // minimum one channel, if only 1 core is available
-						Integer.highestOneBit(Runtime.getRuntime().availableProcessors() - 1)
-				))
-				.createEmbeddedStorageFoundation();
-
-		foundation.onConnectionFoundation(BinaryHandlersJDK17::registerJDK17TypeHandlers);
-		final EmbeddedStorageManager storageManager = foundation.createEmbeddedStorageManager().start();
+		final EmbeddedStorageManager storageManager = EmbeddedStorage.start(Paths.get("data", "eclipsestore", "storage"));
 
 		if (storageManager.root() == null)
 		{

pom.xml

@@ -9,7 +9,7 @@
 import java.util.stream.Collectors;
 
 import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao;
-import one.microstream.persistence.types.Persister;
+import org.eclipse.serializer.persistence.types.Persister;
 
 public class HertlBotArticles {
 

src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java

@@ -9,7 +9,8 @@
 import java.util.List;
 
 import de.bigamgamen.java.helper.Pricehelper;
-import one.microstream.persistence.types.Persister;
+import org.eclipse.serializer.persistence.types.Persister;
+
 
 public class HertlBotOrder {
 

src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArticles.java

@@ -1,9 +1,10 @@
 package de.bigamgamen.java.telegrambots.hertlhendl.domain;
 
+import org.eclipse.serializer.persistence.types.Persister;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import one.microstream.persistence.types.Persister;
 
 public class HertlBotUser {
 

src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java

@@ -11,7 +11,7 @@
 import java.util.Optional;
 
 import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao;
-import one.microstream.persistence.types.Persister;
+import org.eclipse.serializer.persistence.types.Persister;
 
 public class HertlBotUsers {