added rest requests

doc/data/brands.csv

@@ -0,0 +1,121 @@
+Audi
+BMW
+Mercedes-Benz
+Volkswagen
+Abarth
+AC
+Acura
+Aixam
+Alfa Romeo
+ALPINA
+Artega
+Asia Motors
+Aston Martin
+Audi
+Austin
+Austin Healey
+BAIC
+Bentley
+BMW
+Borgward
+Brilliance
+Bugatti
+Buick
+Cadillac
+Casalini
+Caterham
+Chatenet
+Chevrolet
+Chrysler
+Citroën
+Cobra
+Corvette
+Cupra
+Dacia
+Daewoo
+Daihatsu
+DeTomaso
+DFSK
+Dodge
+Donkervoort
+DS Automobiles
+Ferrari
+Fiat
+Fisker
+Ford
+GAC Gonow
+Gemballa
+GMC
+Grecav
+Hamann
+Holden
+Honda
+Hummer
+Hyundai
+Infiniti
+Isuzu
+Iveco
+Jaguar
+Jeep
+Kia
+Koenigsegg
+KTM
+Lada
+Lamborghini
+Lancia
+Land Rover
+Landwind
+Lexus
+Ligier
+Lincoln
+Lotus
+Mahindra
+Maserati
+Maybach
+Mazda
+McLaren
+Mercedes-Benz
+MG
+Microcar
+MINI
+Mitsubishi
+Morgan
+Nissan
+NSU
+Oldsmobile
+Opel
+Pagani
+Peugeot
+Piaggio
+Plymouth
+Polestar
+Pontiac
+Porsche
+Proton
+Renault
+Rolls-Royce
+Rover
+Ruf
+Saab
+Santana
+Seat
+Skoda
+Smart
+speedART
+Spyker
+Ssangyong
+Subaru
+Suzuki
+Talbot
+Tata
+TECHART
+Tesla
+Toyota
+Trabant
+Triumph
+TVR
+Volkswagen
+Volvo
+Wartburg
+Westfield
+Wiesmann

persistence/src/main/java/eu/csc/ODPAppVehOwnServer/persistence/respository/DeviceArticleRepository.java

@@ -15,6 +15,7 @@ public interface DeviceArticleRepository extends JpaRepository<DeviceArticleEnti
     List<DeviceArticleEntity> findByDevice(DeviceEntity s);
 
     int countAllByDeviceDevicenumber(String device);
+    int countAllByDevice_id(Long deviceId);
 
     Optional<DeviceArticleEntity> findByDeviceDevicenumberAndSerialNumber(String devicenumber, String name);
 }

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

@@ -68,16 +68,26 @@ public Optional<DeviceArticleEntity> findByDeviceAndSerialnumber(String devicenu
 }
 
 
-    public DeviceEntity addDevice(String brand, String name, String manufacturer) {
+    public DeviceEntity addDevice(String devicenumber, String name, String manufacturer) {
         DeviceEntity item = new DeviceEntity();
 
-        item.setDevicenumber(brand);
+        item.setDevicenumber(devicenumber);
         item.setName(name);
         item.setManufacturer(manufacturer);
 
         return deviceRepository.save(item);
     }
+    public DeviceArticleEntity generateNewDeviceArticle(Long deviceId){
 
+        var item = new DeviceArticleEntity();
+        item.setDevice(findDeviceById(deviceId).get());
+        item.setSerialNumber(utilsService.getSerialnumber(deviceArticleRepository.countAllByDevice_id(deviceId)));
+
+        deviceArticleRepository.save(item);
+
+        return item;
+
+    }
     public Optional<DeviceEntity> findDeviceById(Long deviceId) {
         return deviceRepository.findById(deviceId);
     }

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

@@ -2,10 +2,16 @@ package eu.csc.ODPAppVehOwnServer.persistence.services;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
 import org.springframework.stereotype.Service;
 
+import java.io.FileNotFoundException;
+import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.List;
 
 @Service
 public class GsonService {
@@ -19,6 +25,12 @@ public class GsonService {
 
         gson = builder.create();
     }
+public <T> Type getTypeTokenList(){
+        return new TypeToken<List<T>>(){}.getType();
+}
+    public <T> T  readJson(Type clazz, String filePath) throws FileNotFoundException {
+        return gson.fromJson(new JsonReader(new FileReader(filePath)), clazz);
+    }
 
     public void exportJson(Object data, String filePath) throws IOException {
 

services/resources/application-tldev.properties

@@ -4,7 +4,7 @@ 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=ODP123qweasdyxc
+spring.datasource.password=0cscadmin1
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 spring.jpa.show-sql=true

services/shell/src/main/java/eu/csc/ODPAppVehOwnServer/shell/DeviceCommands.java

@@ -26,13 +26,13 @@ private DeviceService deviceService;
 
 
     @ShellMethod(value = "add Device", key = {"d_a", "d-a"})
-    public String addDevice(String brand, String name, String manufacturer){
-        addMessageString(deviceService.addDevice(brand, name,manufacturer).toString());
+    public String addDevice(String devicenumber, String name, String manufacturer){
+        addMessageString(deviceService.addDevice(devicenumber, name,manufacturer).toString());
 
         return getMessageString();
     }
 
-    @ShellMethod(value = "add Device", key = {"d_aa", "d-aa"})
+    @ShellMethod(value = "add addDeviceArticle", key = {"d_aa", "d-aa"})
     public String addDeviceArticle(String device, @ShellOption(defaultValue = ShellOption.NULL) String articlenumber){
         if(articlenumber != null)
             addMessageString(deviceService.generateDeviceArticle(device, articlenumber).toString());