Gepardec · alekszivko · Aug 5, 2025 · Aug 5, 2025 · Aug 5, 2025 · Aug 6, 2025
diff --git a/gamertrack-application/pom.xml b/gamertrack-application/pom.xml
@@ -20,6 +20,19 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>io.smallrye</groupId>
+        <artifactId>jandex-maven-plugin</artifactId>
+        <version>3.3.2</version>
+        <executions>
+          <execution>
+            <id>make-index</id>
+            <goals>
+              <goal>jandex</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-maven-plugin-jakarta</artifactId>
@@ -138,7 +151,13 @@
       <version>4.1.0</version>
       <scope>provided</scope>
     </dependency>
-
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-rest</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-rest-jackson</artifactId>
+    </dependency>
   </dependencies>
-
 </project>
diff --git a/gamertrack-application/src/main/java/com/gepardec/RestConfig.java b/gamertrack-application/src/main/java/com/gepardec/RestConfig.java
diff --git a/gamertrack-db/pom.xml b/gamertrack-db/pom.xml
@@ -51,12 +51,7 @@
       <version>5.1.0.Beta7</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hibernate.orm</groupId>
-      <artifactId>hibernate-core</artifactId>
-      <version>6.6.10.Final</version>
-      <scope>provided</scope>
-    </dependency>
+    <!-- Removed hibernate-core dependency -->
     <dependency>
       <groupId>jakarta.transaction</groupId>
       <artifactId>jakarta.transaction-api</artifactId>
@@ -130,6 +125,16 @@
       <version>4.1.0</version>
       <scope>provided</scope>
     </dependency>
+    <!-- Added Quarkus Hibernate ORM dependency -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-hibernate-orm</artifactId>
+    </dependency>
+    <!-- Added Quarkus JDBC H2 driver dependency -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-jdbc-h2</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/gamertrack-db/src/main/java/com/gepardec/adapter/output/persistence/repository/Producer.java b/gamertrack-db/src/main/java/com/gepardec/adapter/output/persistence/repository/Producer.java
diff --git a/gamertrack-db/src/main/resources/META-INF/persistence.xml b/gamertrack-db/src/main/resources/META-INF/persistence.xml
diff --git a/gamertrack-db/src/main/resources/application.properties b/gamertrack-db/src/main/resources/application.properties
@@ -0,0 +1,10 @@
+# application.properties
+
+# Datasource configuration
+quarkus.datasource.jdbc.url=jdbc:h2:mem:gamertrack;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1
+quarkus.datasource.db-kind=h2
+quarkus.datasource.username=sa
+quarkus.datasource.password=sa
+
+# Hibernate ORM configuration
+quarkus.hibernate-orm.database.generation=update
diff --git a/gamertrack-db/src/test/resources/application.properties b/gamertrack-db/src/test/resources/application.properties
@@ -0,0 +1,8 @@
+# Test datasource configuration
+quarkus.datasource.jdbc.url=jdbc:h2:mem:gamertrack-test;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1
+quarkus.datasource.db-kind=h2
+quarkus.datasource.username=sa
+quarkus.datasource.password=sa
+
+# Hibernate ORM configuration
+quarkus.hibernate-orm.database.generation=drop-and-create
diff --git a/gamertrack-db/src/test/resources/persistence.xml b/gamertrack-db/src/test/resources/persistence.xml
diff --git a/gamertrack-domain/pom.xml b/gamertrack-domain/pom.xml
@@ -127,7 +127,6 @@
     </dependency>
 
   </dependencies>
-
   <build>
     <plugins>
       <plugin>

diff --git a/gamertrack-domain/src/main/java/com/gepardec/impl/service/AuthServiceImpl.java b/gamertrack-domain/src/main/java/com/gepardec/impl/service/AuthServiceImpl.java
@@ -8,7 +8,7 @@
 import io.github.cdimascio.dotenv.Dotenv;
 import io.jsonwebtoken.JwtException;
 import io.jsonwebtoken.Jwts;
-import jakarta.ejb.Stateless;
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import org.slf4j.Logger;
@@ -18,7 +18,7 @@
 import java.util.Optional;
 
 @Transactional
-@Stateless
+@ApplicationScoped
 public class AuthServiceImpl implements AuthService {
 
     static Dotenv dotenv = Dotenv.configure().directory("../../").filename("secret.env").ignoreIfMissing().load();
@@ -80,4 +80,4 @@ public boolean isTokenValid(String token) {
         }
         return isValid;
     }
-}
+}
diff --git a/gamertrack-domain/src/main/java/com/gepardec/impl/service/EloServiceImpl.java b/gamertrack-domain/src/main/java/com/gepardec/impl/service/EloServiceImpl.java
@@ -4,14 +4,14 @@
 import com.gepardec.model.Game;
 import com.gepardec.model.Score;
 import com.gepardec.model.User;
-import jakarta.ejb.Stateless;
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.transaction.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Transactional
-@Stateless
+@ApplicationScoped
 public class EloServiceImpl implements EloService {
 
     private static final int K = 32;
@@ -66,4 +66,4 @@ public List<Score> updateElo(Game game, final List<Score> scoreList, List<User>
         }
         return UpdatedScoreList;
     }
-}
+}
diff --git a/gamertrack-domain/src/main/java/com/gepardec/impl/service/GameServiceImpl.java b/gamertrack-domain/src/main/java/com/gepardec/impl/service/GameServiceImpl.java
@@ -6,7 +6,7 @@
 import com.gepardec.model.Match;
 import com.gepardec.model.Score;
 import com.gepardec.model.User;
