Merge branch 'exercise06' into exercise07

Hendrik Jungnitsch

2023-09-18 6228e7d52ef8799c72c3603704513f7cb89ce4a0

Merge branch 'exercise06' into exercise07

 pom.xml

@@ -5,7 +5,7 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
        <version>2.7.4</version>
        <version>3.1.3</version>
        <relativePath/> <!-- lookup parent from repository -->
    </parent>
    <groupId>de.gedoplan.seminar.sbt</groupId>

 src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/Beverage.java

@@ -1,6 +1,6 @@
package de.gedoplan.seminar.sbt.di.exercise.domain;

import javax.persistence.*;
import jakarta.persistence.*;
import java.util.Objects;

@Entity

 src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/Cocktail.java

@@ -1,6 +1,6 @@
package de.gedoplan.seminar.sbt.di.exercise.domain;

import javax.persistence.*;
import jakarta.persistence.*;
import java.text.Collator;
import java.util.Collections;
import java.util.Comparator;

 src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/CocktailOrder.java

@@ -1,6 +1,6 @@
package de.gedoplan.seminar.sbt.di.exercise.domain;

import javax.persistence.*;
import jakarta.persistence.*;
import java.util.Collections;
import java.util.Date;
import java.util.Map;

 src/main/java/de/gedoplan/seminar/sbt/di/exercise/init/DBInit.java

@@ -6,7 +6,7 @@
import de.gedoplan.seminar.sbt.di.exercise.repository.CocktailRepository;
import org.springframework.stereotype.Component;

import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;
import java.text.ParseException;
import java.util.List;


 src/main/java/de/gedoplan/seminar/sbt/di/exercise/service/CocktailsProducer.java

@@ -8,7 +8,7 @@
import org.springframework.context.annotation.Primary;
import org.springframework.web.context.annotation.RequestScope;

import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

 src/main/resources/application.yaml

@@ -7,3 +7,6 @@
  jpa:
    hibernate:
      ddl-auto: update

#cocktailService:
#  mock: true