Skip to content

Update auf eclipsestore #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 17, 2024
Merged

Update auf eclipsestore #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f75f49
Update auf Eclipse Store
AM-Xdev Apr 17, 2024
d844eec
Merge branch 'develop' into update-auf-eclipsestore
AM-Xdev Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 0 additions & 56 deletions LICENSE.adoc
View file
Open in desktop

This file was deleted.

68 changes: 0 additions & 68 deletions README.adoc
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions java.telegrambots.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
40 changes: 14 additions & 26 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down
18 changes: 4 additions & 14 deletions src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArticles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUsers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down