-import jakarta.ejb.Stateless;
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import org.slf4j.Logger;
@@ -17,7 +17,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-@Stateless
+@ApplicationScoped
 @Transactional
 public class GameServiceImpl implements GameService, Serializable {
 
@@ -116,5 +116,4 @@ public List<Game> findAllGames() {
     logger.info("Finding all games");
     return gameRepository.findAllGames();
   }
-}
-
+}
diff --git a/gamertrack-domain/src/main/java/com/gepardec/impl/service/MatchServiceImpl.java b/gamertrack-domain/src/main/java/com/gepardec/impl/service/MatchServiceImpl.java
@@ -12,7 +12,7 @@
 import com.gepardec.model.Score;
 import com.gepardec.model.User;
 import jakarta.data.page.PageRequest;
-import jakarta.ejb.Stateless;
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import org.slf4j.Logger;
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Optional;
 
-@Stateless
+@ApplicationScoped
 @Transactional
 public class MatchServiceImpl implements MatchService {
 
@@ -190,4 +190,4 @@ public long countAllFilteredOrUnfilteredMatches(Optional<String> gameToken, Opti
                                 .countMatchesFilteredAndUnfiltered(gt, null))
                         .orElse(matchRepository.countMatchesFilteredAndUnfiltered(null, null)));
     }
-}
+}
diff --git a/gamertrack-domain/src/main/java/com/gepardec/impl/service/ScoreServiceImpl.java b/gamertrack-domain/src/main/java/com/gepardec/impl/service/ScoreServiceImpl.java
@@ -4,7 +4,7 @@
 import com.gepardec.core.services.ScoreService;
 import com.gepardec.core.services.TokenService;
 import com.gepardec.model.Score;
-import jakarta.ejb.Stateless;
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import org.slf4j.Logger;
@@ -15,7 +15,7 @@
 import java.util.Optional;
 
 @Transactional
-@Stateless
+@ApplicationScoped
 public class ScoreServiceImpl implements ScoreService, Serializable {
 
     private static final Logger log = LoggerFactory.getLogger(ScoreServiceImpl.class);
@@ -85,8 +85,6 @@ public List<Score> filterScores(Double minPoints, Double maxPoints, String userT
        return scoreRepository.filterScores(minPoints, maxPoints, userToken, gameToken,includeDeactivatedUsers);
     }
 
-
-
     @Override
     public List<Score> findScoresByUser(String userToken, Boolean includeDeactivatedUsers) {
         return scoreRepository.filterScores(null,null,userToken,null, includeDeactivatedUsers);
@@ -123,4 +121,4 @@ public boolean scoreExists(Score score) {
         return scoreRepository.scoreExists(score);
     }
 
-}
+}
diff --git a/gamertrack-domain/src/main/java/com/gepardec/impl/service/TokenServiceImpl.java b/gamertrack-domain/src/main/java/com/gepardec/impl/service/TokenServiceImpl.java
@@ -1,13 +1,13 @@
 package com.gepardec.impl.service;
 
 import com.gepardec.core.services.TokenService;
-import jakarta.ejb.Stateless;
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.transaction.Transactional;
 
 import java.security.SecureRandom;
 
 @Transactional
-@Stateless
+@ApplicationScoped
 public class TokenServiceImpl implements TokenService {
     @Override
     public String generateToken() {
@@ -22,4 +22,4 @@ public String generateToken() {
 
         return token.toString();
     }
-}
+}
diff --git a/gamertrack-domain/src/main/java/com/gepardec/impl/service/UserServiceImpl.java b/gamertrack-domain/src/main/java/com/gepardec/impl/service/UserServiceImpl.java
@@ -8,7 +8,7 @@
 import com.gepardec.model.Game;
 import com.gepardec.model.Score;
 import com.gepardec.model.User;
-import jakarta.ejb.Stateless;
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import org.slf4j.Logger;
@@ -19,7 +19,7 @@
 import java.util.Optional;
 
 @Transactional
-@Stateless
+@ApplicationScoped
 public class UserServiceImpl implements UserService, Serializable {
 
     private static final Logger log = LoggerFactory.getLogger(UserServiceImpl.class);
@@ -44,7 +44,6 @@ public Optional<User> saveUser(User user) {
         return savedUser;
     }
 
-
     @Override
     public Optional<User> updateUser(User user) {
         Optional<User> entity = userRepository.findUserByToken(user.getToken());
@@ -92,4 +91,4 @@ public List<User> findAllUsers(boolean includeDeactivated) {
     public Optional<User> findUserByToken(String token) {
             return userRepository.findUserByToken(token);
     }
-}
+}
diff --git a/gamertrack-war/pom.xml b/gamertrack-war/pom.xml
@@ -7,8 +7,10 @@
     <groupId>com.gepardec</groupId>
     <artifactId>gepardec-gamertrack</artifactId>
     <version>1.0-SNAPSHOT</version>
+
+
   </parent>
-  <packaging>war</packaging>
+  <packaging>jar</packaging>
   <artifactId>gamertrack-war</artifactId>
   <properties>
     <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -17,7 +19,12 @@
   </properties>
   <build>
     <finalName>gepardec-gamertrack</finalName>
-
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus.platform</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
   </build>
 
   <dependencies>
@@ -36,7 +43,9 @@
       <artifactId>gamertrack-application</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-arc</artifactId>
+    </dependency>
   </dependencies>
-
-
 </project>