Merge branch 'develop' into frontend/timo

build.gradle

@@ -17,6 +17,7 @@ repositories {
 }
 
 dependencies {
+    //Java Spring
     implementation 'org.springframework.boot:spring-boot-starter-web'
     runtimeOnly 'org.springframework.boot:spring-boot-devtools'
     runtimeOnly 'mysql:mysql-connector-java'

src/main/java/hhn/labsw/bugageocaching/controller/Controller.java

@@ -1,7 +1,6 @@
 package hhn.labsw.bugageocaching.controller;
 
 import com.google.gson.Gson;
-import hhn.labsw.bugageocaching.entities.Cache;
 import hhn.labsw.bugageocaching.repositories.CacheRepository;
 import hhn.labsw.bugageocaching.repositories.RewardRepository;
 import hhn.labsw.bugageocaching.repositories.StationRepository;

src/main/java/hhn/labsw/bugageocaching/entities/Cache.java

@@ -20,6 +20,9 @@ public class Cache {
   @OneToMany
   private List<Station> stationen = new ArrayList<>();
 
+  @ManyToOne
+  private Reward reward;
+
   public Cache() {
   }
 
@@ -59,7 +62,15 @@ public class Cache {
     return stationen;
   }
 
-  public void setStationen(ArrayList<Station> stationen) {
+  public void setStationen(List<Station> stationen) {
     this.stationen = stationen;
   }
+  
+  public Reward getReward() {
+    return reward;
+  }
+
+  public void setReward(Reward reward) {
+    this.reward = reward;
+  }
 }