Compare commits
No commits in common. "main" and "v0.4.0" have entirely different histories.
67 changed files with 805 additions and 4044 deletions
202
README.md
202
README.md
|
|
@ -1,177 +1,103 @@
|
||||||
# Java Web Starter (JWS) - University Project Environment Initializer
|
# JakartaEE & Spring Boot Starter
|
||||||
|
|
||||||
[](https://opensource.org/licenses/MIT) **Dieses Projekt entstand im Rahmen einer wissenschaftlichen Hausarbeit im Modul "Programmieren von Webanwendungen" an der IU Internationale Hochschule.**
|
This application is a GUI tool developed in Go using the Fyne framework (v2.5.4). It helps users set up a development environment for JakartaEE and Spring Boot projects by checking and installing necessary dependencies, and then allowing users to deploy starter projects.
|
||||||
|
|
||||||
## Inhaltsverzeichnis
|
## Features
|
||||||
|
|
||||||
- [Motivation / Problemstellung](#motivation--problemstellung)
|
- _Dependency Check_: Verifies the installation of required tools (Visual Studio Code and Docker).
|
||||||
- [Lösungsansatz](#lösungsansatz)
|
|
||||||
- [Kernfunktionen](#kernfunktionen)
|
|
||||||
- [Technologie-Stack](#technologie-stack)
|
|
||||||
- [Zielgruppe](#zielgruppe)
|
|
||||||
- [Installation](#installation)
|
|
||||||
- [Voraussetzungen](#voraussetzungen)
|
|
||||||
- [Über Releases (Empfohlen)](#über-releases-empfohlen)
|
|
||||||
- [Aus dem Quellcode bauen](#aus-dem-quellcode-bauen)
|
|
||||||
- [Benutzung](#benutzung)
|
|
||||||
- [Enthaltene Projekt-Templates](#enthaltene-projekt-templates)
|
|
||||||
- [Funktionsweise (Dev Container)](#funktionsweise-dev-container)
|
|
||||||
- [Bekannte Probleme / Limitationen](#bekannte-probleme--limitationen)
|
|
||||||
- [Zukünftige Arbeit / Ausblick](#zukünftige-arbeit--ausblick)
|
|
||||||
- [Beitragen](#beitragen)
|
|
||||||
- [Lizenz](#lizenz)
|
|
||||||
- [Danksagung](#danksagung)
|
|
||||||
|
|
||||||
## Motivation / Problemstellung
|
- _Automatic Installation_: Offers to install missing dependencies on supported platforms.
|
||||||
|
|
||||||
Die Einrichtung adäquater Entwicklungsumgebungen stellt besonders in der Lehre eine signifikante Hürde dar. Studierende nutzen oft heterogene Systeme (Betriebssysteme, installierte Software, Konfigurationen), was häufig zu Kompatibilitätsproblemen, zeitaufwendiger Fehlersuche und dem bekannten „Works on my machine“-Problem führt. Dies verursacht Frustration, erhöht den Betreuungsaufwand und lenkt vom eigentlichen Lerninhalt ab. Besonders bei komplexen Technologie-Stacks, wie sie in der Webentwicklung mit Java (z.B. Jakarta EE, Spring Boot, Datenbanken) üblich sind, ist die manuelle Konfiguration fehleranfällig.
|
- _Project Selection_: Provides a list of starter projects for JakartaEE and Spring Boot.
|
||||||
|
|
||||||
## Lösungsansatz
|
- _Project Deployment_: Allows users to deploy selected projects and open them in Visual Studio Code with dev containers.
|
||||||
|
|
||||||
Dieses Projekt bietet eine plattformübergreifende Desktop-Anwendung (`jws`), die den Prozess der Bereitstellung standardisierter Entwicklungsumgebungen für universitäre Java-Webprojekte radikal vereinfacht. Unter Nutzung von **Docker** für die Containerisierung und dem **Dev Container Standard** ermöglicht das Tool Studierenden, mit wenigen Klicks eine vorkonfigurierte, lauffähige und konsistente Umgebung für spezifische Projektvorlagen zu initialisieren.
|
## Prerequisites
|
||||||
|
|
||||||
Das Tool wurde in **Go** mit dem **Fyne** GUI-Toolkit entwickelt, um native Ausführbarkeit unter Windows, macOS und Linux zu gewährleisten
|
- Go 1.23 or later
|
||||||
|
|
||||||
## Kernfunktionen
|
- Fyne v2.5.4
|
||||||
|
|
||||||
- **Plattformübergreifend:** Läuft nativ unter Windows, macOS und Linux.
|
|
||||||
- **Abhängigkeitsprüfung:** Überprüft automatisch, ob Docker Desktop und Visual Studio Code installiert sind.
|
|
||||||
- **Automatisierte Installation:** Bietet an, fehlende Abhängigkeiten (Docker Desktop, VS Code) systemabhängig zu installieren:
|
|
||||||
- **Windows:** Nutzt Winget (prüft auch auf WSL).
|
|
||||||
- **macOS:** Nutzt Homebrew (installiert Homebrew bei Bedarf).
|
|
||||||
- **Linux:** Nutzt distributionsspezifische Methoden (dpkg/dnf für VS Code, Docker-Installationsskripte).
|
|
||||||
- **Template-Auswahl:** Bietet eine Auswahl vordefinierter Starter-Projektvorlagen.
|
|
||||||
- **Lokales Deployment:** Kopiert die ausgewählten Template-Dateien in ein vom Benutzer gewähltes Verzeichnis.
|
|
||||||
- **VS Code Integration:** Öffnet das erstellte Projektverzeichnis automatisch in Visual Studio Code.
|
|
||||||
- **Vorkonfigurierte Umgebungen:** Jedes Template enthält:
|
|
||||||
- `Dockerfile(s)`: Definiert das Basis-Image mit JDK, Build-Tools etc..
|
|
||||||
- `docker-compose.yml`: Definiert die Dienste (App-Container, PostgreSQL-Datenbank, ggf. Runtime-Container wie Open Liberty) und Netzwerke.
|
|
||||||
- `devcontainer.json`: Konfiguriert VS Code für die Nutzung des Containers, installiert notwendige Extensions (z.B. Java Extension Pack) und richtet Port-Weiterleitungen ein.
|
|
||||||
- Projekt-Grundgerüst mit vorkonfigurierter Hibernate-Datenbankanbindung.
|
|
||||||
|
|
||||||
## Technologie-Stack
|
|
||||||
|
|
||||||
- **Kernanwendung:** Go, Fyne Toolkit
|
|
||||||
- **Containerisierung:** Docker, Docker Compose
|
|
||||||
- **Standardisierung:** Dev Container Standard (`devcontainer.json`)
|
|
||||||
- **Ziel-IDE:** Visual Studio Code
|
|
||||||
- **Abhängigkeitsinstallation (Helfer):** Winget (Windows), Homebrew (macOS), Shell-Befehle (Linux)
|
|
||||||
- **Projekt-Templates:**
|
|
||||||
- Java Frameworks: Jakarta EE (Servlet/JSP, JSF, REST), Spring Boot (REST)
|
|
||||||
- Persistenz: Hibernate (JPA)
|
|
||||||
- Datenbank: PostgreSQL
|
|
||||||
- Build-Tools: Maven / Gradle (implizit)
|
|
||||||
|
|
||||||
## Zielgruppe
|
|
||||||
|
|
||||||
- **Studierende:** Insbesondere in Informatik- und Wirtschaftsinformatik-Studiengängen, die Java-Webanwendungen programmieren und eine einfache, fehlerfreie Setup-Erfahrung wünschen.
|
|
||||||
- **Lehrende:** Die ihren Studierenden standardisierte Umgebungen zur Verfügung stellen möchten, um den Support-Aufwand zu reduzieren und die Konzentration auf Lerninhalte zu fördern.
|
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
### Voraussetzungen
|
### Option 1: Download Pre-built Binary
|
||||||
|
|
||||||
- Ein unterstütztes Betriebssystem: Windows 10/11, macOS, gängige Linux-Distributionen (getestet unter Mint, Ubuntu, Fedora).
|
Go to the Releases page of this repository.
|
||||||
- Administratorrechte (werden ggf. für die Installation von Docker/VS Code benötigt).
|
|
||||||
- Unter Windows: Eine funktionierende Winget-Installation wird empfohlen/benötigt für die automatische Installation. WSL wird ggf. benötigt und aktiviert.
|
|
||||||
- Unter macOS: Homebrew wird empfohlen/benötigt (kann vom Tool installiert werden).
|
|
||||||
- Für das Bauen aus dem Quellcode: Eine aktuelle Go-Installation.
|
|
||||||
|
|
||||||
### Über Releases (Empfohlen)
|
Download the appropriate binary for your operating system.
|
||||||
|
|
||||||
Die einfachste Methode ist das Herunterladen einer vorkompilierten Version für Ihr Betriebssystem von der [**Releases-Seite**](https://codeberg.org/Pata1704/jws_gui/releases) . Laden Sie die passende Datei herunter, entpacken Sie sie ggf. und führen Sie die `jws` aus.
|
### Option 2: Build from Source
|
||||||
|
|
||||||
### Aus dem Quellcode bauen
|
- Clone the repository:
|
||||||
|
|
||||||
1. Klonen Sie das Repository:
|
```bash
|
||||||
```bash
|
git clone https://github.com/yourusername/jws_gui.git
|
||||||
git clone https://codeberg.org/Pata1704/jws_gui.git
|
```
|
||||||
cd jws_gui
|
|
||||||
```
|
|
||||||
2. Installieren Sie die von [Fyne](https://docs.fyne.io/started/) definierten Abhängigkeiten für ihr Betriebssytem
|
|
||||||
3. Bauen Sie die Anwendung:
|
|
||||||
```bash
|
|
||||||
go build .
|
|
||||||
```
|
|
||||||
Dies erstellt die ausführbare Datei `jws` (oder `jws.exe` unter Windows) im aktuellen Verzeichnis.
|
|
||||||
|
|
||||||
## Benutzung
|
Navigate to the project directory:
|
||||||
|
|
||||||
1. **Starten Sie die Anwendung** (`jws`). Ein Info-Fenster weist auf wichtige Punkte hin.
|
```bash
|
||||||
2. **Abhängigkeits-Check:** Die Anwendung prüft, ob Docker Desktop und Visual Studio Code installiert sind ("Dependency Screen").
|
cd jws_gui
|
||||||
- Falls etwas fehlt, klicken Sie auf die entsprechenden Buttons, um die Installation anzustoßen. Folgen Sie den Anweisungen (ggf. sind Admin-Rechte nötig). Ein Fortschrittsbalken wird angezeigt.
|
```
|
||||||
3. **Template-Auswahl:** Sobald alle Abhängigkeiten erfüllt sind, gelangen Sie zum "Project Screen". Wählen Sie hier das gewünschte Projekt-Template aus (z.B. "JakartaEE Todo-App mit JSP").
|
|
||||||
4. **Deployment:** Klicken Sie auf "Deploy". Wählen Sie im Dialog einen Zielordner auf Ihrem Rechner aus und bestätigen Sie. Die Template-Dateien werden dorthin kopiert.
|
|
||||||
5. **Öffnen in VS Code:** Die Anwendung öffnet das erstellte Projektverzeichnis automatisch in Visual Studio Code.
|
|
||||||
6. **In Container öffnen:**
|
|
||||||
- Stellen Sie sicher, dass Docker Desktop läuft.
|
|
||||||
- VS Code sollte eine Benachrichtigung anzeigen: "Folder contains a Dev Container configuration file. Reopen folder to develop in a container?". Klicken Sie auf "**Reopen in Container**".
|
|
||||||
- (Falls die Benachrichtigung nicht erscheint: Klicken Sie auf das blaue Icon `><` unten links in der VS Code Statusleiste oder nutzen Sie die Befehlspalette (Ctrl+Shift+P) und suchen Sie nach "Dev Containers: Reopen in Container".
|
|
||||||
7. **Build & Run:** Docker/VS Code bauen nun das Image und starten die Container (dies kann beim ersten Mal etwas dauern). Sobald die Umgebung bereit ist, können Sie im integrierten Terminal von VS Code arbeiten, als wären Sie direkt im Container.
|
|
||||||
- **Beispiel (für JakartaEE JSP Template):** Führen Sie im VS Code Terminal aus:
|
|
||||||
```bash
|
|
||||||
mvn clean package && sudo cp target/*.war /app/
|
|
||||||
```
|
|
||||||
Dieser Befehl kompiliert das Projekt und kopiert die `.war`-Datei in das Deployment-Verzeichnis des laufenden OpenLiberty-Servers.
|
|
||||||
8. **Zugriff:** Nach kurzer Zeit ist die Beispielanwendung im Browser unter `http://localhost:9080/todo-app` (oder einem ähnlichen Port/Pfad je nach Template) erreichbar.
|
|
||||||
|
|
||||||
Sie haben nun eine funktionierende, containerisierte Entwicklungsumgebung, ohne sich manuell um Installationen oder Konfigurationen kümmern zu müssen!
|
Install dependencies:
|
||||||
|
|
||||||
## Enthaltene Projekt-Templates
|
The list of dependencies required for the development of Fyne Apps can be found at “https://docs.fyne.io/started/”.
|
||||||
|
|
||||||
Aktuell sind folgende Templates enthalten:
|
```bash
|
||||||
|
go mod tidy
|
||||||
|
```
|
||||||
|
|
||||||
1. Jakarta EE mit Servlet/JSP
|
Build the application:
|
||||||
2. Jakarta EE mit JSF
|
|
||||||
3. Jakarta EE mit REST (JAX-RS)
|
|
||||||
4. Spring Boot mit REST
|
|
||||||
|
|
||||||
Alle Templates beinhalten eine PostgreSQL-Datenbankanbindung via Hibernate/JPA.
|
```bash
|
||||||
|
go build
|
||||||
|
```
|
||||||
|
|
||||||
## Funktionsweise (Dev Container)
|
## Usage
|
||||||
|
|
||||||
Der Kern der Standardisierung basiert auf dem **Dev Container Standard**:
|
Run the application:
|
||||||
|
|
||||||
1. Die `devcontainer.json`-Datei im Projektwurzelverzeichnis teilt VS Code mit, wie die Entwicklungsumgebung konfiguriert ist.
|
If you downloaded a pre-built binary:
|
||||||
2. Sie verweist meist auf eine `docker-compose.yml`-Datei, die die notwendigen Dienste (Applikationscontainer, Datenbank etc.) definiert.
|
|
||||||
3. Die `Dockerfile(s)` definieren, wie die einzelnen Container-Images gebaut werden (Basis-Image, JDK, Tools, Abhängigkeiten).
|
|
||||||
4. Wenn Sie das Projekt in VS Code "im Container öffnen", startet VS Code die definierten Docker-Container und verbindet sich mit dem spezifizierten Entwicklungscontainer.
|
|
||||||
5. VS Code installiert automatisch die in der `devcontainer.json` festgelegten Extensions _innerhalb_ des Containers.
|
|
||||||
6. Sie arbeiten in VS Code (Terminal, Debugger, Code-Editor) nahtlos innerhalb dieser isolierten, vorkonfigurierten Umgebung.
|
|
||||||
|
|
||||||
Dies stellt sicher, dass alle Nutzer exakt die gleiche Umgebung mit den richtigen Werkzeugversionen und Abhängigkeiten haben, unabhängig von ihrem lokalen System.
|
```bash
|
||||||
|
./jakartaee-springboot-starter
|
||||||
|
```
|
||||||
|
|
||||||
## Bekannte Probleme / Limitationen
|
or by double-clicking the excutable.
|
||||||
|
|
||||||
- **SELinux (Fedora):** Unter Fedora mit aktiviertem SELinux kann es zu Problemen beim Mounten von Host-Verzeichnissen in Docker-Containern kommen. Ein Workaround ist `sudo setenforce 0` (nicht empfohlen), eine korrekte SELinux-Konfiguration für Docker ist komplexer.
|
If you built from source:
|
||||||
- **Abhängigkeit von Paketmanagern:** Die automatische Installation hängt vom Funktionieren externer Tools wie Winget und Homebrew ab. Fehler in diesen Tools können die Installation behindern.
|
|
||||||
- **Manuelle Schritte:** Docker Desktop muss manuell gestartet werden, bevor "Reopen in Container" funktioniert
|
|
||||||
- **Installation Robustheit:** Obwohl auf mehreren Systemen getestet, kann es auf spezifischen Konfigurationen zu Problemen kommen
|
|
||||||
- **Evaluation:** Bisher hauptsächlich technisch und durch Experten-Feedback evaluiert. Eine breite Evaluation mit Studierenden (Usability, Zeitersparnis) steht noch aus
|
|
||||||
|
|
||||||
## Zukünftige Arbeit / Ausblick
|
```bash
|
||||||
|
./jakartaee-springboot-starter
|
||||||
|
```
|
||||||
|
|
||||||
- Verbesserung der Robustheit der Installationsprozesse
|
The application will launch a GUI window where you can:
|
||||||
- UI-Verbesserungen und automatische Sprachanpassung
|
|
||||||
- Erweiterung um zusätzliche Templates (z.B. andere Java-Versionen, Microservices, spezifische Bibliotheken)
|
|
||||||
- Plugin-System für Lehrende zur einfachen Erstellung eigener Templates
|
|
||||||
- Unterstützung für Git-Repositories als Template-Quelle
|
|
||||||
- Einführung einer Wahl der IDE (IntelliJ IDEA, Eclipse, NeoVim, Zed, Fleet)
|
|
||||||
- Umfassende quantitative Evaluation
|
|
||||||
|
|
||||||
## Beitragen
|
1. Check and install dependencies (Visual Studio Code and Docker).
|
||||||
|
2. Select a starter project from the available options.
|
||||||
|
3. Deploy the selected project and open it in Visual Studio Code.
|
||||||
|
|
||||||
Beiträge sind willkommen!
|
## Project Structure
|
||||||
|
|
||||||
## Software Bill of Materials (SBOM)
|
_TODO_
|
||||||
Das SBOM dieses Projekts finden Sie unter [sbom.json](sbom.json).
|
|
||||||
|
|
||||||
## Lizenz
|
## Customization
|
||||||
|
|
||||||
Dieses Projekt ist lizenziert unter der MIT Lizenz
|
To add new starter projects:
|
||||||
|
|
||||||
## Danksagung
|
1. Create a new project template in the projects/ directory.
|
||||||
|
2. Add the project details to the projects.json file.
|
||||||
|
|
||||||
- Danke an meinem Dozenten im Modul "Programmieren von Webanwendungen" für die Betreuung der ursprünglichen Hausarbeit.
|
## Contributing
|
||||||
- Danke an die Teilnehmer der Umfrage für ihr wertvolles Feedback.
|
|
||||||
- Inspiration durch die Konzepte von Docker, Dev Containers und die Arbeiten von Malan et al. und Valstar et al. .
|
Contributions are welcome! Please feel free to submit a Pull Request.
|
||||||
|
|
||||||
|
License
|
||||||
|
[Insert your chosen license here]
|
||||||
|
|
||||||
|
## Acknowledgments
|
||||||
|
|
||||||
|
- Fyne: https://fyne.io/
|
||||||
|
- JakartaEE: https://jakarta.ee/
|
||||||
|
- Spring Boot: https://spring.io/projects/spring-boot
|
||||||
|
|
|
||||||
21
changelog.md
21
changelog.md
|
|
@ -2,23 +2,6 @@
|
||||||
|
|
||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
## [0.6.0] - 2025-03-30
|
|
||||||
|
|
||||||
### 📚 Documentation
|
|
||||||
|
|
||||||
- Update README
|
|
||||||
|
|
||||||
## [0.5.0] - 2025-03-23
|
|
||||||
|
|
||||||
### 🚀 Features
|
|
||||||
|
|
||||||
- Add jakarta rest todo implementation with devcontainer setup
|
|
||||||
- Added complete example for spring boot rest service with devcontainer
|
|
||||||
|
|
||||||
### 📚 Documentation
|
|
||||||
|
|
||||||
- Update changelog.md
|
|
||||||
|
|
||||||
## [0.4.0] - 2025-03-21
|
## [0.4.0] - 2025-03-21
|
||||||
|
|
||||||
### 🚀 Features
|
### 🚀 Features
|
||||||
|
|
@ -30,10 +13,6 @@ All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
- Add clean up step to build.sh
|
- Add clean up step to build.sh
|
||||||
|
|
||||||
### 📚 Documentation
|
|
||||||
|
|
||||||
- Update changelog
|
|
||||||
|
|
||||||
## [0.3.0] - 2025-03-21
|
## [0.3.0] - 2025-03-21
|
||||||
|
|
||||||
### 🚀 Features
|
### 🚀 Features
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
FROM icr.io/appcafe/open-liberty:25.0.0.5-kernel-slim-java17-openj9-ubi
|
FROM icr.io/appcafe/open-liberty:23.0.0.4-kernel-slim-java17-openj9-ubi
|
||||||
|
|
||||||
COPY --chown=1001:0 src/main/liberty/config /config
|
COPY --chown=1001:0 src/main/liberty/config /config
|
||||||
# # Verzeichnis erstellen und PostgreSQL JDBC-Treiber herunterladen
|
# # Verzeichnis erstellen und PostgreSQL JDBC-Treiber herunterladen
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,8 @@
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
<maven.compiler.source>17</maven.compiler.source>
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
<maven.compiler.target>17</maven.compiler.target>
|
||||||
<jakartaee.version>10.0.0</jakartaee.version>
|
<jakartaee.version>10.0.0</jakartaee.version>
|
||||||
<hibernate.version>6.6.22.Final</hibernate.version>
|
<hibernate.version>6.2.5.Final</hibernate.version>
|
||||||
<postgresql.version>42.7.6</postgresql.version>
|
<postgresql.version>42.6.0</postgresql.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
@ -46,15 +46,15 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>jakarta.websocket</groupId>
|
<groupId>jakarta.websocket</groupId>
|
||||||
<artifactId>jakarta.websocket-api</artifactId>
|
<artifactId>jakarta.websocket-api</artifactId>
|
||||||
<version>2.2.0</version>
|
<version>2.1.0</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.hibernate.orm</groupId>
|
<groupId>org.hibernate</groupId>
|
||||||
<artifactId>hibernate-core</artifactId>
|
<artifactId>hibernate-core</artifactId>
|
||||||
<version>7.0.0.Final</version> <!-- Stelle sicher, dass du eine aktuelle Version benutzt -->
|
<version>6.3.1.Final</version> <!-- Stelle sicher, dass du eine aktuelle Version benutzt -->
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- Mindestens zum Passwort-Hashing -->
|
<!-- Mindestens zum Passwort-Hashing -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
@ -70,17 +70,17 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.14.0</version>
|
<version>3.10.1</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-war-plugin</artifactId>
|
<artifactId>maven-war-plugin</artifactId>
|
||||||
<version>3.4.0</version>
|
<version>3.3.2</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>io.openliberty.tools</groupId>
|
<groupId>io.openliberty.tools</groupId>
|
||||||
<artifactId>liberty-maven-plugin</artifactId>
|
<artifactId>liberty-maven-plugin</artifactId>
|
||||||
<version>3.11.4</version>
|
<version>3.7.1</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
FROM icr.io/appcafe/open-liberty:25.0.0.5-kernel-slim-java17-openj9-ubi
|
FROM icr.io/appcafe/open-liberty:23.0.0.4-kernel-slim-java17-openj9-ubi
|
||||||
|
|
||||||
COPY --chown=1001:0 src/main/liberty/config /config
|
COPY --chown=1001:0 src/main/liberty/config /config
|
||||||
# # Verzeichnis erstellen und PostgreSQL JDBC-Treiber herunterladen
|
# # Verzeichnis erstellen und PostgreSQL JDBC-Treiber herunterladen
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,8 @@
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
<maven.compiler.source>17</maven.compiler.source>
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
<maven.compiler.target>17</maven.compiler.target>
|
||||||
<jakartaee.version>10.0.0</jakartaee.version>
|
<jakartaee.version>10.0.0</jakartaee.version>
|
||||||
<hibernate.version>6.6.22.Final</hibernate.version>
|
<hibernate.version>6.2.5.Final</hibernate.version>
|
||||||
<postgresql.version>42.7.6</postgresql.version>
|
<postgresql.version>42.6.0</postgresql.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
@ -45,7 +45,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>jakarta.servlet.jsp.jstl</groupId>
|
<groupId>jakarta.servlet.jsp.jstl</groupId>
|
||||||
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
|
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
|
||||||
<version>3.0.2</version>
|
<version>3.0.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.glassfish.web</groupId>
|
<groupId>org.glassfish.web</groupId>
|
||||||
|
|
@ -54,9 +54,9 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.hibernate.orm</groupId>
|
<groupId>org.hibernate</groupId>
|
||||||
<artifactId>hibernate-core</artifactId>
|
<artifactId>hibernate-core</artifactId>
|
||||||
<version>7.0.0.Final</version> <!-- Stelle sicher, dass du eine aktuelle Version benutzt -->
|
<version>6.3.1.Final</version> <!-- Stelle sicher, dass du eine aktuelle Version benutzt -->
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- Mindestens zum Passwort-Hashing -->
|
<!-- Mindestens zum Passwort-Hashing -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
@ -72,17 +72,17 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.14.0</version>
|
<version>3.10.1</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-war-plugin</artifactId>
|
<artifactId>maven-war-plugin</artifactId>
|
||||||
<version>3.4.0</version>
|
<version>3.3.2</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>io.openliberty.tools</groupId>
|
<groupId>io.openliberty.tools</groupId>
|
||||||
<artifactId>liberty-maven-plugin</artifactId>
|
<artifactId>liberty-maven-plugin</artifactId>
|
||||||
<version>3.11.4</version>
|
<version>3.7.1</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
.git
|
|
||||||
.github
|
|
||||||
.settings
|
|
||||||
target
|
|
||||||
*.iml
|
|
||||||
.idea
|
|
||||||
.vscode
|
|
||||||
node_modules
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
# Maven
|
|
||||||
target/
|
|
||||||
!.mvn/wrapper/maven-wrapper.jar
|
|
||||||
!**/src/main/**/target/
|
|
||||||
!**/src/test/**/target/
|
|
||||||
|
|
||||||
# IDE-spezifische Dateien
|
|
||||||
.idea/
|
|
||||||
*.iws
|
|
||||||
*.iml
|
|
||||||
*.ipr
|
|
||||||
.vscode/
|
|
||||||
.settings/
|
|
||||||
.classpath
|
|
||||||
.project
|
|
||||||
.factorypath
|
|
||||||
|
|
||||||
# Temporäre Dateien
|
|
||||||
*.log
|
|
||||||
*.tmp
|
|
||||||
*.temp
|
|
||||||
|
|
||||||
# Lokale Konfigurationsdateien
|
|
||||||
src/main/resources/application-local.properties
|
|
||||||
|
|
||||||
# Devcontainer Volumen
|
|
||||||
.devcontainer/postgres-data/
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
FROM icr.io/appcafe/open-liberty:25.0.0.5-kernel-slim-java17-openj9-ubi
|
|
||||||
|
|
||||||
COPY --chown=1001:0 src/main/liberty/config /config
|
|
||||||
# # Verzeichnis erstellen und PostgreSQL JDBC-Treiber herunterladen
|
|
||||||
RUN mkdir -p /config/lib && \
|
|
||||||
curl -o /config/lib/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.6.0.jar
|
|
||||||
|
|
||||||
RUN features.sh
|
|
||||||
|
|
||||||
#COPY --chown=1001:0 target/*.war /config/apps
|
|
||||||
|
|
||||||
RUN configure.sh
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
FROM mcr.microsoft.com/devcontainers/java:1-21-bullseye
|
|
||||||
|
|
||||||
#ARG INSTALL_MAVEN="true"
|
|
||||||
#ARG MAVEN_VERSION=""
|
|
||||||
|
|
||||||
#ARG INSTALL_GRADLE="false"
|
|
||||||
#ARG GRADLE_VERSION=""
|
|
||||||
|
|
||||||
#RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \
|
|
||||||
# && if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi
|
|
||||||
|
|
||||||
# Hier kannst du zusätzliche Tools oder Bibliotheken installieren, die du für die Entwicklung benötigst.
|
|
||||||
# Zum Beispiel den PostgreSQL JDBC-Treiber, wenn du ihn für die Entwicklung benötigst:
|
|
||||||
RUN apt-get update && apt-get install -y curl && curl -o /tmp/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.6.0.jar && mkdir -p /usr/local/lib/ && mv /tmp/postgresql.jar /usr/local/lib/postgresql.jar
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
{
|
|
||||||
"name": "Java & PostgreSQL",
|
|
||||||
"dockerComposeFile": "docker-compose.yml",
|
|
||||||
"service": "app",
|
|
||||||
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
|
|
||||||
"forwardPorts": [9080, 5432, 9433],
|
|
||||||
"postCreateCommand": "mvn clean install -DskipTests",
|
|
||||||
"remoteUser": "vscode",
|
|
||||||
"features": {
|
|
||||||
"ghcr.io/devcontainers/features/docker-in-docker:2": {"version": "latest"},
|
|
||||||
"ghcr.io/devcontainers-extra/features/maven-sdkman:2": {"version": "latest"},
|
|
||||||
"ghcr.io/devcontainers/features/git:1": {"version": "latest"}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,60 +0,0 @@
|
||||||
services:
|
|
||||||
app:
|
|
||||||
container_name: javadev
|
|
||||||
build:
|
|
||||||
context: ../
|
|
||||||
dockerfile: .devcontainer/Dockerfile.dev
|
|
||||||
volumes:
|
|
||||||
- ../..:/workspaces:cached
|
|
||||||
- ./app:/app
|
|
||||||
environment:
|
|
||||||
POSTGRES_HOST: postgresdb
|
|
||||||
POSTGRES_PORT: 5432
|
|
||||||
POSTGRES_DB: postgres
|
|
||||||
POSTGRES_USER: postgres
|
|
||||||
POSTGRES_PASSWORD: postgres
|
|
||||||
networks:
|
|
||||||
- my_network
|
|
||||||
command: sleep infinity
|
|
||||||
|
|
||||||
openliberty:
|
|
||||||
container_name: openliberty_app
|
|
||||||
build:
|
|
||||||
context: ../
|
|
||||||
dockerfile: .devcontainer/Dockerfile
|
|
||||||
ports:
|
|
||||||
- "9080:9080"
|
|
||||||
- "9443:9443"
|
|
||||||
environment:
|
|
||||||
POSTGRES_HOST: postgresdb
|
|
||||||
POSTGRES_PORT: 5432
|
|
||||||
POSTGRES_DB: todo_db
|
|
||||||
POSTGRES_USER: postgres
|
|
||||||
POSTGRES_PASSWORD: postgres
|
|
||||||
volumes:
|
|
||||||
- ./app:/config/dropins
|
|
||||||
depends_on:
|
|
||||||
- db
|
|
||||||
networks:
|
|
||||||
- my_network
|
|
||||||
|
|
||||||
db:
|
|
||||||
container_name: postgresdb
|
|
||||||
image: postgres:latest
|
|
||||||
restart: unless-stopped
|
|
||||||
volumes:
|
|
||||||
- postgres-data:/var/lib/postgresql/data
|
|
||||||
- ./init.sql:/docker-entrypoint-initdb.d/init.sql
|
|
||||||
environment:
|
|
||||||
POSTGRES_PASSWORD: postgres
|
|
||||||
POSTGRES_USER: postgres
|
|
||||||
POSTGRES_DB: todo_db
|
|
||||||
networks:
|
|
||||||
- my_network
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
postgres-data:
|
|
||||||
|
|
||||||
networks:
|
|
||||||
my_network:
|
|
||||||
driver: bridge
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
CREATE TABLE users (
|
|
||||||
id SERIAL PRIMARY KEY,
|
|
||||||
username VARCHAR(255) NOT NULL UNIQUE,
|
|
||||||
password VARCHAR(255) NOT NULL,
|
|
||||||
email VARCHAR(255) NOT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE todos (
|
|
||||||
id SERIAL PRIMARY KEY,
|
|
||||||
title VARCHAR(255) NOT NULL,
|
|
||||||
description VARCHAR(1000),
|
|
||||||
target_date DATE,
|
|
||||||
completed BOOLEAN,
|
|
||||||
user_id BIGINT NOT NULL,
|
|
||||||
FOREIGN KEY (user_id) REFERENCES users(id)
|
|
||||||
);
|
|
||||||
|
|
||||||
INSERT INTO users (username, password, email) VALUES
|
|
||||||
('test', '$2a$12$nt7xQKNDKZhxQFZGD5Wy0.Uh0wdPtWDgwfnWnPLgBWnQDGGkNLKBi', 'test@example.com');
|
|
||||||
|
|
@ -1,112 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<groupId>com.todoapp</groupId>
|
|
||||||
<artifactId>todo-app</artifactId>
|
|
||||||
<version>1.0-SNAPSHOT</version>
|
|
||||||
<packaging>war</packaging>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
|
||||||
<jakartaee.version>10.0.0</jakartaee.version>
|
|
||||||
<hibernate.version>6.6.22.Final</hibernate.version>
|
|
||||||
<postgresql.version>42.7.6</postgresql.version>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<!-- Jakarta EE 10 API -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>jakarta.platform</groupId>
|
|
||||||
<artifactId>jakarta.jakartaee-api</artifactId>
|
|
||||||
<version>${jakartaee.version}</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- Hibernate Core -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.hibernate.orm</groupId>
|
|
||||||
<artifactId>hibernate-core</artifactId>
|
|
||||||
<version>${hibernate.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- PostgreSQL JDBC Driver -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.postgresql</groupId>
|
|
||||||
<artifactId>postgresql</artifactId>
|
|
||||||
<version>${postgresql.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- JSTL -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>jakarta.servlet.jsp.jstl</groupId>
|
|
||||||
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
|
|
||||||
<version>3.0.2</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.glassfish.web</groupId>
|
|
||||||
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
|
|
||||||
<version>3.0.1</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- JAX-RS -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>jakarta.ws.rs</groupId>
|
|
||||||
<artifactId>jakarta.ws.rs-api</artifactId>
|
|
||||||
<version>3.1.0</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- JSON-Binding -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>jakarta.json.bind</groupId>
|
|
||||||
<artifactId>jakarta.json.bind-api</artifactId>
|
|
||||||
<version>3.0.1</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- JSON-Processing -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>jakarta.json</groupId>
|
|
||||||
<artifactId>jakarta.json-api</artifactId>
|
|
||||||
<version>2.1.3</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.hibernate.orm</groupId>
|
|
||||||
<artifactId>hibernate-core</artifactId>
|
|
||||||
<version>7.0.0.Final</version> <!-- Stelle sicher, dass du eine aktuelle Version benutzt -->
|
|
||||||
</dependency>
|
|
||||||
<!-- Mindestens zum Passwort-Hashing -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>at.favre.lib</groupId>
|
|
||||||
<artifactId>bcrypt</artifactId>
|
|
||||||
<version>0.10.2</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<finalName>todo-app</finalName>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<version>3.14.0</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-war-plugin</artifactId>
|
|
||||||
<version>3.4.0</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>io.openliberty.tools</groupId>
|
|
||||||
<artifactId>liberty-maven-plugin</artifactId>
|
|
||||||
<version>3.11.4</version>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,135 +0,0 @@
|
||||||
package com.todoapp.dao;
|
|
||||||
|
|
||||||
import com.todoapp.model.Todo;
|
|
||||||
import com.todoapp.model.User;
|
|
||||||
import jakarta.enterprise.context.ApplicationScoped;
|
|
||||||
import jakarta.inject.Inject;
|
|
||||||
import org.hibernate.Session;
|
|
||||||
import org.hibernate.SessionFactory;
|
|
||||||
import org.hibernate.Transaction;
|
|
||||||
import org.hibernate.query.Query;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@ApplicationScoped
|
|
||||||
public class TodoDAO {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
private SessionFactory sessionFactory;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
private UserDAO userDAO;
|
|
||||||
|
|
||||||
public Todo saveTodo(Todo todo, String username) {
|
|
||||||
Transaction transaction = null;
|
|
||||||
try (Session session = sessionFactory.openSession()) {
|
|
||||||
transaction = session.beginTransaction();
|
|
||||||
|
|
||||||
// Benutzer aus der Datenbank holen
|
|
||||||
User user = userDAO.getUserByUsername(username);
|
|
||||||
if (user == null) {
|
|
||||||
throw new IllegalArgumentException("User not found");
|
|
||||||
}
|
|
||||||
|
|
||||||
todo.setUser(user);
|
|
||||||
session.persist(todo);
|
|
||||||
transaction.commit();
|
|
||||||
return todo;
|
|
||||||
} catch (Exception e) {
|
|
||||||
if (transaction != null) {
|
|
||||||
transaction.rollback();
|
|
||||||
}
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException("Error saving todo", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public Todo updateTodo(Todo todo) {
|
|
||||||
Transaction transaction = null;
|
|
||||||
try (Session session = sessionFactory.openSession()) {
|
|
||||||
transaction = session.beginTransaction();
|
|
||||||
Todo updatedTodo = session.merge(todo);
|
|
||||||
transaction.commit();
|
|
||||||
return updatedTodo;
|
|
||||||
} catch (Exception e) {
|
|
||||||
if (transaction != null) {
|
|
||||||
transaction.rollback();
|
|
||||||
}
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException("Error updating todo", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean deleteTodo(Long id) {
|
|
||||||
Transaction transaction = null;
|
|
||||||
try (Session session = sessionFactory.openSession()) {
|
|
||||||
transaction = session.beginTransaction();
|
|
||||||
Todo todo = session.get(Todo.class, id);
|
|
||||||
if (todo != null) {
|
|
||||||
session.remove(todo);
|
|
||||||
transaction.commit();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
} catch (Exception e) {
|
|
||||||
if (transaction != null) {
|
|
||||||
transaction.rollback();
|
|
||||||
}
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException("Error deleting todo", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public Todo getTodoById(Long id) {
|
|
||||||
try (Session session = sessionFactory.openSession()) {
|
|
||||||
return session.get(Todo.class, id);
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException("Error getting todo by ID", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Todo> getAllTodos() {
|
|
||||||
try (Session session = sessionFactory.openSession()) {
|
|
||||||
return session.createQuery("FROM Todo", Todo.class).list();
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException("Error getting all todos", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Todo> getTodosByUsername(String username) {
|
|
||||||
try (Session session = sessionFactory.openSession()) {
|
|
||||||
Query<Todo> query = session.createQuery(
|
|
||||||
"FROM Todo t WHERE t.user.username = :username ORDER BY t.completed, t.targetDate", Todo.class);
|
|
||||||
query.setParameter("username", username);
|
|
||||||
return query.list();
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException("Error getting todos by username", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Todo> getCompletedTodosByUsername(String username) {
|
|
||||||
try (Session session = sessionFactory.openSession()) {
|
|
||||||
Query<Todo> query = session.createQuery(
|
|
||||||
"FROM Todo t WHERE t.user.username = :username AND t.completed = true", Todo.class);
|
|
||||||
query.setParameter("username", username);
|
|
||||||
return query.list();
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException("Error getting completed todos", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Todo> getIncompleteTodosByUsername(String username) {
|
|
||||||
try (Session session = sessionFactory.openSession()) {
|
|
||||||
Query<Todo> query = session.createQuery(
|
|
||||||
"FROM Todo t WHERE t.user.username = :username AND t.completed = false ORDER BY t.targetDate", Todo.class);
|
|
||||||
query.setParameter("username", username);
|
|
||||||
return query.list();
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException("Error getting incomplete todos", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,124 +0,0 @@
|
||||||
package com.todoapp.dao;
|
|
||||||
|
|
||||||
import com.todoapp.model.User;
|
|
||||||
import com.todoapp.util.HibernateUtil;
|
|
||||||
import jakarta.enterprise.context.ApplicationScoped;
|
|
||||||
import jakarta.inject.Inject;
|
|
||||||
import org.hibernate.Session;
|
|
||||||
import org.hibernate.SessionFactory;
|
|
||||||
import org.hibernate.Transaction;
|
|
||||||
import org.hibernate.query.Query;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@ApplicationScoped
|
|
||||||
public class UserDAO {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
private SessionFactory sessionFactory;
|
|
||||||
|
|
||||||
public User saveUser(User user) {
|
|
||||||
Transaction transaction = null;
|
|
||||||
try (Session session = sessionFactory.openSession()) {
|
|
||||||
transaction = session.beginTransaction();
|
|
||||||
session.persist(user);
|
|
||||||
transaction.commit();
|
|
||||||
return user;
|
|
||||||
} catch (Exception e) {
|
|
||||||
if (transaction != null) {
|
|
||||||
transaction.rollback();
|
|
||||||
}
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException("Error saving user", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public User updateUser(User user) {
|
|
||||||
Transaction transaction = null;
|
|
||||||
try (Session session = sessionFactory.openSession()) {
|
|
||||||
transaction = session.beginTransaction();
|
|
||||||
User updatedUser = session.merge(user);
|
|
||||||
transaction.commit();
|
|
||||||
return updatedUser;
|
|
||||||
} catch (Exception e) {
|
|
||||||
if (transaction != null) {
|
|
||||||
transaction.rollback();
|
|
||||||
}
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException("Error updating user", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean deleteUser(Long id) {
|
|
||||||
Transaction transaction = null;
|
|
||||||
try (Session session = sessionFactory.openSession()) {
|
|
||||||
transaction = session.beginTransaction();
|
|
||||||
User user = session.get(User.class, id);
|
|
||||||
if (user != null) {
|
|
||||||
session.remove(user);
|
|
||||||
transaction.commit();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
} catch (Exception e) {
|
|
||||||
if (transaction != null) {
|
|
||||||
transaction.rollback();
|
|
||||||
}
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException("Error deleting user", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public User getUserById(Long id) {
|
|
||||||
try (Session session = sessionFactory.openSession()) {
|
|
||||||
return session.get(User.class, id);
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException("Error getting user by ID", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public User getUserByUsername(String username) {
|
|
||||||
try (Session session = sessionFactory.openSession()) {
|
|
||||||
Query<User> query = session.createQuery("FROM User WHERE username = :username", User.class);
|
|
||||||
query.setParameter("username", username);
|
|
||||||
return query.uniqueResult();
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException("Error getting user by username", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<User> getAllUsers() {
|
|
||||||
try (Session session = sessionFactory.openSession()) {
|
|
||||||
return session.createQuery("FROM User", User.class).list();
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException("Error getting all users", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean usernameExists(String username) {
|
|
||||||
try (Session session = sessionFactory.openSession()) {
|
|
||||||
Query<Long> query = session.createQuery(
|
|
||||||
"SELECT COUNT(u) FROM User u WHERE u.username = :username", Long.class);
|
|
||||||
query.setParameter("username", username);
|
|
||||||
return query.uniqueResult() > 0;
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException("Error checking if username exists", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean emailExists(String email) {
|
|
||||||
try (Session session = sessionFactory.openSession()) {
|
|
||||||
Query<Long> query = session.createQuery(
|
|
||||||
"SELECT COUNT(u) FROM User u WHERE u.email = :email", Long.class);
|
|
||||||
query.setParameter("email", email);
|
|
||||||
return query.uniqueResult() > 0;
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException("Error checking if email exists", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
package com.todoapp.dto;
|
|
||||||
|
|
||||||
public class LoginRequest {
|
|
||||||
private String username;
|
|
||||||
private String password;
|
|
||||||
|
|
||||||
// Getter und Setter
|
|
||||||
public String getUsername() {
|
|
||||||
return username;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUsername(String username) {
|
|
||||||
this.username = username;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getPassword() {
|
|
||||||
return password;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPassword(String password) {
|
|
||||||
this.password = password;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
package com.todoapp.dto;
|
|
||||||
|
|
||||||
public class RegistrationRequest {
|
|
||||||
private String username;
|
|
||||||
private String password;
|
|
||||||
private String email;
|
|
||||||
|
|
||||||
// Getter und Setter
|
|
||||||
public String getUsername() {
|
|
||||||
return username;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUsername(String username) {
|
|
||||||
this.username = username;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getPassword() {
|
|
||||||
return password;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPassword(String password) {
|
|
||||||
this.password = password;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getEmail() {
|
|
||||||
return email;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setEmail(String email) {
|
|
||||||
this.email = email;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,109 +0,0 @@
|
||||||
package com.todoapp.model;
|
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
|
||||||
import jakarta.json.bind.annotation.JsonbTransient;
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
@Entity
|
|
||||||
@Table(name = "todos")
|
|
||||||
public class Todo implements Serializable {
|
|
||||||
|
|
||||||
@Id
|
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
@Column(nullable = false)
|
|
||||||
private String title;
|
|
||||||
|
|
||||||
@Column(length = 1000)
|
|
||||||
private String description;
|
|
||||||
|
|
||||||
@Column(name = "target_date")
|
|
||||||
@Temporal(TemporalType.DATE)
|
|
||||||
private Date targetDate;
|
|
||||||
|
|
||||||
@Column
|
|
||||||
private boolean completed;
|
|
||||||
|
|
||||||
@ManyToOne(fetch = FetchType.LAZY)
|
|
||||||
@JoinColumn(name = "user_id", nullable = false)
|
|
||||||
@JsonbTransient // Verhindert zirkuläre Referenzen
|
|
||||||
private User user;
|
|
||||||
|
|
||||||
// Konstruktoren
|
|
||||||
public Todo() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public Todo(String title, String description, Date targetDate, boolean completed) {
|
|
||||||
this.title = title;
|
|
||||||
this.description = description;
|
|
||||||
this.targetDate = targetDate;
|
|
||||||
this.completed = completed;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Getter und Setter
|
|
||||||
public Long getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setId(Long id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getTitle() {
|
|
||||||
return title;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTitle(String title) {
|
|
||||||
this.title = title;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getDescription() {
|
|
||||||
return description;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDescription(String description) {
|
|
||||||
this.description = description;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Date getTargetDate() {
|
|
||||||
return targetDate;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTargetDate(Date targetDate) {
|
|
||||||
this.targetDate = targetDate;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isCompleted() {
|
|
||||||
return completed;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCompleted(boolean completed) {
|
|
||||||
this.completed = completed;
|
|
||||||
}
|
|
||||||
|
|
||||||
public User getUser() {
|
|
||||||
return user;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUser(User user) {
|
|
||||||
this.user = user;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Zusätzliche Methode für REST-Antworten
|
|
||||||
public Long getUserId() {
|
|
||||||
return user != null ? user.getId() : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "Todo{" +
|
|
||||||
"id=" + id +
|
|
||||||
", title='" + title + '\'' +
|
|
||||||
", description='" + description + '\'' +
|
|
||||||
", targetDate=" + targetDate +
|
|
||||||
", completed=" + completed +
|
|
||||||
'}';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,101 +0,0 @@
|
||||||
package com.todoapp.model;
|
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
|
||||||
import jakarta.json.bind.annotation.JsonbTransient;
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Entity
|
|
||||||
@Table(name = "users")
|
|
||||||
public class User implements Serializable {
|
|
||||||
|
|
||||||
@Id
|
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
@Column(nullable = false, unique = true)
|
|
||||||
private String username;
|
|
||||||
|
|
||||||
@Column(nullable = false)
|
|
||||||
@JsonbTransient // Verhindert, dass das Passwort in JSON serialisiert wird
|
|
||||||
private String password;
|
|
||||||
|
|
||||||
@Column(nullable = false)
|
|
||||||
private String email;
|
|
||||||
|
|
||||||
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
|
||||||
@JsonbTransient // Verhindert zirkuläre Referenzen bei der JSON-Serialisierung
|
|
||||||
private List<Todo> todos = new ArrayList<>();
|
|
||||||
|
|
||||||
// Konstruktoren
|
|
||||||
public User() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public User(String username, String password, String email) {
|
|
||||||
this.username = username;
|
|
||||||
this.password = password;
|
|
||||||
this.email = email;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Getter und Setter
|
|
||||||
public Long getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setId(Long id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUsername() {
|
|
||||||
return username;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUsername(String username) {
|
|
||||||
this.username = username;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getPassword() {
|
|
||||||
return password;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPassword(String password) {
|
|
||||||
this.password = password;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getEmail() {
|
|
||||||
return email;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setEmail(String email) {
|
|
||||||
this.email = email;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Todo> getTodos() {
|
|
||||||
return todos;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTodos(List<Todo> todos) {
|
|
||||||
this.todos = todos;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Hilfsmethoden
|
|
||||||
public void addTodo(Todo todo) {
|
|
||||||
todos.add(todo);
|
|
||||||
todo.setUser(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void removeTodo(Todo todo) {
|
|
||||||
todos.remove(todo);
|
|
||||||
todo.setUser(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "User{" +
|
|
||||||
"id=" + id +
|
|
||||||
", username='" + username + '\'' +
|
|
||||||
", email='" + email + '\'' +
|
|
||||||
'}';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,95 +0,0 @@
|
||||||
package com.todoapp.rest;
|
|
||||||
|
|
||||||
import com.todoapp.dao.UserDAO;
|
|
||||||
import com.todoapp.model.User;
|
|
||||||
import com.todoapp.dto.LoginRequest;
|
|
||||||
import com.todoapp.dto.RegistrationRequest;
|
|
||||||
|
|
||||||
import jakarta.annotation.security.RolesAllowed;
|
|
||||||
import jakarta.inject.Inject;
|
|
||||||
import jakarta.ws.rs.*;
|
|
||||||
import jakarta.ws.rs.core.MediaType;
|
|
||||||
import jakarta.ws.rs.core.Response;
|
|
||||||
import at.favre.lib.crypto.bcrypt.BCrypt;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@Path("/auth")
|
|
||||||
@Produces(MediaType.APPLICATION_JSON)
|
|
||||||
@Consumes(MediaType.APPLICATION_JSON)
|
|
||||||
public class AuthResource {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
private UserDAO userDAO;
|
|
||||||
|
|
||||||
@POST
|
|
||||||
@Path("/register")
|
|
||||||
public Response register(RegistrationRequest request) {
|
|
||||||
if (request.getUsername() == null || request.getPassword() == null || request.getEmail() == null) {
|
|
||||||
return Response.status(Response.Status.BAD_REQUEST)
|
|
||||||
.entity(Map.of("error", "Username, password, and email are required"))
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (userDAO.usernameExists(request.getUsername())) {
|
|
||||||
System.out.println(userDAO.usernameExists(request.getUsername()));
|
|
||||||
return Response.status(Response.Status.CONFLICT)
|
|
||||||
.entity(Map.of("error", "Username already exists"))
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (userDAO.emailExists(request.getEmail())) {
|
|
||||||
return Response.status(Response.Status.CONFLICT)
|
|
||||||
.entity(Map.of("error", "Email already exists"))
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
User user = new User();
|
|
||||||
user.setUsername(request.getUsername());
|
|
||||||
user.setEmail(request.getEmail());
|
|
||||||
|
|
||||||
String hashedPassword = BCrypt.withDefaults()
|
|
||||||
.hashToString(12, request.getPassword().toCharArray());
|
|
||||||
user.setPassword(hashedPassword);
|
|
||||||
|
|
||||||
userDAO.saveUser(user);
|
|
||||||
|
|
||||||
return Response.status(Response.Status.CREATED)
|
|
||||||
.entity(Map.of("message", "User registered successfully"))
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
@POST
|
|
||||||
@RolesAllowed("user")
|
|
||||||
@Path("/login")
|
|
||||||
public Response login(LoginRequest request) {
|
|
||||||
// Validierung
|
|
||||||
if (request.getUsername() == null || request.getPassword() == null) {
|
|
||||||
return Response.status(Response.Status.BAD_REQUEST)
|
|
||||||
.entity(Map.of("error", "Username and password are required"))
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Benutzer suchen
|
|
||||||
User user = userDAO.getUserByUsername(request.getUsername());
|
|
||||||
if (user == null) {
|
|
||||||
return Response.status(Response.Status.UNAUTHORIZED)
|
|
||||||
.entity(Map.of("error", "Invalid credentials"))
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Passwort überprüfen
|
|
||||||
BCrypt.Result result = BCrypt.verifyer()
|
|
||||||
.verify(request.getPassword().toCharArray(), user.getPassword());
|
|
||||||
if (!result.verified) {
|
|
||||||
return Response.status(Response.Status.UNAUTHORIZED)
|
|
||||||
.entity(Map.of("error", "Invalid credentials"))
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Erfolgreiche Anmeldung
|
|
||||||
return Response.ok(Map.of(
|
|
||||||
"message", "Login successful",
|
|
||||||
"username", user.getUsername(),
|
|
||||||
"email", user.getEmail())).build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
package com.todoapp.rest;
|
|
||||||
|
|
||||||
import jakarta.ws.rs.ApplicationPath;
|
|
||||||
import jakarta.ws.rs.core.Application;
|
|
||||||
|
|
||||||
@ApplicationPath("/api")
|
|
||||||
public class TodoApplication extends Application {
|
|
||||||
// Die leere Klasse ist ausreichend, um den REST-Endpunkt zu definieren
|
|
||||||
}
|
|
||||||
|
|
@ -1,130 +0,0 @@
|
||||||
package com.todoapp.rest;
|
|
||||||
|
|
||||||
import com.todoapp.dao.TodoDAO;
|
|
||||||
import com.todoapp.model.Todo;
|
|
||||||
import jakarta.inject.Inject;
|
|
||||||
import jakarta.ws.rs.*;
|
|
||||||
import jakarta.ws.rs.core.Context;
|
|
||||||
import jakarta.ws.rs.core.MediaType;
|
|
||||||
import jakarta.ws.rs.core.Response;
|
|
||||||
import jakarta.ws.rs.core.SecurityContext;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Path("/todos")
|
|
||||||
@Produces(MediaType.APPLICATION_JSON)
|
|
||||||
@Consumes(MediaType.APPLICATION_JSON)
|
|
||||||
public class TodoResource {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
private TodoDAO todoDAO;
|
|
||||||
|
|
||||||
@GET
|
|
||||||
public Response getAllTodos(@Context SecurityContext securityContext) {
|
|
||||||
String username = securityContext.getUserPrincipal().getName();
|
|
||||||
List<Todo> todos = todoDAO.getTodosByUsername(username);
|
|
||||||
return Response.ok(todos).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
@GET
|
|
||||||
@Path("/{id}")
|
|
||||||
public Response getTodoById(@PathParam("id") Long id, @Context SecurityContext securityContext) {
|
|
||||||
String username = securityContext.getUserPrincipal().getName();
|
|
||||||
Todo todo = todoDAO.getTodoById(id);
|
|
||||||
|
|
||||||
if (todo == null) {
|
|
||||||
return Response.status(Response.Status.NOT_FOUND).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sicherheitscheck: Nutzer darf nur eigene Todos sehen
|
|
||||||
if (!todo.getUser().getUsername().equals(username)) {
|
|
||||||
return Response.status(Response.Status.FORBIDDEN).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
return Response.ok(todo).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
@GET
|
|
||||||
@Path("/completed")
|
|
||||||
public Response getCompletedTodos(@Context SecurityContext securityContext) {
|
|
||||||
String username = securityContext.getUserPrincipal().getName();
|
|
||||||
List<Todo> todos = todoDAO.getCompletedTodosByUsername(username);
|
|
||||||
return Response.ok(todos).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
@GET
|
|
||||||
@Path("/incomplete")
|
|
||||||
public Response getIncompleteTodos(@Context SecurityContext securityContext) {
|
|
||||||
String username = securityContext.getUserPrincipal().getName();
|
|
||||||
List<Todo> todos = todoDAO.getIncompleteTodosByUsername(username);
|
|
||||||
return Response.ok(todos).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
@POST
|
|
||||||
public Response createTodo(Todo todo, @Context SecurityContext securityContext) {
|
|
||||||
String username = securityContext.getUserPrincipal().getName();
|
|
||||||
todo = todoDAO.saveTodo(todo, username);
|
|
||||||
return Response.status(Response.Status.CREATED).entity(todo).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
@PUT
|
|
||||||
@Path("/{id}")
|
|
||||||
public Response updateTodo(@PathParam("id") Long id, Todo updatedTodo, @Context SecurityContext securityContext) {
|
|
||||||
String username = securityContext.getUserPrincipal().getName();
|
|
||||||
Todo existingTodo = todoDAO.getTodoById(id);
|
|
||||||
|
|
||||||
if (existingTodo == null) {
|
|
||||||
return Response.status(Response.Status.NOT_FOUND).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sicherheitscheck: Nutzer darf nur eigene Todos aktualisieren
|
|
||||||
if (!existingTodo.getUser().getUsername().equals(username)) {
|
|
||||||
return Response.status(Response.Status.FORBIDDEN).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
// ID und Benutzer beibehalten
|
|
||||||
updatedTodo.setId(id);
|
|
||||||
updatedTodo.setUser(existingTodo.getUser());
|
|
||||||
|
|
||||||
todoDAO.updateTodo(updatedTodo);
|
|
||||||
return Response.ok(updatedTodo).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
@DELETE
|
|
||||||
@Path("/{id}")
|
|
||||||
public Response deleteTodo(@PathParam("id") Long id, @Context SecurityContext securityContext) {
|
|
||||||
String username = securityContext.getUserPrincipal().getName();
|
|
||||||
Todo todo = todoDAO.getTodoById(id);
|
|
||||||
|
|
||||||
if (todo == null) {
|
|
||||||
return Response.status(Response.Status.NOT_FOUND).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sicherheitscheck: Nutzer darf nur eigene Todos löschen
|
|
||||||
if (!todo.getUser().getUsername().equals(username)) {
|
|
||||||
return Response.status(Response.Status.FORBIDDEN).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean deleted = todoDAO.deleteTodo(id);
|
|
||||||
return deleted ? Response.noContent().build() : Response.status(Response.Status.NOT_FOUND).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
@PUT
|
|
||||||
@Path("/{id}/complete")
|
|
||||||
public Response markTodoComplete(@PathParam("id") Long id, @Context SecurityContext securityContext) {
|
|
||||||
String username = securityContext.getUserPrincipal().getName();
|
|
||||||
Todo todo = todoDAO.getTodoById(id);
|
|
||||||
|
|
||||||
if (todo == null) {
|
|
||||||
return Response.status(Response.Status.NOT_FOUND).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sicherheitscheck: Nutzer darf nur eigene Todos aktualisieren
|
|
||||||
if (!todo.getUser().getUsername().equals(username)) {
|
|
||||||
return Response.status(Response.Status.FORBIDDEN).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
todo.setCompleted(true);
|
|
||||||
todoDAO.updateTodo(todo);
|
|
||||||
return Response.ok(todo).build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,104 +0,0 @@
|
||||||
package com.todoapp.security;
|
|
||||||
|
|
||||||
import com.todoapp.dao.UserDAO;
|
|
||||||
import com.todoapp.model.User;
|
|
||||||
import jakarta.annotation.Priority;
|
|
||||||
import jakarta.enterprise.context.ApplicationScoped;
|
|
||||||
import jakarta.inject.Inject;
|
|
||||||
import jakarta.ws.rs.Priorities;
|
|
||||||
import jakarta.ws.rs.container.ContainerRequestContext;
|
|
||||||
import jakarta.ws.rs.container.ContainerRequestFilter;
|
|
||||||
import jakarta.ws.rs.core.HttpHeaders;
|
|
||||||
import jakarta.ws.rs.core.Response;
|
|
||||||
import jakarta.ws.rs.core.SecurityContext;
|
|
||||||
import jakarta.ws.rs.ext.Provider;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.security.Principal;
|
|
||||||
import java.util.Base64;
|
|
||||||
import at.favre.lib.crypto.bcrypt.BCrypt;
|
|
||||||
|
|
||||||
@Provider
|
|
||||||
@Priority(Priorities.AUTHENTICATION)
|
|
||||||
@ApplicationScoped
|
|
||||||
public class BasicAuthenticationFilter implements ContainerRequestFilter {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
private UserDAO userDAO;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void filter(ContainerRequestContext requestContext) throws IOException {
|
|
||||||
System.out.println("BasicAuthenticationFilter triggered for path: " + requestContext.getUriInfo().getPath());
|
|
||||||
String path = requestContext.getUriInfo().getPath();
|
|
||||||
if (path.endsWith("auth/register") || path.endsWith("auth/login")) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String authHeader = requestContext.getHeaderString(HttpHeaders.AUTHORIZATION);
|
|
||||||
if (authHeader == null || !authHeader.startsWith("Basic ")) {
|
|
||||||
abortWithUnauthorized(requestContext);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String[] credentials = extractCredentials(authHeader);
|
|
||||||
if (credentials.length != 2) {
|
|
||||||
abortWithUnauthorized(requestContext);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String username = credentials[0];
|
|
||||||
String password = credentials[1];
|
|
||||||
|
|
||||||
User user = userDAO.getUserByUsername(username);
|
|
||||||
if (user == null) {
|
|
||||||
abortWithUnauthorized(requestContext);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
BCrypt.Result result = BCrypt.verifyer()
|
|
||||||
.verify(password.toCharArray(), user.getPassword());
|
|
||||||
if (!result.verified) {
|
|
||||||
abortWithUnauthorized(requestContext);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final SecurityContext currentSecurityContext = requestContext.getSecurityContext();
|
|
||||||
requestContext.setSecurityContext(new SecurityContext() {
|
|
||||||
@Override
|
|
||||||
public Principal getUserPrincipal() {
|
|
||||||
return () -> username;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isUserInRole(String role) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSecure() {
|
|
||||||
return currentSecurityContext.isSecure();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getAuthenticationScheme() {
|
|
||||||
return "BASIC";
|
|
||||||
}
|
|
||||||
});
|
|
||||||
System.out.println("SecurityContext gesetzt für User: " + username);
|
|
||||||
System.out.println("User in Rolle user: " + requestContext.getSecurityContext().isUserInRole("user"));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private String[] extractCredentials(String authHeader) {
|
|
||||||
String base64Credentials = authHeader.substring("Basic ".length()).trim();
|
|
||||||
byte[] decoded = Base64.getDecoder().decode(base64Credentials);
|
|
||||||
String credentials = new String(decoded);
|
|
||||||
return credentials.split(":", 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void abortWithUnauthorized(ContainerRequestContext requestContext) {
|
|
||||||
requestContext.abortWith(Response
|
|
||||||
.status(Response.Status.UNAUTHORIZED)
|
|
||||||
.header(HttpHeaders.WWW_AUTHENTICATE, "Basic realm=\"TodoApp\"")
|
|
||||||
.build());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
package com.todoapp.security;
|
|
||||||
|
|
||||||
import jakarta.ws.rs.container.ContainerRequestContext;
|
|
||||||
import jakarta.ws.rs.container.ContainerResponseContext;
|
|
||||||
import jakarta.ws.rs.container.ContainerResponseFilter;
|
|
||||||
import jakarta.ws.rs.ext.Provider;
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
@Provider
|
|
||||||
public class CORSFilter implements ContainerResponseFilter {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
|
|
||||||
throws IOException {
|
|
||||||
responseContext.getHeaders().add("Access-Control-Allow-Origin", "*");
|
|
||||||
responseContext.getHeaders().add("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS");
|
|
||||||
responseContext.getHeaders().add("Access-Control-Allow-Headers", "Content-Type, Authorization");
|
|
||||||
responseContext.getHeaders().add("Access-Control-Max-Age", "86400");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,41 +0,0 @@
|
||||||
package com.todoapp.util;
|
|
||||||
|
|
||||||
import jakarta.enterprise.context.ApplicationScoped;
|
|
||||||
import jakarta.enterprise.inject.Produces;
|
|
||||||
import org.hibernate.SessionFactory;
|
|
||||||
import org.hibernate.cfg.Configuration;
|
|
||||||
|
|
||||||
@ApplicationScoped
|
|
||||||
public class HibernateUtil {
|
|
||||||
|
|
||||||
private static SessionFactory sessionFactory;
|
|
||||||
|
|
||||||
@Produces
|
|
||||||
@ApplicationScoped
|
|
||||||
public SessionFactory getSessionFactory() {
|
|
||||||
if (sessionFactory == null) {
|
|
||||||
try {
|
|
||||||
Configuration configuration = new Configuration();
|
|
||||||
configuration.setProperty("hibernate.connection.driver_class", "org.postgresql.Driver");
|
|
||||||
configuration.setProperty("hibernate.connection.url", "jdbc:postgresql://postgresdb:5432/todo_db");
|
|
||||||
configuration.setProperty("hibernate.connection.username", "postgres");
|
|
||||||
configuration.setProperty("hibernate.connection.password", "postgres");
|
|
||||||
|
|
||||||
// Entity-Klassen registrieren
|
|
||||||
configuration.addAnnotatedClass(com.todoapp.model.User.class);
|
|
||||||
configuration.addAnnotatedClass(com.todoapp.model.Todo.class);
|
|
||||||
|
|
||||||
sessionFactory = configuration.buildSessionFactory();
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return sessionFactory;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void shutdown() {
|
|
||||||
if (sessionFactory != null) {
|
|
||||||
sessionFactory.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<server description="OpenLiberty Todo App Server">
|
|
||||||
|
|
||||||
<featureManager>
|
|
||||||
<feature>servlet-6.0</feature>
|
|
||||||
<feature>pages-3.1</feature>
|
|
||||||
<feature>jdbc-4.2</feature>
|
|
||||||
<feature>jndi-1.0</feature>
|
|
||||||
<feature>monitor-1.0</feature>
|
|
||||||
<feature>restfulWS-3.1</feature>
|
|
||||||
<feature>jsonb-3.0</feature>
|
|
||||||
<feature>jsonp-2.1</feature>
|
|
||||||
<!-- <feature>appSecurity-5.0</feature> -->
|
|
||||||
<feature>transportSecurity-1.0</feature>
|
|
||||||
</featureManager>
|
|
||||||
|
|
||||||
<httpEndpoint id="defaultHttpEndpoint"
|
|
||||||
httpPort="9080"
|
|
||||||
httpsPort="9443" />
|
|
||||||
|
|
||||||
<applicationManager autoExpand="true" />
|
|
||||||
|
|
||||||
<dataSource id="PostgresDataSource" jndiName="jdbc/PostgresDataSource">
|
|
||||||
<jdbcDriver libraryRef="PostgresLib" />
|
|
||||||
<properties.postgresql serverName="${POSTGRES_HOST}"
|
|
||||||
portNumber="${POSTGRES_PORT}"
|
|
||||||
databaseName="${POSTGRES_DB}"
|
|
||||||
user="${POSTGRES_USER}"
|
|
||||||
password="${POSTGRES_PASSWORD}" />
|
|
||||||
</dataSource>
|
|
||||||
|
|
||||||
|
|
||||||
<library id="PostgresLib">
|
|
||||||
<fileset dir="${server.config.dir}/lib" includes="postgresql-*.jar" />
|
|
||||||
</library>
|
|
||||||
|
|
||||||
<webApplication location="todo-app.war" contextRoot="/todo-app" />
|
|
||||||
|
|
||||||
</server>
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
|
|
||||||
version="3.0">
|
|
||||||
<persistence-unit name="todoPU" transaction-type="RESOURCE_LOCAL">
|
|
||||||
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
|
|
||||||
<class>com.todoapp.model.User</class>
|
|
||||||
<class>com.todoapp.model.Todo</class>
|
|
||||||
<properties>
|
|
||||||
<property name="jakarta.persistence.jdbc.driver" value="org.postgresql.Driver"/>
|
|
||||||
<property name="jakarta.persistence.jdbc.url" value="jdbc:postgresql://postgresdb:5432/todo_db"/>
|
|
||||||
<property name="jakarta.persistence.jdbc.user" value="postgres"/>
|
|
||||||
<property name="jakarta.persistence.jdbc.password" value="postgres"/>
|
|
||||||
<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
|
|
||||||
<property name="hibernate.hbm2ddl.auto" value="update"/>
|
|
||||||
<property name="hibernate.show_sql" value="true"/>
|
|
||||||
</properties>
|
|
||||||
</persistence-unit>
|
|
||||||
</persistence>
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE hibernate-configuration PUBLIC
|
|
||||||
"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
|
|
||||||
"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
|
|
||||||
<hibernate-configuration>
|
|
||||||
<session-factory>
|
|
||||||
<!-- JNDI connection settings -->
|
|
||||||
<property name="hibernate.connection.datasource">jdbc/PostgresDataSource</property>
|
|
||||||
|
|
||||||
<!-- Select our SQL dialect -->
|
|
||||||
<property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
|
|
||||||
|
|
||||||
<!-- Echo the SQL to stdout -->
|
|
||||||
<property name="hibernate.show_sql">true</property>
|
|
||||||
|
|
||||||
<!-- Set the current session context -->
|
|
||||||
<property name="hibernate.current_session_context_class">thread</property>
|
|
||||||
|
|
||||||
<!-- Drop and re-create the database schema on startup -->
|
|
||||||
<property name="hibernate.hbm2ddl.auto">update</property>
|
|
||||||
|
|
||||||
<!-- Entity mapping -->
|
|
||||||
<mapping class="com.todoapp.model.User"/>
|
|
||||||
<mapping class="com.todoapp.model.Todo"/>
|
|
||||||
</session-factory>
|
|
||||||
</hibernate-configuration>
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
|
|
||||||
version="6.0">
|
|
||||||
|
|
||||||
<display-name>Todo Application</display-name>
|
|
||||||
|
|
||||||
<session-config>
|
|
||||||
<session-timeout>30</session-timeout>
|
|
||||||
</session-config>
|
|
||||||
</web-app>
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
.git
|
|
||||||
.github
|
|
||||||
.settings
|
|
||||||
target
|
|
||||||
*.iml
|
|
||||||
.idea
|
|
||||||
.vscode
|
|
||||||
node_modules
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
# Maven
|
|
||||||
target/
|
|
||||||
!.mvn/wrapper/maven-wrapper.jar
|
|
||||||
!**/src/main/**/target/
|
|
||||||
!**/src/test/**/target/
|
|
||||||
|
|
||||||
# IDE-spezifische Dateien
|
|
||||||
.idea/
|
|
||||||
*.iws
|
|
||||||
*.iml
|
|
||||||
*.ipr
|
|
||||||
.vscode/
|
|
||||||
.settings/
|
|
||||||
.classpath
|
|
||||||
.project
|
|
||||||
.factorypath
|
|
||||||
|
|
||||||
# Temporäre Dateien
|
|
||||||
*.log
|
|
||||||
*.tmp
|
|
||||||
*.temp
|
|
||||||
|
|
||||||
# Lokale Konfigurationsdateien
|
|
||||||
src/main/resources/application-local.properties
|
|
||||||
|
|
||||||
# Devcontainer Volumen
|
|
||||||
.devcontainer/postgres-data/
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
FROM mcr.microsoft.com/devcontainers/java:1-21-bullseye
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y curl maven
|
|
||||||
|
|
||||||
RUN curl -o /tmp/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.6.0.jar && \
|
|
||||||
mkdir -p /usr/local/lib/ && mv /tmp/postgresql.jar /usr/local/lib/postgresql.jar
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
COPY . .
|
|
||||||
|
|
||||||
RUN mvn clean install -DskipTests
|
|
||||||
|
|
||||||
CMD ["mvn", "spring-boot:run"]
|
|
||||||
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
{
|
|
||||||
"name": "Java & PostgreSQL",
|
|
||||||
"dockerComposeFile": "docker-compose.yml",
|
|
||||||
"service": "app",
|
|
||||||
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
|
|
||||||
"forwardPorts": [9080, 5432],
|
|
||||||
"postCreateCommand": "mvn clean install -DskipTests",
|
|
||||||
"remoteUser": "vscode",
|
|
||||||
"features": {
|
|
||||||
"ghcr.io/devcontainers-extra/features/maven-sdkman:2": {
|
|
||||||
"version": "latest"
|
|
||||||
},
|
|
||||||
"ghcr.io/devcontainers/features/git:1": { "version": "latest" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
services:
|
|
||||||
app:
|
|
||||||
container_name: javadev
|
|
||||||
build:
|
|
||||||
context: ../
|
|
||||||
dockerfile: .devcontainer/Dockerfile.dev
|
|
||||||
volumes:
|
|
||||||
- ../..:/workspaces:cached
|
|
||||||
- ./app:/app
|
|
||||||
environment:
|
|
||||||
POSTGRES_HOST: postgresdb
|
|
||||||
POSTGRES_PORT: 5432
|
|
||||||
POSTGRES_DB: postgres
|
|
||||||
POSTGRES_USER: postgres
|
|
||||||
POSTGRES_PASSWORD: postgres
|
|
||||||
networks:
|
|
||||||
- my_network
|
|
||||||
command: sleep infinity
|
|
||||||
|
|
||||||
db:
|
|
||||||
container_name: postgresdb
|
|
||||||
image: postgres:latest
|
|
||||||
restart: unless-stopped
|
|
||||||
volumes:
|
|
||||||
- postgres-data:/var/lib/postgresql/data
|
|
||||||
- ./init.sql:/docker-entrypoint-initdb.d/init.sql
|
|
||||||
environment:
|
|
||||||
POSTGRES_PASSWORD: postgres
|
|
||||||
POSTGRES_USER: postgres
|
|
||||||
POSTGRES_DB: todo_db
|
|
||||||
networks:
|
|
||||||
- my_network
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
postgres-data:
|
|
||||||
|
|
||||||
networks:
|
|
||||||
my_network:
|
|
||||||
driver: bridge
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
CREATE TABLE users (
|
|
||||||
id SERIAL PRIMARY KEY,
|
|
||||||
username VARCHAR(255) NOT NULL UNIQUE,
|
|
||||||
password VARCHAR(255) NOT NULL,
|
|
||||||
email VARCHAR(255) NOT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE todos (
|
|
||||||
id SERIAL PRIMARY KEY,
|
|
||||||
title VARCHAR(255) NOT NULL,
|
|
||||||
description VARCHAR(1000),
|
|
||||||
target_date DATE,
|
|
||||||
completed BOOLEAN,
|
|
||||||
user_id BIGINT NOT NULL,
|
|
||||||
FOREIGN KEY (user_id) REFERENCES users(id)
|
|
||||||
);
|
|
||||||
|
|
||||||
INSERT INTO users (username, password, email) VALUES
|
|
||||||
('test', '$2a$12$nt7xQKNDKZhxQFZGD5Wy0.Uh0wdPtWDgwfnWnPLgBWnQDGGkNLKBi', 'test@example.com');
|
|
||||||
24
cmd/jws/projects/spring-boot-todo/Dockerfile
Normal file
24
cmd/jws/projects/spring-boot-todo/Dockerfile
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
FROM maven:3.9-eclipse-temurin-17 as builder
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
COPY . .
|
||||||
|
# RUN mvn clean package
|
||||||
|
|
||||||
|
# Baue die Anwendung mit Maven
|
||||||
|
RUN mvn clean install -DskipTests
|
||||||
|
|
||||||
|
# Verwende ein schlankes OpenJDK-Image für die Ausführung
|
||||||
|
FROM openjdk:17-jdk-slim
|
||||||
|
|
||||||
|
# Setze das Arbeitsverzeichnis im Container
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Kopiere die JAR-Datei aus dem Builder-Image
|
||||||
|
COPY --from=builder /app/target/*.jar app.jar
|
||||||
|
|
||||||
|
# Mache Port 8080 im Container verfügbar (oder den Port, den deine Anwendung verwendet)
|
||||||
|
EXPOSE 8090
|
||||||
|
|
||||||
|
# Definiere den Befehl zum Ausführen der Anwendung
|
||||||
|
ENTRYPOINT ["java", "-jar", "app.jar"]
|
||||||
|
|
||||||
36
cmd/jws/projects/spring-boot-todo/compose.yaml
Normal file
36
cmd/jws/projects/spring-boot-todo/compose.yaml
Normal file
|
|
@ -0,0 +1,36 @@
|
||||||
|
version: "3.8"
|
||||||
|
services:
|
||||||
|
db:
|
||||||
|
image: postgres:latest
|
||||||
|
container_name: todolist-db
|
||||||
|
restart: unless-stopped
|
||||||
|
environment:
|
||||||
|
POSTGRES_DB: todolist
|
||||||
|
POSTGRES_USER: myuser
|
||||||
|
POSTGRES_PASSWORD: mypassword
|
||||||
|
ports:
|
||||||
|
- "5432:5432"
|
||||||
|
volumes:
|
||||||
|
- db_data:/var/lib/postgresql/data
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U myuser -d todolist"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
|
||||||
|
app:
|
||||||
|
build: .
|
||||||
|
container_name: todo-spring-app
|
||||||
|
ports:
|
||||||
|
- "8090:8090"
|
||||||
|
depends_on:
|
||||||
|
db:
|
||||||
|
condition: service_healthy
|
||||||
|
environment:
|
||||||
|
SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/todolist
|
||||||
|
SPRING_DATASOURCE_USERNAME: myuser
|
||||||
|
SPRING_DATASOURCE_PASSWORD: mypassword
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
db_data:
|
||||||
259
cmd/jws/projects/spring-boot-todo/mvnw
vendored
Executable file
259
cmd/jws/projects/spring-boot-todo/mvnw
vendored
Executable file
|
|
@ -0,0 +1,259 @@
|
||||||
|
#!/bin/sh
|
||||||
|
# ----------------------------------------------------------------------------
|
||||||
|
# Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
# or more contributor license agreements. See the NOTICE file
|
||||||
|
# distributed with this work for additional information
|
||||||
|
# regarding copyright ownership. The ASF licenses this file
|
||||||
|
# to you 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.
|
||||||
|
# ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
# ----------------------------------------------------------------------------
|
||||||
|
# Apache Maven Wrapper startup batch script, version 3.3.2
|
||||||
|
#
|
||||||
|
# Optional ENV vars
|
||||||
|
# -----------------
|
||||||
|
# JAVA_HOME - location of a JDK home dir, required when download maven via java source
|
||||||
|
# MVNW_REPOURL - repo url base for downloading maven distribution
|
||||||
|
# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
|
||||||
|
# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
|
||||||
|
# ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
set -euf
|
||||||
|
[ "${MVNW_VERBOSE-}" != debug ] || set -x
|
||||||
|
|
||||||
|
# OS specific support.
|
||||||
|
native_path() { printf %s\\n "$1"; }
|
||||||
|
case "$(uname)" in
|
||||||
|
CYGWIN* | MINGW*)
|
||||||
|
[ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
|
||||||
|
native_path() { cygpath --path --windows "$1"; }
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# set JAVACMD and JAVACCMD
|
||||||
|
set_java_home() {
|
||||||
|
# For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
|
||||||
|
if [ -n "${JAVA_HOME-}" ]; then
|
||||||
|
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
|
||||||
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
|
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||||
|
JAVACCMD="$JAVA_HOME/jre/sh/javac"
|
||||||
|
else
|
||||||
|
JAVACMD="$JAVA_HOME/bin/java"
|
||||||
|
JAVACCMD="$JAVA_HOME/bin/javac"
|
||||||
|
|
||||||
|
if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
|
||||||
|
echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
|
||||||
|
echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
JAVACMD="$(
|
||||||
|
'set' +e
|
||||||
|
'unset' -f command 2>/dev/null
|
||||||
|
'command' -v java
|
||||||
|
)" || :
|
||||||
|
JAVACCMD="$(
|
||||||
|
'set' +e
|
||||||
|
'unset' -f command 2>/dev/null
|
||||||
|
'command' -v javac
|
||||||
|
)" || :
|
||||||
|
|
||||||
|
if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
|
||||||
|
echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# hash string like Java String::hashCode
|
||||||
|
hash_string() {
|
||||||
|
str="${1:-}" h=0
|
||||||
|
while [ -n "$str" ]; do
|
||||||
|
char="${str%"${str#?}"}"
|
||||||
|
h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
|
||||||
|
str="${str#?}"
|
||||||
|
done
|
||||||
|
printf %x\\n $h
|
||||||
|
}
|
||||||
|
|
||||||
|
verbose() { :; }
|
||||||
|
[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
|
||||||
|
|
||||||
|
die() {
|
||||||
|
printf %s\\n "$1" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
trim() {
|
||||||
|
# MWRAPPER-139:
|
||||||
|
# Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
|
||||||
|
# Needed for removing poorly interpreted newline sequences when running in more
|
||||||
|
# exotic environments such as mingw bash on Windows.
|
||||||
|
printf "%s" "${1}" | tr -d '[:space:]'
|
||||||
|
}
|
||||||
|
|
||||||
|
# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
|
||||||
|
while IFS="=" read -r key value; do
|
||||||
|
case "${key-}" in
|
||||||
|
distributionUrl) distributionUrl=$(trim "${value-}") ;;
|
||||||
|
distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
|
||||||
|
esac
|
||||||
|
done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
|
||||||
|
[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
|
||||||
|
|
||||||
|
case "${distributionUrl##*/}" in
|
||||||
|
maven-mvnd-*bin.*)
|
||||||
|
MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
|
||||||
|
case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
|
||||||
|
*AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
|
||||||
|
:Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
|
||||||
|
:Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
|
||||||
|
:Linux*x86_64*) distributionPlatform=linux-amd64 ;;
|
||||||
|
*)
|
||||||
|
echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
|
||||||
|
distributionPlatform=linux-amd64
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
|
||||||
|
;;
|
||||||
|
maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
|
||||||
|
*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# apply MVNW_REPOURL and calculate MAVEN_HOME
|
||||||
|
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
|
||||||
|
[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
|
||||||
|
distributionUrlName="${distributionUrl##*/}"
|
||||||
|
distributionUrlNameMain="${distributionUrlName%.*}"
|
||||||
|
distributionUrlNameMain="${distributionUrlNameMain%-bin}"
|
||||||
|
MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
|
||||||
|
MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
|
||||||
|
|
||||||
|
exec_maven() {
|
||||||
|
unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
|
||||||
|
exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ -d "$MAVEN_HOME" ]; then
|
||||||
|
verbose "found existing MAVEN_HOME at $MAVEN_HOME"
|
||||||
|
exec_maven "$@"
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "${distributionUrl-}" in
|
||||||
|
*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
|
||||||
|
*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# prepare tmp dir
|
||||||
|
if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
|
||||||
|
clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
|
||||||
|
trap clean HUP INT TERM EXIT
|
||||||
|
else
|
||||||
|
die "cannot create temp dir"
|
||||||
|
fi
|
||||||
|
|
||||||
|
mkdir -p -- "${MAVEN_HOME%/*}"
|
||||||
|
|
||||||
|
# Download and Install Apache Maven
|
||||||
|
verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
|
||||||
|
verbose "Downloading from: $distributionUrl"
|
||||||
|
verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
|
||||||
|
|
||||||
|
# select .zip or .tar.gz
|
||||||
|
if ! command -v unzip >/dev/null; then
|
||||||
|
distributionUrl="${distributionUrl%.zip}.tar.gz"
|
||||||
|
distributionUrlName="${distributionUrl##*/}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# verbose opt
|
||||||
|
__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
|
||||||
|
[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
|
||||||
|
|
||||||
|
# normalize http auth
|
||||||
|
case "${MVNW_PASSWORD:+has-password}" in
|
||||||
|
'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
|
||||||
|
has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
|
||||||
|
verbose "Found wget ... using wget"
|
||||||
|
wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
|
||||||
|
elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
|
||||||
|
verbose "Found curl ... using curl"
|
||||||
|
curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
|
||||||
|
elif set_java_home; then
|
||||||
|
verbose "Falling back to use Java to download"
|
||||||
|
javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
|
||||||
|
targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
|
||||||
|
cat >"$javaSource" <<-END
|
||||||
|
public class Downloader extends java.net.Authenticator
|
||||||
|
{
|
||||||
|
protected java.net.PasswordAuthentication getPasswordAuthentication()
|
||||||
|
{
|
||||||
|
return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
|
||||||
|
}
|
||||||
|
public static void main( String[] args ) throws Exception
|
||||||
|
{
|
||||||
|
setDefault( new Downloader() );
|
||||||
|
java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
END
|
||||||
|
# For Cygwin/MinGW, switch paths to Windows format before running javac and java
|
||||||
|
verbose " - Compiling Downloader.java ..."
|
||||||
|
"$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
|
||||||
|
verbose " - Running Downloader.java ..."
|
||||||
|
"$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If specified, validate the SHA-256 sum of the Maven distribution zip file
|
||||||
|
if [ -n "${distributionSha256Sum-}" ]; then
|
||||||
|
distributionSha256Result=false
|
||||||
|
if [ "$MVN_CMD" = mvnd.sh ]; then
|
||||||
|
echo "Checksum validation is not supported for maven-mvnd." >&2
|
||||||
|
echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
|
||||||
|
exit 1
|
||||||
|
elif command -v sha256sum >/dev/null; then
|
||||||
|
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then
|
||||||
|
distributionSha256Result=true
|
||||||
|
fi
|
||||||
|
elif command -v shasum >/dev/null; then
|
||||||
|
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
|
||||||
|
distributionSha256Result=true
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
|
||||||
|
echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [ $distributionSha256Result = false ]; then
|
||||||
|
echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
|
||||||
|
echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# unzip and move
|
||||||
|
if command -v unzip >/dev/null; then
|
||||||
|
unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
|
||||||
|
else
|
||||||
|
tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
|
||||||
|
fi
|
||||||
|
printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url"
|
||||||
|
mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
|
||||||
|
|
||||||
|
clean || :
|
||||||
|
exec_maven "$@"
|
||||||
149
cmd/jws/projects/spring-boot-todo/mvnw.cmd
vendored
Normal file
149
cmd/jws/projects/spring-boot-todo/mvnw.cmd
vendored
Normal file
|
|
@ -0,0 +1,149 @@
|
||||||
|
<# : batch portion
|
||||||
|
@REM ----------------------------------------------------------------------------
|
||||||
|
@REM Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
@REM or more contributor license agreements. See the NOTICE file
|
||||||
|
@REM distributed with this work for additional information
|
||||||
|
@REM regarding copyright ownership. The ASF licenses this file
|
||||||
|
@REM to you under the Apache License, Version 2.0 (the
|
||||||
|
@REM "License"); you may not use this file except in compliance
|
||||||
|
@REM with the License. You may obtain a copy of the License at
|
||||||
|
@REM
|
||||||
|
@REM http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
@REM
|
||||||
|
@REM Unless required by applicable law or agreed to in writing,
|
||||||
|
@REM software distributed under the License is distributed on an
|
||||||
|
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
@REM KIND, either express or implied. See the License for the
|
||||||
|
@REM specific language governing permissions and limitations
|
||||||
|
@REM under the License.
|
||||||
|
@REM ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@REM ----------------------------------------------------------------------------
|
||||||
|
@REM Apache Maven Wrapper startup batch script, version 3.3.2
|
||||||
|
@REM
|
||||||
|
@REM Optional ENV vars
|
||||||
|
@REM MVNW_REPOURL - repo url base for downloading maven distribution
|
||||||
|
@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
|
||||||
|
@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
|
||||||
|
@REM ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
|
||||||
|
@SET __MVNW_CMD__=
|
||||||
|
@SET __MVNW_ERROR__=
|
||||||
|
@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
|
||||||
|
@SET PSModulePath=
|
||||||
|
@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
|
||||||
|
IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
|
||||||
|
)
|
||||||
|
@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
|
||||||
|
@SET __MVNW_PSMODULEP_SAVE=
|
||||||
|
@SET __MVNW_ARG0_NAME__=
|
||||||
|
@SET MVNW_USERNAME=
|
||||||
|
@SET MVNW_PASSWORD=
|
||||||
|
@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
|
||||||
|
@echo Cannot start maven from wrapper >&2 && exit /b 1
|
||||||
|
@GOTO :EOF
|
||||||
|
: end batch / begin powershell #>
|
||||||
|
|
||||||
|
$ErrorActionPreference = "Stop"
|
||||||
|
if ($env:MVNW_VERBOSE -eq "true") {
|
||||||
|
$VerbosePreference = "Continue"
|
||||||
|
}
|
||||||
|
|
||||||
|
# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
|
||||||
|
$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
|
||||||
|
if (!$distributionUrl) {
|
||||||
|
Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
|
||||||
|
}
|
||||||
|
|
||||||
|
switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
|
||||||
|
"maven-mvnd-*" {
|
||||||
|
$USE_MVND = $true
|
||||||
|
$distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
|
||||||
|
$MVN_CMD = "mvnd.cmd"
|
||||||
|
break
|
||||||
|
}
|
||||||
|
default {
|
||||||
|
$USE_MVND = $false
|
||||||
|
$MVN_CMD = $script -replace '^mvnw','mvn'
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# apply MVNW_REPOURL and calculate MAVEN_HOME
|
||||||
|
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
|
||||||
|
if ($env:MVNW_REPOURL) {
|
||||||
|
$MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
|
||||||
|
$distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
|
||||||
|
}
|
||||||
|
$distributionUrlName = $distributionUrl -replace '^.*/',''
|
||||||
|
$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
|
||||||
|
$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
|
||||||
|
if ($env:MAVEN_USER_HOME) {
|
||||||
|
$MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
|
||||||
|
}
|
||||||
|
$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
|
||||||
|
$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
|
||||||
|
|
||||||
|
if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
|
||||||
|
Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
|
||||||
|
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
|
||||||
|
exit $?
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
|
||||||
|
Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
|
||||||
|
}
|
||||||
|
|
||||||
|
# prepare tmp dir
|
||||||
|
$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
|
||||||
|
$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
|
||||||
|
$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
|
||||||
|
trap {
|
||||||
|
if ($TMP_DOWNLOAD_DIR.Exists) {
|
||||||
|
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
|
||||||
|
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
|
||||||
|
|
||||||
|
# Download and Install Apache Maven
|
||||||
|
Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
|
||||||
|
Write-Verbose "Downloading from: $distributionUrl"
|
||||||
|
Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
|
||||||
|
|
||||||
|
$webclient = New-Object System.Net.WebClient
|
||||||
|
if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
|
||||||
|
$webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
|
||||||
|
}
|
||||||
|
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
|
||||||
|
$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
|
||||||
|
|
||||||
|
# If specified, validate the SHA-256 sum of the Maven distribution zip file
|
||||||
|
$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
|
||||||
|
if ($distributionSha256Sum) {
|
||||||
|
if ($USE_MVND) {
|
||||||
|
Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
|
||||||
|
}
|
||||||
|
Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
|
||||||
|
if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
|
||||||
|
Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# unzip and move
|
||||||
|
Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
|
||||||
|
Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
|
||||||
|
try {
|
||||||
|
Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
|
||||||
|
} catch {
|
||||||
|
if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
|
||||||
|
Write-Error "fail to move MAVEN_HOME"
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
|
||||||
|
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
|
||||||
|
}
|
||||||
|
|
||||||
|
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
|
||||||
|
|
@ -1,87 +1,63 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
<artifactId>spring-boot-starter-parent</artifactId>
|
||||||
<version>3.2.0</version>
|
<version>3.4.3</version>
|
||||||
<relativePath/> <!-- lookup parent from repository -->
|
<relativePath/> <!-- lookup parent from repository -->
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>com.todoapp</groupId>
|
<groupId>com.example</groupId>
|
||||||
<artifactId>spring-todo-app</artifactId>
|
<artifactId>todo-spring</artifactId>
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
<version>0.0.1-SNAPSHOT</version>
|
||||||
<name>spring-todo-app</name>
|
<name>todo-spring</name>
|
||||||
<description>Spring Boot Todo App</description>
|
<description>Demo Todo App for Spring Boot</description>
|
||||||
|
<url/>
|
||||||
<properties>
|
<licenses>
|
||||||
<java.version>17</java.version>
|
<license/>
|
||||||
</properties>
|
</licenses>
|
||||||
|
<developers>
|
||||||
<dependencies>
|
<developer/>
|
||||||
<!-- Spring Boot Starter Web für REST APIs -->
|
</developers>
|
||||||
<dependency>
|
<scm>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<connection/>
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
<developerConnection/>
|
||||||
</dependency>
|
<tag/>
|
||||||
|
<url/>
|
||||||
<!-- Spring Data JPA (ersetzt direkte Hibernate-Verwendung) -->
|
</scm>
|
||||||
<dependency>
|
<properties>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<java.version>17</java.version>
|
||||||
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
</properties>
|
||||||
</dependency>
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
<!-- Spring Security für Authentifizierung -->
|
<groupId>org.springframework.boot</groupId>
|
||||||
<dependency>
|
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
||||||
<groupId>org.springframework.boot</groupId>
|
</dependency>
|
||||||
<artifactId>spring-boot-starter-security</artifactId>
|
<dependency>
|
||||||
</dependency>
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-web</artifactId>
|
||||||
<!-- PostgreSQL Treiber -->
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.postgresql</groupId>
|
<dependency>
|
||||||
<artifactId>postgresql</artifactId>
|
<groupId>org.postgresql</groupId>
|
||||||
<scope>runtime</scope>
|
<artifactId>postgresql</artifactId>
|
||||||
</dependency>
|
<scope>runtime</scope>
|
||||||
|
</dependency>
|
||||||
<!-- BCrypt für Passwort-Hashing -->
|
<dependency>
|
||||||
<dependency>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<groupId>at.favre.lib</groupId>
|
<artifactId>spring-boot-starter-test</artifactId>
|
||||||
<artifactId>bcrypt</artifactId>
|
<scope>test</scope>
|
||||||
<version>0.10.2</version>
|
</dependency>
|
||||||
</dependency>
|
</dependencies>
|
||||||
|
|
||||||
<!-- Jackson für JSON -->
|
<build>
|
||||||
<dependency>
|
<plugins>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<plugin>
|
||||||
<artifactId>spring-boot-starter-json</artifactId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
</dependency>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
<!-- Validation API -->
|
</plugins>
|
||||||
<dependency>
|
</build>
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-validation</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- Test Dependencies -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.security</groupId>
|
|
||||||
<artifactId>spring-security-test</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
package com.example.todo_spring;
|
||||||
|
|
||||||
|
import org.springframework.boot.SpringApplication;
|
||||||
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
|
||||||
|
@SpringBootApplication
|
||||||
|
public class TodoSpringApplication {
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
SpringApplication.run(TodoSpringApplication.class, args);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,50 @@
|
||||||
|
package com.example.todo_spring.controllers;
|
||||||
|
|
||||||
|
import com.example.todo_spring.models.Task;
|
||||||
|
import com.example.todo_spring.services.TaskService;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.stereotype.Controller;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Controller
|
||||||
|
@RequestMapping("/api/v1/tasks")
|
||||||
|
public class TaskController {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private TaskService taskService;
|
||||||
|
|
||||||
|
@GetMapping("/")
|
||||||
|
public ResponseEntity<List<Task>> getAllTasks() {
|
||||||
|
return ResponseEntity.ok(taskService.getAllTask());
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/completed")
|
||||||
|
public ResponseEntity<List<Task>> getAllCompletedTasks() {
|
||||||
|
return ResponseEntity.ok(taskService.findAllCompletedTask());
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/incomplete")
|
||||||
|
public ResponseEntity<List<Task>> getAllIncompleteTasks() {
|
||||||
|
return ResponseEntity.ok(taskService.findAllInCompleteTask());
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/")
|
||||||
|
public ResponseEntity<Task> createTask(@RequestBody Task task) {
|
||||||
|
return ResponseEntity.ok(taskService.createNewTask(task));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/{id}")
|
||||||
|
public ResponseEntity<Task> updateTask(@PathVariable Long id, @RequestBody Task task) {
|
||||||
|
task.setId(id);
|
||||||
|
return ResponseEntity.ok(taskService.updateTask(task));
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/{id}")
|
||||||
|
public ResponseEntity<Boolean> getAllTasks(@PathVariable Long id) {
|
||||||
|
taskService.deleteTaskById(id);
|
||||||
|
return ResponseEntity.ok(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,46 @@
|
||||||
|
package com.example.todo_spring.models;
|
||||||
|
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
public class Task {
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
|
private Long id;
|
||||||
|
private String task;
|
||||||
|
private boolean completed;
|
||||||
|
|
||||||
|
public Task(String task, boolean completed) {
|
||||||
|
this.task = task;
|
||||||
|
this.completed = completed;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task() {
|
||||||
|
this.task = "";
|
||||||
|
this.completed = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setId(Long id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getTask() {
|
||||||
|
return task;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTask(String task) {
|
||||||
|
this.task = task;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isCompleted() {
|
||||||
|
return completed;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCompleted(boolean completed) {
|
||||||
|
this.completed = completed;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,20 @@
|
||||||
|
package com.example.todo_spring.repositories;
|
||||||
|
|
||||||
|
import com.example.todo_spring.models.Task;
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public interface TaskRepository extends JpaRepository<Task, Long> {
|
||||||
|
public Task findByTask(String task);
|
||||||
|
|
||||||
|
public List<Task> findByCompletedTrue();
|
||||||
|
|
||||||
|
public List<Task> findByCompletedFalse();
|
||||||
|
|
||||||
|
public List<Task> findAll();
|
||||||
|
|
||||||
|
public Task getById(Long id);
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,47 @@
|
||||||
|
package com.example.todo_spring.services;
|
||||||
|
|
||||||
|
import com.example.todo_spring.models.Task;
|
||||||
|
import com.example.todo_spring.repositories.TaskRepository;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class TaskService {
|
||||||
|
@Autowired
|
||||||
|
private TaskRepository taskRepository;
|
||||||
|
|
||||||
|
public Task createNewTask(Task task) {
|
||||||
|
return taskRepository.save(task);
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<Task> getAllTask() {
|
||||||
|
return taskRepository.findAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task findTaskById(Long id) {
|
||||||
|
return taskRepository.getById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<Task> findAllCompletedTask() {
|
||||||
|
return taskRepository.findByCompletedTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<Task> findAllInCompleteTask() {
|
||||||
|
return taskRepository.findByCompletedFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void deleteTask(Task task) {
|
||||||
|
taskRepository.delete(task);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void deleteTaskById(Long id) {
|
||||||
|
Task task = taskRepository.getById(id);
|
||||||
|
taskRepository.delete(task);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task updateTask(Task task) {
|
||||||
|
return taskRepository.save(task);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
package com.todoapp;
|
|
||||||
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
||||||
|
|
||||||
@SpringBootApplication
|
|
||||||
public class TodoAppApplication {
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
SpringApplication.run(TodoAppApplication.class, args);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,91 +0,0 @@
|
||||||
package com.todoapp.controller;
|
|
||||||
|
|
||||||
import com.todoapp.dto.LoginRequest;
|
|
||||||
import com.todoapp.dto.RegistrationRequest;
|
|
||||||
import com.todoapp.model.User;
|
|
||||||
import com.todoapp.service.UserService;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.security.authentication.AuthenticationManager;
|
|
||||||
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
|
||||||
import org.springframework.security.core.Authentication;
|
|
||||||
import org.springframework.security.core.context.SecurityContextHolder;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/api/auth")
|
|
||||||
public class AuthController {
|
|
||||||
|
|
||||||
private final UserService userService;
|
|
||||||
private final AuthenticationManager authenticationManager;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
public AuthController(UserService userService, AuthenticationManager authenticationManager) {
|
|
||||||
this.userService = userService;
|
|
||||||
this.authenticationManager = authenticationManager;
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/register")
|
|
||||||
public ResponseEntity<?> register(@RequestBody RegistrationRequest request) {
|
|
||||||
if (request.getUsername() == null || request.getPassword() == null || request.getEmail() == null) {
|
|
||||||
Map<String, String> response = new HashMap<>();
|
|
||||||
response.put("error", "Username, password, and email are required");
|
|
||||||
return ResponseEntity.badRequest().body(response);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (userService.usernameExists(request.getUsername())) {
|
|
||||||
Map<String, String> response = new HashMap<>();
|
|
||||||
response.put("error", "Username already exists");
|
|
||||||
return ResponseEntity.status(HttpStatus.CONFLICT).body(response);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (userService.emailExists(request.getEmail())) {
|
|
||||||
Map<String, String> response = new HashMap<>();
|
|
||||||
response.put("error", "Email already exists");
|
|
||||||
return ResponseEntity.status(HttpStatus.CONFLICT).body(response);
|
|
||||||
}
|
|
||||||
|
|
||||||
User user = new User(request.getUsername(), request.getPassword(), request.getEmail());
|
|
||||||
userService.saveUser(user);
|
|
||||||
|
|
||||||
Map<String, String> response = new HashMap<>();
|
|
||||||
response.put("message", "User registered successfully");
|
|
||||||
return ResponseEntity.status(HttpStatus.CREATED).body(response);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/login")
|
|
||||||
public ResponseEntity<?> login(@RequestBody LoginRequest request) {
|
|
||||||
if (request.getUsername() == null || request.getPassword() == null) {
|
|
||||||
Map<String, String> response = new HashMap<>();
|
|
||||||
response.put("error", "Username and password are required");
|
|
||||||
return ResponseEntity.badRequest().body(response);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
Authentication authentication = authenticationManager.authenticate(
|
|
||||||
new UsernamePasswordAuthenticationToken(request.getUsername(), request.getPassword()));
|
|
||||||
|
|
||||||
SecurityContextHolder.getContext().setAuthentication(authentication);
|
|
||||||
|
|
||||||
User user = userService.getUserByUsername(request.getUsername())
|
|
||||||
.orElseThrow(() -> new RuntimeException("User not found"));
|
|
||||||
|
|
||||||
Map<String, String> response = new HashMap<>();
|
|
||||||
response.put("message", "Login successful");
|
|
||||||
response.put("username", user.getUsername());
|
|
||||||
response.put("email", user.getEmail());
|
|
||||||
|
|
||||||
return ResponseEntity.ok(response);
|
|
||||||
} catch (Exception e) {
|
|
||||||
Map<String, String> response = new HashMap<>();
|
|
||||||
response.put("error", "Invalid credentials");
|
|
||||||
return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(response);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,144 +0,0 @@
|
||||||
package com.todoapp.controller;
|
|
||||||
|
|
||||||
import com.todoapp.model.Todo;
|
|
||||||
import com.todoapp.service.TodoService;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.security.core.Authentication;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/api/todos")
|
|
||||||
public class TodoController {
|
|
||||||
|
|
||||||
private final TodoService todoService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
public TodoController(TodoService todoService) {
|
|
||||||
this.todoService = todoService;
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping
|
|
||||||
public ResponseEntity<List<Todo>> getAllTodos(Authentication authentication) {
|
|
||||||
String username = authentication.getName();
|
|
||||||
List<Todo> todos = todoService.getTodosByUsername(username);
|
|
||||||
return ResponseEntity.ok(todos);
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/{id}")
|
|
||||||
public ResponseEntity<Todo> getTodoById(@PathVariable("id") Long id, Authentication authentication) {
|
|
||||||
String username = authentication.getName();
|
|
||||||
Optional<Todo> todoOptional = todoService.getTodoById(id);
|
|
||||||
if (todoOptional.isPresent()) {
|
|
||||||
Todo todo = todoOptional.get();
|
|
||||||
if (!todo.getUser().getUsername().equals(username)) {
|
|
||||||
return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
|
|
||||||
}
|
|
||||||
return ResponseEntity.ok(todo);
|
|
||||||
} else {
|
|
||||||
return ResponseEntity.notFound().build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/completed")
|
|
||||||
public ResponseEntity<List<Todo>> getCompletedTodos(Authentication authentication) {
|
|
||||||
String username = authentication.getName();
|
|
||||||
List<Todo> todos = todoService.getCompletedTodosByUsername(username);
|
|
||||||
return ResponseEntity.ok(todos);
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/incomplete")
|
|
||||||
public ResponseEntity<List<Todo>> getIncompleteTodos(Authentication authentication) {
|
|
||||||
String username = authentication.getName();
|
|
||||||
List<Todo> todos = todoService.getIncompleteTodosByUsername(username);
|
|
||||||
return ResponseEntity.ok(todos);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping
|
|
||||||
public ResponseEntity<Todo> createTodo(@RequestBody Todo todo, Authentication authentication) {
|
|
||||||
String username = authentication.getName();
|
|
||||||
Todo savedTodo = todoService.saveTodo(todo, username);
|
|
||||||
return ResponseEntity.status(HttpStatus.CREATED).body(savedTodo);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PutMapping("/{id}")
|
|
||||||
public ResponseEntity<Todo> updateTodo(@PathVariable("id") Long id, @RequestBody Todo updatedTodo,
|
|
||||||
Authentication authentication) {
|
|
||||||
String username = authentication.getName();
|
|
||||||
|
|
||||||
Optional<Todo> existingTodoOptional = todoService.getTodoById(id);
|
|
||||||
|
|
||||||
if (existingTodoOptional.isPresent()) {
|
|
||||||
Todo existingTodo = existingTodoOptional.get();
|
|
||||||
|
|
||||||
if (!existingTodo.getUser().getUsername().equals(username)) {
|
|
||||||
return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
updatedTodo.setId(id);
|
|
||||||
updatedTodo.setUser(existingTodo.getUser());
|
|
||||||
|
|
||||||
Optional<Todo> updatedTodoOptional = todoService.updateTodo(updatedTodo);
|
|
||||||
if (updatedTodoOptional.isPresent()) {
|
|
||||||
return ResponseEntity.ok(updatedTodoOptional.get());
|
|
||||||
} else {
|
|
||||||
return ResponseEntity.notFound().build();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return ResponseEntity.notFound().build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@DeleteMapping("/{id}")
|
|
||||||
public ResponseEntity<Void> deleteTodo(@PathVariable("id") Long id, Authentication authentication) {
|
|
||||||
String username = authentication.getName();
|
|
||||||
|
|
||||||
Optional<Todo> todoOptional = todoService.getTodoById(id);
|
|
||||||
|
|
||||||
if (todoOptional.isPresent()) {
|
|
||||||
Todo todo = todoOptional.get();
|
|
||||||
|
|
||||||
if (!todo.getUser().getUsername().equals(username)) {
|
|
||||||
return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean isDeleted = todoService.deleteTodo(id);
|
|
||||||
if (isDeleted) {
|
|
||||||
return ResponseEntity.noContent().build();
|
|
||||||
} else {
|
|
||||||
return ResponseEntity.notFound().build();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return ResponseEntity.notFound().build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@PutMapping("/{id}/complete")
|
|
||||||
public ResponseEntity<Todo> markTodoComplete(@PathVariable("id") Long id, Authentication authentication) {
|
|
||||||
String username = authentication.getName();
|
|
||||||
|
|
||||||
Optional<Todo> todoOptional = todoService.getTodoById(id);
|
|
||||||
|
|
||||||
if (todoOptional.isPresent()) {
|
|
||||||
Todo todo = todoOptional.get();
|
|
||||||
|
|
||||||
if (!todo.getUser().getUsername().equals(username)) {
|
|
||||||
return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
todo.setCompleted(true);
|
|
||||||
|
|
||||||
Optional<Todo> updatedTodoOptional = todoService.updateTodo(todo);
|
|
||||||
if (updatedTodoOptional.isPresent()) {
|
|
||||||
return ResponseEntity.ok(updatedTodoOptional.get());
|
|
||||||
} else {
|
|
||||||
return ResponseEntity.notFound().build();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return ResponseEntity.notFound().build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
package com.todoapp.dto;
|
|
||||||
|
|
||||||
public class LoginRequest {
|
|
||||||
private String username;
|
|
||||||
private String password;
|
|
||||||
|
|
||||||
// Getter und Setter
|
|
||||||
public String getUsername() {
|
|
||||||
return username;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUsername(String username) {
|
|
||||||
this.username = username;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getPassword() {
|
|
||||||
return password;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPassword(String password) {
|
|
||||||
this.password = password;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
package com.todoapp.dto;
|
|
||||||
|
|
||||||
public class RegistrationRequest {
|
|
||||||
private String username;
|
|
||||||
private String password;
|
|
||||||
private String email;
|
|
||||||
|
|
||||||
// Getter und Setter
|
|
||||||
public String getUsername() {
|
|
||||||
return username;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUsername(String username) {
|
|
||||||
this.username = username;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getPassword() {
|
|
||||||
return password;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPassword(String password) {
|
|
||||||
this.password = password;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getEmail() {
|
|
||||||
return email;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setEmail(String email) {
|
|
||||||
this.email = email;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,109 +0,0 @@
|
||||||
package com.todoapp.model;
|
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
@Entity
|
|
||||||
@Table(name = "todos")
|
|
||||||
public class Todo implements Serializable {
|
|
||||||
|
|
||||||
@Id
|
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
@Column(nullable = false)
|
|
||||||
private String title;
|
|
||||||
|
|
||||||
@Column(length = 1000)
|
|
||||||
private String description;
|
|
||||||
|
|
||||||
@Column(name = "target_date")
|
|
||||||
@Temporal(TemporalType.DATE)
|
|
||||||
private Date targetDate;
|
|
||||||
|
|
||||||
@Column
|
|
||||||
private boolean completed;
|
|
||||||
|
|
||||||
@ManyToOne(fetch = FetchType.LAZY)
|
|
||||||
@JoinColumn(name = "user_id", nullable = false)
|
|
||||||
@JsonIgnore
|
|
||||||
private User user;
|
|
||||||
|
|
||||||
// Konstruktoren
|
|
||||||
public Todo() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public Todo(String title, String description, Date targetDate, boolean completed) {
|
|
||||||
this.title = title;
|
|
||||||
this.description = description;
|
|
||||||
this.targetDate = targetDate;
|
|
||||||
this.completed = completed;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Getter und Setter
|
|
||||||
public Long getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setId(Long id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getTitle() {
|
|
||||||
return title;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTitle(String title) {
|
|
||||||
this.title = title;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getDescription() {
|
|
||||||
return description;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDescription(String description) {
|
|
||||||
this.description = description;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Date getTargetDate() {
|
|
||||||
return targetDate;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTargetDate(Date targetDate) {
|
|
||||||
this.targetDate = targetDate;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isCompleted() {
|
|
||||||
return completed;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCompleted(boolean completed) {
|
|
||||||
this.completed = completed;
|
|
||||||
}
|
|
||||||
|
|
||||||
public User getUser() {
|
|
||||||
return user;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUser(User user) {
|
|
||||||
this.user = user;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Zusätzliche Methode für REST-Antworten
|
|
||||||
public Long getUserId() {
|
|
||||||
return user != null ? user.getId() : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "Todo{" +
|
|
||||||
"id=" + id +
|
|
||||||
", title='" + title + '\'' +
|
|
||||||
", description='" + description + '\'' +
|
|
||||||
", targetDate=" + targetDate +
|
|
||||||
", completed=" + completed +
|
|
||||||
'}';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,101 +0,0 @@
|
||||||
package com.todoapp.model;
|
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Entity
|
|
||||||
@Table(name = "users")
|
|
||||||
public class User implements Serializable {
|
|
||||||
|
|
||||||
@Id
|
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
@Column(nullable = false, unique = true)
|
|
||||||
private String username;
|
|
||||||
|
|
||||||
@Column(nullable = false)
|
|
||||||
@JsonIgnore // Verhindert, dass das Passwort in JSON serialisiert wird
|
|
||||||
private String password;
|
|
||||||
|
|
||||||
@Column(nullable = false)
|
|
||||||
private String email;
|
|
||||||
|
|
||||||
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
|
||||||
@JsonIgnore
|
|
||||||
private List<Todo> todos = new ArrayList<>();
|
|
||||||
|
|
||||||
// Konstruktoren
|
|
||||||
public User() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public User(String username, String password, String email) {
|
|
||||||
this.username = username;
|
|
||||||
this.password = password;
|
|
||||||
this.email = email;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Getter und Setter
|
|
||||||
public Long getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setId(Long id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUsername() {
|
|
||||||
return username;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUsername(String username) {
|
|
||||||
this.username = username;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getPassword() {
|
|
||||||
return password;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPassword(String password) {
|
|
||||||
this.password = password;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getEmail() {
|
|
||||||
return email;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setEmail(String email) {
|
|
||||||
this.email = email;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Todo> getTodos() {
|
|
||||||
return todos;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTodos(List<Todo> todos) {
|
|
||||||
this.todos = todos;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Hilfsmethoden
|
|
||||||
public void addTodo(Todo todo) {
|
|
||||||
todos.add(todo);
|
|
||||||
todo.setUser(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void removeTodo(Todo todo) {
|
|
||||||
todos.remove(todo);
|
|
||||||
todo.setUser(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "User{" +
|
|
||||||
"id=" + id +
|
|
||||||
", username='" + username + '\'' +
|
|
||||||
", email='" + email + '\'' +
|
|
||||||
'}';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
package com.todoapp.repository;
|
|
||||||
|
|
||||||
import com.todoapp.model.Todo;
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public interface TodoRepository extends JpaRepository<Todo, Long> {
|
|
||||||
List<Todo> findByUserUsernameOrderByCompletedAscTargetDateAsc(String username);
|
|
||||||
|
|
||||||
List<Todo> findByUserUsernameAndCompletedTrue(String username);
|
|
||||||
|
|
||||||
List<Todo> findByUserUsernameAndCompletedFalseOrderByTargetDateAsc(String username);
|
|
||||||
}
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
package com.todoapp.repository;
|
|
||||||
|
|
||||||
import com.todoapp.model.User;
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
public interface UserRepository extends JpaRepository<User, Long> {
|
|
||||||
Optional<User> findByUsername(String username);
|
|
||||||
|
|
||||||
boolean existsByUsername(String username);
|
|
||||||
|
|
||||||
boolean existsByEmail(String email);
|
|
||||||
}
|
|
||||||
|
|
@ -1,66 +0,0 @@
|
||||||
package com.todoapp.security;
|
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.security.authentication.AuthenticationManager;
|
|
||||||
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
|
|
||||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
|
||||||
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
|
|
||||||
import org.springframework.security.core.userdetails.UserDetailsService;
|
|
||||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
|
||||||
import org.springframework.security.web.SecurityFilterChain;
|
|
||||||
import org.springframework.web.cors.CorsConfiguration;
|
|
||||||
import org.springframework.web.cors.CorsConfigurationSource;
|
|
||||||
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
|
||||||
import java.util.Arrays;
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
@EnableWebSecurity
|
|
||||||
public class SecurityConfig {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private UserDetailsService userDetailsService;
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public AuthenticationManager authenticationManager(HttpSecurity http) throws Exception {
|
|
||||||
return http.getSharedObject(AuthenticationManagerBuilder.class)
|
|
||||||
.userDetailsService(userDetailsService)
|
|
||||||
.passwordEncoder(passwordEncoder())
|
|
||||||
.and()
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public PasswordEncoder passwordEncoder() {
|
|
||||||
return new BCryptPasswordEncoder();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
|
|
||||||
http
|
|
||||||
.csrf().disable()
|
|
||||||
.cors().and()
|
|
||||||
.authorizeHttpRequests(auth -> auth
|
|
||||||
.requestMatchers("/api/auth/register").permitAll()
|
|
||||||
.requestMatchers("/api/auth/login").permitAll()
|
|
||||||
.anyRequest().authenticated())
|
|
||||||
.httpBasic();
|
|
||||||
|
|
||||||
return http.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public CorsConfigurationSource corsConfigurationSource() {
|
|
||||||
CorsConfiguration configuration = new CorsConfiguration();
|
|
||||||
configuration.setAllowedOrigins(Arrays.asList("*"));
|
|
||||||
configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS"));
|
|
||||||
configuration.setAllowedHeaders(Arrays.asList("Content-Type", "Authorization"));
|
|
||||||
configuration.setMaxAge(3600L);
|
|
||||||
|
|
||||||
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
|
|
||||||
source.registerCorsConfiguration("/**", configuration);
|
|
||||||
return source;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
package com.todoapp.security;
|
|
||||||
|
|
||||||
import com.todoapp.model.User;
|
|
||||||
import com.todoapp.repository.UserRepository;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.security.core.authority.SimpleGrantedAuthority;
|
|
||||||
import org.springframework.security.core.userdetails.UserDetails;
|
|
||||||
import org.springframework.security.core.userdetails.UserDetailsService;
|
|
||||||
import org.springframework.security.core.userdetails.UsernameNotFoundException;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import java.util.Collections;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
public class UserDetailsServiceImpl implements UserDetailsService {
|
|
||||||
|
|
||||||
private final UserRepository userRepository;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
public UserDetailsServiceImpl(UserRepository userRepository) {
|
|
||||||
this.userRepository = userRepository;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
|
|
||||||
User user = userRepository.findByUsername(username)
|
|
||||||
.orElseThrow(() -> new UsernameNotFoundException("User not found with username: " + username));
|
|
||||||
|
|
||||||
return new org.springframework.security.core.userdetails.User(
|
|
||||||
user.getUsername(),
|
|
||||||
user.getPassword(),
|
|
||||||
Collections.singletonList(new SimpleGrantedAuthority("ROLE_USER")));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,65 +0,0 @@
|
||||||
package com.todoapp.service;
|
|
||||||
|
|
||||||
import com.todoapp.model.Todo;
|
|
||||||
import com.todoapp.model.User;
|
|
||||||
import com.todoapp.repository.TodoRepository;
|
|
||||||
import com.todoapp.repository.UserRepository;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
public class TodoService {
|
|
||||||
|
|
||||||
private final TodoRepository todoRepository;
|
|
||||||
private final UserRepository userRepository;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
public TodoService(TodoRepository todoRepository, UserRepository userRepository) {
|
|
||||||
this.todoRepository = todoRepository;
|
|
||||||
this.userRepository = userRepository;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Todo saveTodo(Todo todo, String username) {
|
|
||||||
User user = userRepository.findByUsername(username)
|
|
||||||
.orElseThrow(() -> new RuntimeException("User not found"));
|
|
||||||
todo.setUser(user);
|
|
||||||
return todoRepository.save(todo);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Optional<Todo> updateTodo(Todo todo) {
|
|
||||||
if (todoRepository.existsById(todo.getId())) {
|
|
||||||
return Optional.of(todoRepository.save(todo));
|
|
||||||
}
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean deleteTodo(Long id) {
|
|
||||||
if (todoRepository.existsById(id)) {
|
|
||||||
todoRepository.deleteById(id);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Optional<Todo> getTodoById(Long id) {
|
|
||||||
return todoRepository.findById(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Todo> getAllTodos() {
|
|
||||||
return todoRepository.findAll();
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Todo> getTodosByUsername(String username) {
|
|
||||||
return todoRepository.findByUserUsernameOrderByCompletedAscTargetDateAsc(username);
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Todo> getCompletedTodosByUsername(String username) {
|
|
||||||
return todoRepository.findByUserUsernameAndCompletedTrue(username);
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Todo> getIncompleteTodosByUsername(String username) {
|
|
||||||
return todoRepository.findByUserUsernameAndCompletedFalseOrderByTargetDateAsc(username);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,55 +0,0 @@
|
||||||
package com.todoapp.service;
|
|
||||||
|
|
||||||
import com.todoapp.model.User;
|
|
||||||
import com.todoapp.repository.UserRepository;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
public class UserService {
|
|
||||||
|
|
||||||
private final UserRepository userRepository;
|
|
||||||
private final PasswordEncoder passwordEncoder;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
public UserService(UserRepository userRepository, PasswordEncoder passwordEncoder) {
|
|
||||||
this.userRepository = userRepository;
|
|
||||||
this.passwordEncoder = passwordEncoder;
|
|
||||||
}
|
|
||||||
|
|
||||||
public User saveUser(User user) {
|
|
||||||
user.setPassword(passwordEncoder.encode(user.getPassword()));
|
|
||||||
return userRepository.save(user);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Optional<User> getUserById(Long id) {
|
|
||||||
return userRepository.findById(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Optional<User> getUserByUsername(String username) {
|
|
||||||
return userRepository.findByUsername(username);
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<User> getAllUsers() {
|
|
||||||
return userRepository.findAll();
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean deleteUser(Long id) {
|
|
||||||
if (userRepository.existsById(id)) {
|
|
||||||
userRepository.deleteById(id);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean usernameExists(String username) {
|
|
||||||
return userRepository.existsByUsername(username);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean emailExists(String email) {
|
|
||||||
return userRepository.existsByEmail(email);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
|
|
||||||
version="3.0">
|
|
||||||
<persistence-unit name="todoPU" transaction-type="RESOURCE_LOCAL">
|
|
||||||
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
|
|
||||||
<class>com.todoapp.model.User</class>
|
|
||||||
<class>com.todoapp.model.Todo</class>
|
|
||||||
<properties>
|
|
||||||
<property name="jakarta.persistence.jdbc.driver" value="org.postgresql.Driver"/>
|
|
||||||
<property name="jakarta.persistence.jdbc.url" value="jdbc:postgresql://postgresdb:5432/todo_db"/>
|
|
||||||
<property name="jakarta.persistence.jdbc.user" value="postgres"/>
|
|
||||||
<property name="jakarta.persistence.jdbc.password" value="postgres"/>
|
|
||||||
<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
|
|
||||||
<property name="hibernate.hbm2ddl.auto" value="update"/>
|
|
||||||
<property name="hibernate.show_sql" value="true"/>
|
|
||||||
</properties>
|
|
||||||
</persistence-unit>
|
|
||||||
</persistence>
|
|
||||||
|
|
@ -1,21 +1,14 @@
|
||||||
# Datenbankverbindung
|
spring.application.name=todo-spring
|
||||||
spring.datasource.url=jdbc:postgresql://postgresdb:5432/todo_db
|
spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
|
||||||
spring.datasource.username=postgres
|
|
||||||
spring.datasource.password=postgres
|
|
||||||
spring.datasource.driver-class-name=org.postgresql.Driver
|
|
||||||
|
|
||||||
# JPA/Hibernate Einstellungen
|
|
||||||
spring.jpa.hibernate.ddl-auto=update
|
spring.jpa.hibernate.ddl-auto=update
|
||||||
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
|
#spring.jpa.hibernate.ddl-auto=none # Entferne oder kommentiere diese Zeile aus
|
||||||
spring.jpa.show-sql=true
|
spring.jpa.hibernate.show-sql=true
|
||||||
|
spring.datasource.url=jdbc:postgresql://localhost:5432/todolist
|
||||||
|
spring.datasource.username=myuser
|
||||||
|
spring.datasource.password=mypassword
|
||||||
|
spring.datasource.initialization-mode=never
|
||||||
|
#spring.datasource.initialize=true # Entferne oder kommentiere diese Zeile aus
|
||||||
|
#spring.datasource.schema=classpath:/schema.sql # Entferne oder kommentiere diese Zeile aus
|
||||||
|
spring.datasource.continue-on-error=true
|
||||||
|
server.port=8090
|
||||||
|
|
||||||
# Server-Port
|
|
||||||
server.port=9080
|
|
||||||
|
|
||||||
# Logging (optional)
|
|
||||||
logging.level.org.springframework.web=INFO
|
|
||||||
logging.level.com.todoapp=DEBUG
|
|
||||||
logging.level.org.hibernate=ERROR
|
|
||||||
|
|
||||||
# Security Debug (nur für Entwicklung)
|
|
||||||
logging.level.org.springframework.security=DEBUG
|
|
||||||
|
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE hibernate-configuration PUBLIC
|
|
||||||
"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
|
|
||||||
"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
|
|
||||||
<hibernate-configuration>
|
|
||||||
<session-factory>
|
|
||||||
<!-- JNDI connection settings -->
|
|
||||||
<property name="hibernate.connection.datasource">jdbc/PostgresDataSource</property>
|
|
||||||
|
|
||||||
<!-- Select our SQL dialect -->
|
|
||||||
<property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
|
|
||||||
|
|
||||||
<!-- Echo the SQL to stdout -->
|
|
||||||
<property name="hibernate.show_sql">true</property>
|
|
||||||
|
|
||||||
<!-- Set the current session context -->
|
|
||||||
<property name="hibernate.current_session_context_class">thread</property>
|
|
||||||
|
|
||||||
<!-- Drop and re-create the database schema on startup -->
|
|
||||||
<property name="hibernate.hbm2ddl.auto">update</property>
|
|
||||||
|
|
||||||
<!-- Entity mapping -->
|
|
||||||
<mapping class="com.todoapp.model.User"/>
|
|
||||||
<mapping class="com.todoapp.model.Todo"/>
|
|
||||||
</session-factory>
|
|
||||||
</hibernate-configuration>
|
|
||||||
17
go.mod
17
go.mod
|
|
@ -3,9 +3,9 @@ module jws
|
||||||
go 1.23.5
|
go 1.23.5
|
||||||
|
|
||||||
require (
|
require (
|
||||||
fyne.io/fyne/v2 v2.6.1
|
fyne.io/fyne/v2 v2.6.0-alpha1
|
||||||
fyne.io/tools v1.6.1
|
fyne.io/tools v1.0.0-alpha1
|
||||||
github.com/spf13/viper v1.20.1
|
github.com/spf13/viper v1.20.0
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
|
@ -15,24 +15,21 @@ require (
|
||||||
github.com/fredbi/uri v1.1.0 // indirect
|
github.com/fredbi/uri v1.1.0 // indirect
|
||||||
github.com/fsnotify/fsnotify v1.8.0 // indirect
|
github.com/fsnotify/fsnotify v1.8.0 // indirect
|
||||||
github.com/fyne-io/gl-js v0.1.0 // indirect
|
github.com/fyne-io/gl-js v0.1.0 // indirect
|
||||||
github.com/fyne-io/glfw-js v0.2.0 // indirect
|
github.com/fyne-io/glfw-js v0.1.0 // indirect
|
||||||
github.com/fyne-io/image v0.1.1 // indirect
|
github.com/fyne-io/image v0.1.0 // indirect
|
||||||
github.com/fyne-io/oksvg v0.1.0 // indirect
|
|
||||||
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect
|
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect
|
||||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a // indirect
|
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a // indirect
|
||||||
github.com/go-text/render v0.2.0 // indirect
|
github.com/go-text/render v0.2.0 // indirect
|
||||||
github.com/go-text/typesetting v0.2.1 // indirect
|
github.com/go-text/typesetting v0.2.1 // indirect
|
||||||
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
|
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
|
||||||
github.com/godbus/dbus/v5 v5.1.0 // indirect
|
github.com/godbus/dbus/v5 v5.1.0 // indirect
|
||||||
github.com/hack-pad/go-indexeddb v0.3.2 // indirect
|
|
||||||
github.com/hack-pad/safejs v0.1.0 // indirect
|
|
||||||
github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 // indirect
|
github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 // indirect
|
||||||
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect
|
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect
|
||||||
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
|
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
|
||||||
github.com/nicksnyder/go-i18n/v2 v2.5.1 // indirect
|
github.com/nicksnyder/go-i18n/v2 v2.5.1 // indirect
|
||||||
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
|
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
|
||||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
github.com/rymdport/portal v0.4.1 // indirect
|
github.com/rymdport/portal v0.3.0 // indirect
|
||||||
github.com/sagikazarmark/locafero v0.7.0 // indirect
|
github.com/sagikazarmark/locafero v0.7.0 // indirect
|
||||||
github.com/sourcegraph/conc v0.3.0 // indirect
|
github.com/sourcegraph/conc v0.3.0 // indirect
|
||||||
github.com/spf13/afero v1.12.0 // indirect
|
github.com/spf13/afero v1.12.0 // indirect
|
||||||
|
|
@ -46,7 +43,7 @@ require (
|
||||||
go.uber.org/atomic v1.9.0 // indirect
|
go.uber.org/atomic v1.9.0 // indirect
|
||||||
go.uber.org/multierr v1.9.0 // indirect
|
go.uber.org/multierr v1.9.0 // indirect
|
||||||
golang.org/x/image v0.24.0 // indirect
|
golang.org/x/image v0.24.0 // indirect
|
||||||
golang.org/x/net v0.35.0 // indirect
|
golang.org/x/net v0.33.0 // indirect
|
||||||
golang.org/x/sys v0.30.0 // indirect
|
golang.org/x/sys v0.30.0 // indirect
|
||||||
golang.org/x/text v0.22.0 // indirect
|
golang.org/x/text v0.22.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
|
|
|
||||||
20
go.sum
20
go.sum
|
|
@ -1,13 +1,9 @@
|
||||||
fyne.io/fyne/v2 v2.6.0-alpha1 h1:ALx1JJDdCYQpm5RS7CIK9bam9H7hddSDuRy/fyj9pb8=
|
fyne.io/fyne/v2 v2.6.0-alpha1 h1:ALx1JJDdCYQpm5RS7CIK9bam9H7hddSDuRy/fyj9pb8=
|
||||||
fyne.io/fyne/v2 v2.6.0-alpha1/go.mod h1:Bzv2yK+ncZ8LJbHKjyJJpEAFlbs6oulHgKm04ObOqA8=
|
fyne.io/fyne/v2 v2.6.0-alpha1/go.mod h1:Bzv2yK+ncZ8LJbHKjyJJpEAFlbs6oulHgKm04ObOqA8=
|
||||||
fyne.io/fyne/v2 v2.6.1 h1:kjPJD4/rBS9m2nHJp+npPSuaK79yj6ObMTuzR6VQ1Is=
|
|
||||||
fyne.io/fyne/v2 v2.6.1/go.mod h1:YZt7SksjvrSNJCwbWFV32WON3mE1Sr7L41D29qMZ/lU=
|
|
||||||
fyne.io/systray v1.11.0 h1:D9HISlxSkx+jHSniMBR6fCFOUjk1x/OOOJLa9lJYAKg=
|
fyne.io/systray v1.11.0 h1:D9HISlxSkx+jHSniMBR6fCFOUjk1x/OOOJLa9lJYAKg=
|
||||||
fyne.io/systray v1.11.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs=
|
fyne.io/systray v1.11.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs=
|
||||||
fyne.io/tools v1.0.0-alpha1 h1:350eF+LVPbIHNgYPCoP04yCsQSFQ3aupATx33ClZjZk=
|
fyne.io/tools v1.0.0-alpha1 h1:350eF+LVPbIHNgYPCoP04yCsQSFQ3aupATx33ClZjZk=
|
||||||
fyne.io/tools v1.0.0-alpha1/go.mod h1:7gcHTl85tD/yLcGcU2bJGECAwSVAWrr99Ngmgrz/s54=
|
fyne.io/tools v1.0.0-alpha1/go.mod h1:7gcHTl85tD/yLcGcU2bJGECAwSVAWrr99Ngmgrz/s54=
|
||||||
fyne.io/tools v1.6.1 h1:X4DmDcuFUV+g2cM8AGtNQSmLN0yqYKSiJ2Z3zPfofBA=
|
|
||||||
fyne.io/tools v1.6.1/go.mod h1:rzfZnWA1jZb/0IbYlBYHXhzH0povDGP8Psqfv7VsOYw=
|
|
||||||
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
|
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
|
||||||
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
|
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
|
@ -25,14 +21,8 @@ github.com/fyne-io/gl-js v0.1.0 h1:8luJzNs0ntEAJo+8x8kfUOXujUlP8gB3QMOxO2mUdpM=
|
||||||
github.com/fyne-io/gl-js v0.1.0/go.mod h1:ZcepK8vmOYLu96JoxbCKJy2ybr+g1pTnaBDdl7c3ajI=
|
github.com/fyne-io/gl-js v0.1.0/go.mod h1:ZcepK8vmOYLu96JoxbCKJy2ybr+g1pTnaBDdl7c3ajI=
|
||||||
github.com/fyne-io/glfw-js v0.1.0 h1:RGGMmVjcsG17Oifl3X2UJ5vH3PgS4B1UY3ASeN5BXbI=
|
github.com/fyne-io/glfw-js v0.1.0 h1:RGGMmVjcsG17Oifl3X2UJ5vH3PgS4B1UY3ASeN5BXbI=
|
||||||
github.com/fyne-io/glfw-js v0.1.0/go.mod h1:Ri6te7rdZtBgBpxLW19uBpp3Dl6K9K/bRaYdJ22G8Jk=
|
github.com/fyne-io/glfw-js v0.1.0/go.mod h1:Ri6te7rdZtBgBpxLW19uBpp3Dl6K9K/bRaYdJ22G8Jk=
|
||||||
github.com/fyne-io/glfw-js v0.2.0 h1:8GUZtN2aCoTPNqgRDxK5+kn9OURINhBEBc7M4O1KrmM=
|
|
||||||
github.com/fyne-io/glfw-js v0.2.0/go.mod h1:Ri6te7rdZtBgBpxLW19uBpp3Dl6K9K/bRaYdJ22G8Jk=
|
|
||||||
github.com/fyne-io/image v0.1.0 h1:Vm2TQJ2PWGHCf3jYi1/XroaNNMu+GfI/O2QpSbZd4XQ=
|
github.com/fyne-io/image v0.1.0 h1:Vm2TQJ2PWGHCf3jYi1/XroaNNMu+GfI/O2QpSbZd4XQ=
|
||||||
github.com/fyne-io/image v0.1.0/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM=
|
github.com/fyne-io/image v0.1.0/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM=
|
||||||
github.com/fyne-io/image v0.1.1 h1:WH0z4H7qfvNUw5l4p3bC1q70sa5+YWVt6HCj7y4VNyA=
|
|
||||||
github.com/fyne-io/image v0.1.1/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM=
|
|
||||||
github.com/fyne-io/oksvg v0.1.0 h1:7EUKk3HV3Y2E+qypp3nWqMXD7mum0hCw2KEGhI1fnBw=
|
|
||||||
github.com/fyne-io/oksvg v0.1.0/go.mod h1:dJ9oEkPiWhnTFNCmRgEze+YNprJF7YRbpjgpWS4kzoI=
|
|
||||||
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA=
|
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA=
|
||||||
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw=
|
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw=
|
||||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a h1:vxnBhFDDT+xzxf1jTJKMKZw3H0swfWk9RpWbBbDK5+0=
|
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a h1:vxnBhFDDT+xzxf1jTJKMKZw3H0swfWk9RpWbBbDK5+0=
|
||||||
|
|
@ -51,10 +41,6 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||||
github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y=
|
github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y=
|
||||||
github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
|
github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
|
||||||
github.com/hack-pad/go-indexeddb v0.3.2 h1:DTqeJJYc1usa45Q5r52t01KhvlSN02+Oq+tQbSBI91A=
|
|
||||||
github.com/hack-pad/go-indexeddb v0.3.2/go.mod h1:QvfTevpDVlkfomY498LhstjwbPW6QC4VC/lxYb0Kom0=
|
|
||||||
github.com/hack-pad/safejs v0.1.0 h1:qPS6vjreAqh2amUqj4WNG1zIw7qlRQJ9K10eDKMCnE8=
|
|
||||||
github.com/hack-pad/safejs v0.1.0/go.mod h1:HdS+bKF1NrE72VoXZeWzxFOVQVUSqZJAG0xNCnb+Tio=
|
|
||||||
github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 h1:wMeVzrPO3mfHIWLZtDcSaGAe2I4PW9B/P5nMkRSwCAc=
|
github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 h1:wMeVzrPO3mfHIWLZtDcSaGAe2I4PW9B/P5nMkRSwCAc=
|
||||||
github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o=
|
github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o=
|
||||||
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M=
|
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M=
|
||||||
|
|
@ -79,8 +65,6 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV
|
||||||
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
||||||
github.com/rymdport/portal v0.3.0 h1:QRHcwKwx3kY5JTQcsVhmhC3TGqGQb9LFghVNUy8AdB8=
|
github.com/rymdport/portal v0.3.0 h1:QRHcwKwx3kY5JTQcsVhmhC3TGqGQb9LFghVNUy8AdB8=
|
||||||
github.com/rymdport/portal v0.3.0/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4=
|
github.com/rymdport/portal v0.3.0/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4=
|
||||||
github.com/rymdport/portal v0.4.1 h1:2dnZhjf5uEaeDjeF/yBIeeRo6pNI2QAKm7kq1w/kbnA=
|
|
||||||
github.com/rymdport/portal v0.4.1/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4=
|
|
||||||
github.com/sagikazarmark/locafero v0.7.0 h1:5MqpDsTGNDhY8sGp0Aowyf0qKsPrhewaLSsFaodPcyo=
|
github.com/sagikazarmark/locafero v0.7.0 h1:5MqpDsTGNDhY8sGp0Aowyf0qKsPrhewaLSsFaodPcyo=
|
||||||
github.com/sagikazarmark/locafero v0.7.0/go.mod h1:2za3Cg5rMaTMoG/2Ulr9AwtFaIppKXTRYnozin4aB5k=
|
github.com/sagikazarmark/locafero v0.7.0/go.mod h1:2za3Cg5rMaTMoG/2Ulr9AwtFaIppKXTRYnozin4aB5k=
|
||||||
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
|
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
|
||||||
|
|
@ -93,8 +77,6 @@ github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
|
||||||
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
||||||
github.com/spf13/viper v1.20.0 h1:zrxIyR3RQIOsarIrgL8+sAvALXul9jeEPa06Y0Ph6vY=
|
github.com/spf13/viper v1.20.0 h1:zrxIyR3RQIOsarIrgL8+sAvALXul9jeEPa06Y0Ph6vY=
|
||||||
github.com/spf13/viper v1.20.0/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4=
|
github.com/spf13/viper v1.20.0/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4=
|
||||||
github.com/spf13/viper v1.20.1 h1:ZMi+z/lvLyPSCoNtFCpqjy0S4kPbirhpTMwl8BkW9X4=
|
|
||||||
github.com/spf13/viper v1.20.1/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4=
|
|
||||||
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE=
|
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE=
|
||||||
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q=
|
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q=
|
||||||
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ=
|
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ=
|
||||||
|
|
@ -115,8 +97,6 @@ golang.org/x/image v0.24.0 h1:AN7zRgVsbvmTfNyqIbbOraYL8mSwcKncEj8ofjgzcMQ=
|
||||||
golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8=
|
golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8=
|
||||||
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
|
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
|
||||||
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
|
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
|
||||||
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
|
|
||||||
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
|
|
||||||
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
|
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
|
||||||
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
|
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
|
||||||
|
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
{
|
|
||||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json"
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue