refactoring

core/src/main/java/eu/csc/ODPAppVehOwnServer/persistence/services/storage/MetaDataStorageService.java

@@ -0,0 +1,14 @@
+package eu.csc.ODPAppVehOwnServer.persistence.services.storage;
+
+import eu.csc.ODPAppVehOwnServer.persistence.services.StorageService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MetaDataStorageService {
+
+    private final StorageService storageService;
+
+    public MetaDataStorageService(StorageService storageService) {
+        this.storageService = storageService;
+    }
+}

persistence/src/main/java/eu/csc/ODPAppVehOwnServer/persistence/services/CustomerService.java

@@ -53,15 +53,13 @@ public class CustomerService {
         return user;
     }
 
-
     public List<CustomerVehicleEntity> findAllVehicles(Long userId) {
 
         return customerVehicleRepository.findAllByUser_id(userId);
-
     }
 
     public List<CustomerDeviceEntity> findAllDevices(Long userId) {
-        return customerDeviceRepository.findAllByUser_id(userId);
 
+        return customerDeviceRepository.findAllByUser_id(userId);
     }
 }

pom.xml

@@ -38,6 +38,7 @@
         <module>services</module>
         <module>webcoreroot</module>
         <module>core</module>
+        <module>server</module>
     </modules>
 
 

server/pom.xml

@@ -0,0 +1,48 @@
+<?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">
+    <parent>
+        <artifactId>root</artifactId>
+        <groupId>eu.csc.ODP-AppVehOwnServer</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <packaging>pom</packaging>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>eu.csc.ODP-AppVehOwnServer</groupId>
+    <artifactId>server</artifactId>
+
+    <modules>
+        <module>restserver</module>
+        <module>shell</module>
+    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>persistence</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>dto</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

services/pom.xml

@@ -16,8 +16,7 @@
     <artifactId>services</artifactId>
 
     <modules>
-        <module>restserver</module>
-        <module>shell</module>
+
     </modules>
 
     <dependencies>

services/shell/target/classes/application-ybdev.properties

@@ -1,19 +0,0 @@
-spring.servlet.multipart.max-file-size=10MB
-spring.servlet.multipart.max-request-size=10MB
-
-spring.jpa.hibernate.ddl-auto=update
-spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/appvehownserver
-spring.datasource.username=root
-spring.datasource.password=0cscadmin1
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-spring.jpa.show-sql=true
-
-spring.jpa.properties.hibernate.jdbc.batch_size=100
-spring.jpa.properties.hibernate.order_inserts=true
-spring.jpa.properties.hibernate.order_updates=true
-spring.datasource.hikari.auto-commit=true
-spring.datasource.hikari.idle-timeout=250000
-spring.jpa.properties.hibernate.generate_statistics=true
-
-

services/shell/target/classes/application.properties

@@ -1,19 +0,0 @@
-spring.profiles.active=ybdev
-
-
-spring.datasource.hikari.maximum-pool-size=100
-server.port=8081
-spring.datasource.hikari.auto-commit=true
-
-jwt.header=Authorization
-jwt.secret=mySecret
-jwt.expiration=604800
-
-spring.data.rest.basePath=/api
-server.servlet.context-path=/api
-
-spring.main.allow-circular-references=true
-
-spring.servlet.multipart.max-file-size=128KB
-spring.servlet.multipart.max-request-size=128KB
-

spring-shell.log

@@ -12,3 +12,6 @@
 1653243329540:d_l
 1653243522085:d_aa a
 1653243633459:d_l
+1653636147518:c_a test@test.test yannyann1
+1653636153711:_lc
+1653636156158:c_l