dasdasd

.github/workflows/build_java.yml

@@ -21,12 +21,12 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
         with:
-          java-version: '11'
-          distribution: 'adopt'
+          java-version: '21'
+          distribution: 'temurin'
       - name: Build with Maven
         run: mvn clean package

.github/workflows/build_java_docker.yml

@@ -9,6 +9,7 @@ on:
     branches:
       - main
       - staging
+      - develop
 
 
   # Allows you to run this workflow manually from the Actions tab
@@ -24,17 +25,17 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
-          distribution: 'adopt'
+          java-version: '21'
+          distribution: 'temurin'
       - name: Build with Maven
         run: mvn clean package
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
          name: java.telegrambots.jar
          path: target/
@@ -47,14 +48,14 @@ jobs:
     steps:
     - name: Git branch name
       id: git-branch-name
-      uses: EthanSK/git-branch-name-action@v2
+      uses: EthanSK/git-branch-name-action@v1
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4.1.7
       with:
           name: java.telegrambots.jar
           path: target/
@@ -64,7 +65,7 @@ jobs:
       uses: docker/setup-qemu-action@v2
       with:
         image: tonistiigi/binfmt:latest
-        platforms: linux/amd64,linux/arm64,linux/arm/v7
+        platforms: linux/amd64,linux/arm64
     -
         name: Inspect builder
         run: |
@@ -89,7 +90,7 @@ jobs:
       with:
         context: ./
         file: ./Dockerfile
-        platforms: linux/amd64,linux/arm64,linux/arm/v7
+        platforms: linux/amd64,linux/arm64
         push: true
         tags: amgamen/chatbot:${{ env.GIT_BRANCH_NAME }}
 
@@ -105,4 +106,4 @@ jobs:
           SSH_PRIVATE_KEY: ${{secrets.SSH_PRIVATE_KEY}}
           SSH_KNOWN_HOSTS: ${{secrets.SSH_KNOWN_HOSTS}}
     - name: start docker with ssh  
-      run: ssh -i ~/private.key -p 19999 bigmama@bigamgamen.de  '/home/bigmama/progs/docker/start_bot_${{ env.GIT_BRANCH_NAME }}.sh'
+      run: ssh -i ~/private.key -p 19999 bigmama@bigamgamen.de  'docker rm -f bot-${{ env.GIT_BRANCH_NAME }} && docker image pull amgamen/chatbot:${{ env.GIT_BRANCH_NAME }} && docker run -d -v chatbotvol-${{ env.GIT_BRANCH_NAME }}:/opt/telegrambot/data  --env-file ~/chatbot/env_${{ env.GIT_BRANCH_NAME }} --restart unless-stopped --name bot-${{ env.GIT_BRANCH_NAME }} amgamen/chatbot:${{ env.GIT_BRANCH_NAME }}'

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17.0.1_12-jdk-focal
+FROM eclipse-temurin:21-noble
 LABEL maintainer="AMDev"
 
 RUN groupadd --system -g 1001 telegrambot && adduser --uid 1001 --gid 1001 --disabled-password --shell  /bin/false telegrambot

README.md

@@ -0,0 +1,56 @@
+# How to
+
+## Developer how to use:
+
+Create your Ownbot :
+<https://github.com/chatbot-workshop/java-telegram-workshop/blob/master/WORKSHOP.adoc>
+
+Start the Bot like this.
+
+    java -cp java.telegrambots-0.9-FINAL.jar:./lib/* de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot TOKEN bot_name CREATOR_ID
+
+Or test it with this bot: @herthaehnchen_bot
+
+## User how to use:
+
+type /help and choose a command.
+
+Usecase: Make an order:
+
+    /neuebestellung
+    /bestellungenkeyboard
+
+choose a Button
+
+    /bestellung 0
+
+add article to order with Buttons
+
+    /addposition 1/2-Hähnchen 0
+    /addposition Krautsalat 0
+
+Commit your order
+
+    /commitorder 0
+
+## Admin how to use:
+
+    /adminoffnenebestellungen
+
+# Copyright and Licensing
+
+Copyright © 2023 Arne Meier
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may
+not use this file except in compliance with the License. You may obtain
+a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+See the [LICENSE](#LICENSE.md#) file for details.

create_volume.sh

@@ -1,2 +1,9 @@
-docker volume create --opt type=none --opt o=bind --opt device=~/data/chatbotvol-develop --name chatbotvol-develop
-chown 1001:1001 ~/data/chatbotvol-develop
+mkdir -p /home/bigmama/chatbot/data/chatbotvol-develop
+chown 1001:1001 /home/bigmama/chatbot/data/chatbotvol-develop
+docker volume create --opt type=none --opt o=bind --opt device=/home/bigmama/chatbot/data/chatbotvol-develop --name chatbotvol-develop
+mkdir -p /home/bigmama/chatbot/data/chatbotvol-staging
+chown 1001:1001 /home/bigmama/chatbot/data/chatbotvol-staging
+docker volume create --opt type=none --opt o=bind --opt device=/home/bigmama/chatbot/data/chatbotvol-staging --name chatbotvol-staging
+mkdir -p /home/bigmama/chatbot/data/chatbotvol-main
+chown 1001:1001 /home/bigmama/chatbot/data/chatbotvol-main
+docker volume create --opt type=none --opt o=bind --opt device=/home/bigmama/chatbot/data/chatbotvol-main --name chatbotvol-main

java.telegrambots.iml

@@ -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>

pom.xml

@@ -10,9 +10,11 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
-		<telegram.bot.version>5.4.0</telegram.bot.version>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
+		<telegram.bot.version>6.4.0</telegram.bot.version>
+		<eclipse.store.version>2.1.3</eclipse.store.version>
+		<microstream.version>08.01.01-MS-GA</microstream.version>
 	</properties>
 
 	<repositories>
@@ -34,55 +36,49 @@
 			<version>${telegram.bot.version}</version>
 		</dependency>
 
+
+
+
 		<dependency>
-			<groupId>one.microstream</groupId>
-			<artifactId>storage.embedded</artifactId>
-			<version>04.00.00-MS-GA</version>
-		</dependency>
-		<dependency>
-			<groupId>one.microstream</groupId>
-			<artifactId>storage.embedded.configuration</artifactId>
-			<version>04.00.00-MS-GA</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.18.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>
@@ -123,4 +119,4 @@
 	</build>
 
 
-</project>
+</project>

src/main/java/de/bigamgamen/java/helper/PaypalLinkGenerator.java

@@ -1,6 +1,7 @@
 package de.bigamgamen.java.helper;
 
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 
 import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotOrder;
@@ -33,7 +34,7 @@ public URL generatePayPalLinkForOrder(final HertlBotOrder order, String adminEma
 		sb.append(ITEM_NAME).append(order.getPayPalDescription());
 		sb.append(CURRENCY_CODE).append(DEFAULT_CURRENCY);
 
-		final URL paylpalLink = new URL(sb.toString());
+		final URL paylpalLink = URI.create(sb.toString()).toURL();
 		return paylpalLink;
 	}