Merge pull request #2 from matthieuLabaune/develop

Develop

Author: matthieuLabaune

pom.xml

@@ -15,7 +15,7 @@
 	<description>Demo project for Spring Boot</description>
 
 	<properties>
-		<java.version>11</java.version>
+		<java.version>15</java.version>
 	</properties>
 
 	<dependencies>
@@ -33,6 +33,24 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>2.8.0</version>
+		</dependency>
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>2.8.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.0</version>
+		</dependency>
+
 	</dependencies>
 
 	<build>

src/main/java/com/ecars/microcars/MicrocarsApplication.java

@@ -1,9 +1,13 @@
 package com.ecars.microcars;
 
+import jdk.jfr.Enabled;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
 
 @SpringBootApplication
+@EnableSwagger2
 public class MicrocarsApplication {
 
 	public static void main(String[] args) {

src/main/java/com/ecars/microcars/configuration/SwaggerConfig.java

@@ -0,0 +1,22 @@
+package com.ecars.microcars.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+    @Bean
+    public Docket api() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.ecars.microcars"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+}

src/main/java/com/ecars/microcars/controller/CarController.java

@@ -0,0 +1,51 @@
+package com.ecars.microcars.controller;
+
+import com.ecars.microcars.dao.CarDao;
+import com.ecars.microcars.model.Car;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.sql.rowset.CachedRowSet;
+import java.util.List;
+
+@RestController
+public class CarController {
+
+    @Autowired //Instanciation automatique
+    private CarDao carDao;
+
+    //INDEX => /cars
+    @GetMapping(value = "cars") //GET Mapping pour l'uri pour la liste des voitures
+    public List<Car> listCars() {
+        return carDao.findAll();
+    }
+
+    //SHOW BY ID => /cars/{id}
+    @GetMapping(value = "cars/{id}") //GET Mapping pour l'uri pour retourner une voiture par l'id
+    public Car showCar(@PathVariable int id) {// Va chercher le paramètre id dans l'url et le passe à notre méthode
+        return carDao.findById(id);
+    }
+
+    //STORE /cars
+    @PostMapping(value = "cars")
+    public void storeCar(@RequestBody Car car) { // Aller chercher dans le body de la requête la voiture et le parser
+        carDao.save(car);
+    }
+
+    @PutMapping(value = "/cars/{id}")
+    public ResponseEntity<?> updateCar(@PathVariable("id") int id, @RequestBody Car car) {
+        Car currentCar = carDao.findById(id);
+        currentCar.setBrand(car.getBrand());
+        currentCar.setModel(car.getModel());
+        carDao.updateCar(currentCar);
+        return new ResponseEntity<Car>(currentCar, HttpStatus.OK);
+    }
+
+    //DELETE
+    @DeleteMapping (value = "/cars/{id}")
+    public void deleteCar(@PathVariable int id) {
+        carDao.deleteCar(id);
+    }
+}

src/main/java/com/ecars/microcars/controller/MainController.java

@@ -0,0 +1,19 @@
+package com.ecars.microcars.dao;
+
+import com.ecars.microcars.model.Car;
+
+import java.util.List;
+
+public interface CarDao {
+
+    //Contrats pour CarDao
+    public List<Car> findAll();
+
+    public Car findById(int id);
+
+    public Car save(Car car);
+
+    public Car updateCar(Car car);
+
+    public Car deleteCar(int id);
+}

src/main/java/com/ecars/microcars/dao/CarDao.java

@@ -0,0 +1,55 @@
+package com.ecars.microcars.dao;
+
+import com.ecars.microcars.model.Car;
+import org.springframework.stereotype.Repository;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Repository
+public class CarDaoImpl implements CarDao {
+
+    public static List<Car> cars = new ArrayList<>();
+
+    static {
+        cars.add(new Car(1, "Honda", "Jazz"));
+        cars.add(new Car(2, "Volvo", "940"));
+        cars.add(new Car(3, "Opel", "Corsa"));
+    }
+
+    @Override
+    public List<Car> findAll() {
+        return cars;
+    }
+
+    @Override
+    public Car findById(int id) {
+        for (Car car : cars) {
+            if (car.getId() == id) {
+                return car;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public Car save(Car car) {
+        cars.add(car);
+        return car;
+    }
+
+    @Override
+    public Car deleteCar(int id){
+        for (Car car : cars){
+            if (car.getId() == id) {
+                cars.remove(id);
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public Car updateCar(Car car) {
+        return car;
+    }
+}

src/main/java/com/ecars/microcars/dao/CarDaoImpl.java

@@ -1,12 +1,27 @@
 package com.ecars.microcars.model;
 
+import java.util.Objects;
+
 public class Car {
+    private int id;
     private String brand;
-    private String modele;
+    private String model;
+
+    public Car() {
+    }
 
-    public Car(String brand, String modele) {
+    public Car(int id, String brand, String model) {
+        this.id = id;
         this.brand = brand;
-        this.modele = modele;
+        this.model = model;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
     }
 
     public String getBrand() {
@@ -17,19 +32,20 @@ public void setBrand(String brand) {
         this.brand = brand;
     }
 
-    public String getModele() {
-        return modele;
+    public String getModel() {
+        return model;
     }
 
-    public void setModele(String modele) {
-        this.modele = modele;
+    public void setModel(String model) {
+        this.model = model;
     }
 
     @Override
     public String toString() {
         return "Car{" +
+                "id=" + id +
                 ", brand='" + brand + '\'' +
-                ", modele='" + modele + '\'' +
+                ", model='" + model + '\'' +
                 '}';
     }
 }

src/main/java/com/ecars/microcars/form/CarForm.java

@@ -1,5 +1,2 @@
 server.port=8080
-spring.thymeleaf.cache=false
-
-welcome.message=Hello Thymeleaf
-error.message=Brand & Model is required!
+spring.application.name=MicroCars