diff --git a/pom.xml b/pom.xml index f745ab7..0ec4709 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.auction - troostwijk-scraper + auctiora + auctiora 1.0-SNAPSHOT jar diff --git a/check-status.bat b/script/check-status.bat similarity index 86% rename from check-status.bat rename to script/check-status.bat index 60e6b24..7f0964b 100644 --- a/check-status.bat +++ b/script/check-status.bat @@ -15,6 +15,6 @@ set DATABASE_FILE=C:\mnt\okcomputer\output\cache.db set NOTIFICATION_CONFIG=desktop REM Check status -java -jar target\troostwijk-scraper-1.0-SNAPSHOT-jar-with-dependencies.jar status +java -jar target\auctiora-1.0-SNAPSHOT-jar-with-dependencies.jar status pause diff --git a/run-once.bat b/script/run-once.bat similarity index 100% rename from run-once.bat rename to script/run-once.bat diff --git a/run-workflow.bat b/script/run-workflow.bat similarity index 90% rename from run-workflow.bat rename to script/run-workflow.bat index bb25974..9fc574e 100644 --- a/run-workflow.bat +++ b/script/run-workflow.bat @@ -22,6 +22,6 @@ REM Optional: Set for email notifications REM set NOTIFICATION_CONFIG=smtp:your@gmail.com:app_password:your@gmail.com REM Run the application -java -jar target\troostwijk-scraper-1.0-SNAPSHOT-jar-with-dependencies.jar workflow +java -jar target\auctiora-1.0-SNAPSHOT-jar-with-dependencies.jar workflow pause diff --git a/setup-windows-task.ps1 b/script/setup-windows-task.ps1 similarity index 94% rename from setup-windows-task.ps1 rename to script/setup-windows-task.ps1 index 7709e9c..6a6d040 100644 --- a/setup-windows-task.ps1 +++ b/script/setup-windows-task.ps1 @@ -11,12 +11,12 @@ # # ============================================================================ -Write-Host "=== Troostwijk Auction Monitor - Task Scheduler Setup ===" -ForegroundColor Cyan +Write-Host "=== Auctiora Monitor - Task Scheduler Setup ===" -ForegroundColor Cyan Write-Host "" # Configuration $scriptPath = $PSScriptRoot -$jarPath = Join-Path $scriptPath "target\troostwijk-scraper-1.0-SNAPSHOT-jar-with-dependencies.jar" +$jarPath = Join-Path $scriptPath "target\auctiora-1.0-SNAPSHOT-jar-with-dependencies.jar" $javaExe = "java" # Check if JAR exists diff --git a/src/main/java/com/auction/AuctionInfo.java b/src/main/java/auctiora/AuctionInfo.java similarity index 97% rename from src/main/java/com/auction/AuctionInfo.java rename to src/main/java/auctiora/AuctionInfo.java index cca4fa3..cac0b25 100644 --- a/src/main/java/com/auction/AuctionInfo.java +++ b/src/main/java/auctiora/AuctionInfo.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import java.time.LocalDateTime; diff --git a/src/main/java/com/auction/AuctionMonitorHealthCheck.java b/src/main/java/auctiora/AuctionMonitorHealthCheck.java similarity index 99% rename from src/main/java/com/auction/AuctionMonitorHealthCheck.java rename to src/main/java/auctiora/AuctionMonitorHealthCheck.java index a4af1b7..f79cbe4 100644 --- a/src/main/java/com/auction/AuctionMonitorHealthCheck.java +++ b/src/main/java/auctiora/AuctionMonitorHealthCheck.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/src/main/java/com/auction/AuctionMonitorProducer.java b/src/main/java/auctiora/AuctionMonitorProducer.java similarity index 98% rename from src/main/java/com/auction/AuctionMonitorProducer.java rename to src/main/java/auctiora/AuctionMonitorProducer.java index a24a5c3..df92353 100644 --- a/src/main/java/com/auction/AuctionMonitorProducer.java +++ b/src/main/java/auctiora/AuctionMonitorProducer.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Produces; diff --git a/src/main/java/com/auction/AuctionMonitorResource.java b/src/main/java/auctiora/AuctionMonitorResource.java similarity index 99% rename from src/main/java/com/auction/AuctionMonitorResource.java rename to src/main/java/auctiora/AuctionMonitorResource.java index a354043..06c98da 100644 --- a/src/main/java/com/auction/AuctionMonitorResource.java +++ b/src/main/java/auctiora/AuctionMonitorResource.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import jakarta.inject.Inject; import jakarta.ws.rs.*; @@ -6,7 +6,6 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; -import java.sql.SQLException; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/auction/Console.java b/src/main/java/auctiora/Console.java similarity index 90% rename from src/main/java/com/auction/Console.java rename to src/main/java/auctiora/Console.java index e741225..05cc521 100644 --- a/src/main/java/com/auction/Console.java +++ b/src/main/java/auctiora/Console.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; /** * Simple console output utility (renamed from IO to avoid Java 25 conflict) diff --git a/src/main/java/com/auction/DatabaseService.java b/src/main/java/auctiora/DatabaseService.java similarity index 99% rename from src/main/java/com/auction/DatabaseService.java rename to src/main/java/auctiora/DatabaseService.java index d0716c3..4b0a3dd 100644 --- a/src/main/java/com/auction/DatabaseService.java +++ b/src/main/java/auctiora/DatabaseService.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import java.sql.DriverManager; import java.sql.SQLException; diff --git a/src/main/java/com/auction/ImageProcessingService.java b/src/main/java/auctiora/ImageProcessingService.java similarity index 99% rename from src/main/java/com/auction/ImageProcessingService.java rename to src/main/java/auctiora/ImageProcessingService.java index 534fd59..a1b3eef 100644 --- a/src/main/java/com/auction/ImageProcessingService.java +++ b/src/main/java/auctiora/ImageProcessingService.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/com/auction/Lot.java b/src/main/java/auctiora/Lot.java similarity index 97% rename from src/main/java/com/auction/Lot.java rename to src/main/java/auctiora/Lot.java index 05583f8..af617a1 100644 --- a/src/main/java/com/auction/Lot.java +++ b/src/main/java/auctiora/Lot.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import java.time.Duration; import java.time.LocalDateTime; diff --git a/src/main/java/com/auction/Main.java b/src/main/java/auctiora/Main.java similarity index 99% rename from src/main/java/com/auction/Main.java rename to src/main/java/auctiora/Main.java index 33a2288..0185b5e 100644 --- a/src/main/java/com/auction/Main.java +++ b/src/main/java/auctiora/Main.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import org.opencv.core.Core; diff --git a/src/main/java/com/auction/NotificationService.java b/src/main/java/auctiora/NotificationService.java similarity index 99% rename from src/main/java/com/auction/NotificationService.java rename to src/main/java/auctiora/NotificationService.java index bfbd7c2..dfd22ab 100644 --- a/src/main/java/com/auction/NotificationService.java +++ b/src/main/java/auctiora/NotificationService.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import javax.mail.Authenticator; import javax.mail.Message.RecipientType; diff --git a/src/main/java/com/auction/ObjectDetectionService.java b/src/main/java/auctiora/ObjectDetectionService.java similarity index 99% rename from src/main/java/com/auction/ObjectDetectionService.java rename to src/main/java/auctiora/ObjectDetectionService.java index b6962ae..8d6cb24 100644 --- a/src/main/java/com/auction/ObjectDetectionService.java +++ b/src/main/java/auctiora/ObjectDetectionService.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import org.opencv.core.Mat; import org.opencv.core.Scalar; diff --git a/src/main/java/com/auction/QuarkusWorkflowScheduler.java b/src/main/java/auctiora/QuarkusWorkflowScheduler.java similarity index 98% rename from src/main/java/com/auction/QuarkusWorkflowScheduler.java rename to src/main/java/auctiora/QuarkusWorkflowScheduler.java index 8f13e24..75b9eb5 100644 --- a/src/main/java/com/auction/QuarkusWorkflowScheduler.java +++ b/src/main/java/auctiora/QuarkusWorkflowScheduler.java @@ -1,14 +1,11 @@ -package com.auction; +package auctiora; import io.quarkus.scheduler.Scheduled; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import javax.xml.crypto.KeySelector.Purpose; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.logging.Logger; -import java.io.IOException; -import java.sql.SQLException; import java.util.List; /** diff --git a/src/main/java/com/auction/RateLimitedHttpClient.java b/src/main/java/auctiora/RateLimitedHttpClient.java similarity index 99% rename from src/main/java/com/auction/RateLimitedHttpClient.java rename to src/main/java/auctiora/RateLimitedHttpClient.java index 633c91a..8aebcee 100644 --- a/src/main/java/com/auction/RateLimitedHttpClient.java +++ b/src/main/java/auctiora/RateLimitedHttpClient.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/src/main/java/com/auction/ScraperDataAdapter.java b/src/main/java/auctiora/ScraperDataAdapter.java similarity index 99% rename from src/main/java/com/auction/ScraperDataAdapter.java rename to src/main/java/auctiora/ScraperDataAdapter.java index 555f17d..df7179e 100644 --- a/src/main/java/com/auction/ScraperDataAdapter.java +++ b/src/main/java/auctiora/ScraperDataAdapter.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/src/main/java/com/auction/TroostwijkMonitor.java b/src/main/java/auctiora/TroostwijkMonitor.java similarity index 99% rename from src/main/java/com/auction/TroostwijkMonitor.java rename to src/main/java/auctiora/TroostwijkMonitor.java index 76a063a..900693b 100644 --- a/src/main/java/com/auction/TroostwijkMonitor.java +++ b/src/main/java/auctiora/TroostwijkMonitor.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; diff --git a/src/main/java/com/auction/WorkflowOrchestrator.java b/src/main/java/auctiora/WorkflowOrchestrator.java similarity index 99% rename from src/main/java/com/auction/WorkflowOrchestrator.java rename to src/main/java/auctiora/WorkflowOrchestrator.java index a4928b6..c4e3d71 100644 --- a/src/main/java/com/auction/WorkflowOrchestrator.java +++ b/src/main/java/auctiora/WorkflowOrchestrator.java @@ -1,8 +1,7 @@ -package com.auction; +package auctiora; import java.io.IOException; import java.sql.SQLException; -import java.time.LocalDateTime; import java.util.List; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 29c42a8..a90dfaf 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,5 @@ # Application Configuration -quarkus.application.name=troostwijk-scraper +quarkus.application.name=auctiora quarkus.application.version=1.0-SNAPSHOT # HTTP Configuration diff --git a/src/test/java/com/auction/AuctionParsingTest.java b/src/test/java/auctiora/AuctionParsingTest.java similarity index 99% rename from src/test/java/com/auction/AuctionParsingTest.java rename to src/test/java/auctiora/AuctionParsingTest.java index da31d42..68bfc66 100644 --- a/src/test/java/com/auction/AuctionParsingTest.java +++ b/src/test/java/auctiora/AuctionParsingTest.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; diff --git a/src/test/java/com/auction/DatabaseServiceTest.java b/src/test/java/auctiora/DatabaseServiceTest.java similarity index 99% rename from src/test/java/com/auction/DatabaseServiceTest.java rename to src/test/java/auctiora/DatabaseServiceTest.java index 08051f3..7c90f4a 100644 --- a/src/test/java/com/auction/DatabaseServiceTest.java +++ b/src/test/java/auctiora/DatabaseServiceTest.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import org.junit.jupiter.api.*; import java.io.IOException; diff --git a/src/test/java/com/auction/ImageProcessingServiceTest.java b/src/test/java/auctiora/ImageProcessingServiceTest.java similarity index 99% rename from src/test/java/com/auction/ImageProcessingServiceTest.java rename to src/test/java/auctiora/ImageProcessingServiceTest.java index 0cce585..e02ba8a 100644 --- a/src/test/java/com/auction/ImageProcessingServiceTest.java +++ b/src/test/java/auctiora/ImageProcessingServiceTest.java @@ -1,9 +1,8 @@ -package com.auction; +package auctiora; import org.junit.jupiter.api.*; import org.mockito.ArgumentCaptor; -import java.io.ByteArrayInputStream; import java.nio.file.Files; import java.nio.file.Paths; import java.sql.SQLException; diff --git a/src/test/java/com/auction/IntegrationTest.java b/src/test/java/auctiora/IntegrationTest.java similarity index 99% rename from src/test/java/com/auction/IntegrationTest.java rename to src/test/java/auctiora/IntegrationTest.java index 96c1682..62730cc 100644 --- a/src/test/java/com/auction/IntegrationTest.java +++ b/src/test/java/auctiora/IntegrationTest.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import org.junit.jupiter.api.*; diff --git a/src/test/java/com/auction/NotificationServiceTest.java b/src/test/java/auctiora/NotificationServiceTest.java similarity index 99% rename from src/test/java/com/auction/NotificationServiceTest.java rename to src/test/java/auctiora/NotificationServiceTest.java index 6dfa60b..5e9858b 100644 --- a/src/test/java/com/auction/NotificationServiceTest.java +++ b/src/test/java/auctiora/NotificationServiceTest.java @@ -1,6 +1,5 @@ -package com.auction; +package auctiora; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/auction/ObjectDetectionServiceTest.java b/src/test/java/auctiora/ObjectDetectionServiceTest.java similarity index 99% rename from src/test/java/com/auction/ObjectDetectionServiceTest.java rename to src/test/java/auctiora/ObjectDetectionServiceTest.java index b52add2..aaff4c1 100644 --- a/src/test/java/com/auction/ObjectDetectionServiceTest.java +++ b/src/test/java/auctiora/ObjectDetectionServiceTest.java @@ -1,11 +1,10 @@ -package com.auction; +package auctiora; import org.junit.jupiter.api.*; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; -import java.util.List; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/auction/Parser.java b/src/test/java/auctiora/Parser.java similarity index 99% rename from src/test/java/com/auction/Parser.java rename to src/test/java/auctiora/Parser.java index 9accb06..b75b171 100644 --- a/src/test/java/com/auction/Parser.java +++ b/src/test/java/auctiora/Parser.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter; import org.jsoup.Jsoup; diff --git a/src/test/java/com/auction/ScraperDataAdapterTest.java b/src/test/java/auctiora/ScraperDataAdapterTest.java similarity index 99% rename from src/test/java/com/auction/ScraperDataAdapterTest.java rename to src/test/java/auctiora/ScraperDataAdapterTest.java index c0aae1d..0c558c3 100644 --- a/src/test/java/com/auction/ScraperDataAdapterTest.java +++ b/src/test/java/auctiora/ScraperDataAdapterTest.java @@ -1,8 +1,7 @@ -package com.auction; +package auctiora; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.DisplayName; -import org.mockito.Mockito; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/src/test/java/com/auction/TroostwijkMonitorTest.java b/src/test/java/auctiora/TroostwijkMonitorTest.java similarity index 99% rename from src/test/java/com/auction/TroostwijkMonitorTest.java rename to src/test/java/auctiora/TroostwijkMonitorTest.java index 42d43e1..1aece46 100644 --- a/src/test/java/com/auction/TroostwijkMonitorTest.java +++ b/src/test/java/auctiora/TroostwijkMonitorTest.java @@ -1,4 +1,4 @@ -package com.auction; +package auctiora; import org.junit.jupiter.api.*; diff --git a/src/test/resources/test.md b/src/test/resources/test.md index c6b0773..c2093b6 100644 --- a/src/test/resources/test.md +++ b/src/test/resources/test.md @@ -23,39 +23,4 @@ Configure your devices to use the Pi-hole as their DNS server │ fdc5:59a6:9ac1:f11f:2c86:25d3:6282:37ef fdc5:59a6:9ac1:f11f:bd8c:6e87:65f0:243c fe80::a05b:bbc6:d47f:3002%enp9s0 -2IXD-XJN9-C337-1K4Y-BBEO-HV1F-3BVI - -https://ollama.lan:9443/#!/wizard - heel-goed-wachtwoord - -[ -{ -"domain": "ollama.lan", -"answer": "192.168.1.159", -"enabled": true -}, -{ -"domain": "hephaestus.lan", -"answer": "192.168.1.159", -"enabled": true -}, -{ -"domain": "hermes.lan", -"answer": "192.168.137.239", -"enabled": true -}, -{ -"domain": "atlas.lan", -"answer": "192.168.1.100", -"enabled": true -}, -{ -"domain": "hub.lan", -"answer": "192.168.1.1", -"enabled": true -}, -{ -"domain": "ha.lan", -"answer": "192.168.1.193", -"enabled": true -} -] +2IXD-XJN9-C337-1K4Y-BBEO-HV1F-3BVI \ No newline at end of file diff --git a/IMPLEMENTATION_COMPLETE.md b/wiki/IMPLEMENTATION_COMPLETE.md similarity index 100% rename from IMPLEMENTATION_COMPLETE.md rename to wiki/IMPLEMENTATION_COMPLETE.md diff --git a/INTEGRATION_GUIDE.md b/wiki/INTEGRATION_GUIDE.md similarity index 100% rename from INTEGRATION_GUIDE.md rename to wiki/INTEGRATION_GUIDE.md diff --git a/QUARKUS_COMPLETE.md b/wiki/QUARKUS_COMPLETE.md similarity index 100% rename from QUARKUS_COMPLETE.md rename to wiki/QUARKUS_COMPLETE.md diff --git a/QUARKUS_GUIDE.md b/wiki/QUARKUS_GUIDE.md similarity index 100% rename from QUARKUS_GUIDE.md rename to wiki/QUARKUS_GUIDE.md diff --git a/QUARKUS_IMPLEMENTATION.md b/wiki/QUARKUS_IMPLEMENTATION.md similarity index 99% rename from QUARKUS_IMPLEMENTATION.md rename to wiki/QUARKUS_IMPLEMENTATION.md index bb9273a..1b55b8c 100644 --- a/QUARKUS_IMPLEMENTATION.md +++ b/wiki/QUARKUS_IMPLEMENTATION.md @@ -181,9 +181,9 @@ public class StartupCheck implements HealthCheck { /* ... */ } # Build stage FROM maven:3.9-eclipse-temurin-25-alpine AS build WORKDIR /app -COPY pom.xml ./ +COPY ../pom.xml ./ RUN mvn dependency:go-offline -B -COPY src/ ./src/ +COPY ../src ./src/ RUN mvn package -DskipTests -Dquarkus.package.jar.type=fast-jar # Runtime stage diff --git a/RATE_LIMITING.md b/wiki/RATE_LIMITING.md similarity index 100% rename from RATE_LIMITING.md rename to wiki/RATE_LIMITING.md diff --git a/REFACTORING_SUMMARY.md b/wiki/REFACTORING_SUMMARY.md similarity index 100% rename from REFACTORING_SUMMARY.md rename to wiki/REFACTORING_SUMMARY.md diff --git a/TEST_SUITE_SUMMARY.md b/wiki/TEST_SUITE_SUMMARY.md similarity index 100% rename from TEST_SUITE_SUMMARY.md rename to wiki/TEST_SUITE_SUMMARY.md diff --git a/WORKFLOW_GUIDE.md b/wiki/WORKFLOW_GUIDE.md similarity index 100% rename from WORKFLOW_GUIDE.md rename to wiki/WORKFLOW_GUIDE.md