From 6dea6901505aed17dd772c47c4c343369a2681b1 Mon Sep 17 00:00:00 2001 From: Maximilian Leopold Date: Wed, 20 Mar 2019 19:26:35 +0100 Subject: [PATCH 1/5] Added index.html --- .idea/compiler.xml | 2 ++ .idea/modules.xml | 6 +++--- ... => de.hhn.labsw.labswp_2019_sose_geocaching.iml} | 3 ++- ...e.hhn.labsw.labswp_2019_sose_geocaching.main.iml} | 6 +++++- ...e.hhn.labsw.labswp_2019_sose_geocaching.test.iml} | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 3 ++- src/main/resources/application.properties | 0 src/main/resources/public/index.html | 12 ++++++++++++ 8 files changed, 30 insertions(+), 10 deletions(-) rename .idea/modules/{de.hhn.labsw.BuGaGeocaching.iml => de.hhn.labsw.labswp_2019_sose_geocaching.iml} (54%) rename .idea/modules/{de.hhn.labsw.BuGaGeocaching.main.iml => de.hhn.labsw.labswp_2019_sose_geocaching.main.iml} (89%) rename .idea/modules/{de.hhn.labsw.BuGaGeocaching.test.iml => de.hhn.labsw.labswp_2019_sose_geocaching.test.iml} (93%) create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/public/index.html diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 5ff9b03..8b96030 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -4,6 +4,8 @@ + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 4324b85..9db8a1d 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,9 +2,9 @@ - - - + + + \ No newline at end of file diff --git a/.idea/modules/de.hhn.labsw.BuGaGeocaching.iml b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.iml similarity index 54% rename from .idea/modules/de.hhn.labsw.BuGaGeocaching.iml rename to .idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.iml index 8ee9164..f377552 100644 --- a/.idea/modules/de.hhn.labsw.BuGaGeocaching.iml +++ b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.iml @@ -1,10 +1,11 @@ - + + diff --git a/.idea/modules/de.hhn.labsw.BuGaGeocaching.main.iml b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.main.iml similarity index 89% rename from .idea/modules/de.hhn.labsw.BuGaGeocaching.main.iml rename to .idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.main.iml index bd6c4ee..888ec7c 100644 --- a/.idea/modules/de.hhn.labsw.BuGaGeocaching.main.iml +++ b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.main.iml @@ -1,5 +1,5 @@ - + @@ -7,6 +7,9 @@ + + + @@ -15,6 +18,7 @@ + diff --git a/.idea/modules/de.hhn.labsw.BuGaGeocaching.test.iml b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml similarity index 93% rename from .idea/modules/de.hhn.labsw.BuGaGeocaching.test.iml rename to .idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml index 3345bbc..99f8362 100644 --- a/.idea/modules/de.hhn.labsw.BuGaGeocaching.test.iml +++ b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml @@ -1,5 +1,5 @@ - + @@ -19,14 +19,14 @@ - + - + @@ -78,5 +78,5 @@ - + \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 115e6ac..704a335 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Wed Mar 20 19:26:07 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/public/index.html b/src/main/resources/public/index.html new file mode 100644 index 0000000..68493bc --- /dev/null +++ b/src/main/resources/public/index.html @@ -0,0 +1,12 @@ + + + + + Title + + +

Hello World

+ +
+ + From 5098525669be18912ded85185006becda03e9881 Mon Sep 17 00:00:00 2001 From: Maximilian Leopold Date: Thu, 21 Mar 2019 12:14:13 +0100 Subject: [PATCH 2/5] Added index.html --- .idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml | 2 +- src/main/resources/public/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml index 99f8362..9501f06 100644 --- a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml +++ b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml @@ -25,8 +25,8 @@ - + diff --git a/src/main/resources/public/index.html b/src/main/resources/public/index.html index 68493bc..413d616 100644 --- a/src/main/resources/public/index.html +++ b/src/main/resources/public/index.html @@ -7,6 +7,6 @@

Hello World

-
+
2
From 53565dfda37641c0797fb374200e989311014213 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 21 Mar 2019 14:09:29 +0100 Subject: [PATCH 3/5] . --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index dfa50d0..768ce16 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,8 @@ labswp_2019_sose_geocaching.iml .idea/modules/labswp_2019_sose_geocaching_main.iml .idea/modules/labswp_2019_sose_geocaching_test.iml +# public folder +src/main/resources/public # Gradle From e0074747b63b15a7e6bb364b05d5f929491d8985 Mon Sep 17 00:00:00 2001 From: Maximilian Leopold Date: Thu, 21 Mar 2019 15:14:23 +0100 Subject: [PATCH 4/5] =?UTF-8?q?Added=20Cache,Reward,Station=20Entity=20Cla?= =?UTF-8?q?ss=20|=C2=A0Connection=20with=20Database=20is=20now=20possible?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...labsw.labswp_2019_sose_geocaching.main.iml | 43 +++++++++--- ...labsw.labswp_2019_sose_geocaching.test.iml | 40 +++++++++--- build.gradle | 8 +++ .../labsw/bugageocaching/entities/Cache.java | 65 +++++++++++++++++++ .../labsw/bugageocaching/entities/Reward.java | 37 +++++++++++ .../bugageocaching/entities/Station.java | 53 +++++++++++++++ .../repositories/CacheRepository.java | 7 ++ .../repositories/RewardRepository.java | 7 ++ .../repositories/StationRepository.java | 7 ++ src/main/resources/application.properties | 9 +-- 10 files changed, 253 insertions(+), 23 deletions(-) create mode 100644 src/main/java/hhn/labsw/bugageocaching/entities/Cache.java create mode 100644 src/main/java/hhn/labsw/bugageocaching/entities/Reward.java create mode 100644 src/main/java/hhn/labsw/bugageocaching/entities/Station.java create mode 100644 src/main/java/hhn/labsw/bugageocaching/repositories/CacheRepository.java create mode 100644 src/main/java/hhn/labsw/bugageocaching/repositories/RewardRepository.java create mode 100644 src/main/java/hhn/labsw/bugageocaching/repositories/StationRepository.java diff --git a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.main.iml b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.main.iml index 888ec7c..4c34fff 100644 --- a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.main.iml +++ b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.main.iml @@ -22,24 +22,53 @@ + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -49,16 +78,10 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml index 9501f06..1314143 100644 --- a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml +++ b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml @@ -20,13 +20,22 @@ + + - + + + + + + + + + - @@ -40,6 +49,10 @@ + + + + @@ -48,7 +61,23 @@ + + + + + + + + + + + + + + + + @@ -59,14 +88,7 @@ - - - - - - - diff --git a/build.gradle b/build.gradle index f75cae0..247c73e 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,12 @@ dependencies { runtimeOnly 'org.springframework.boot:spring-boot-devtools' runtimeOnly 'mysql:mysql-connector-java' testImplementation 'org.springframework.boot:spring-boot-starter-test' + + //JPA + compile 'org.springframework.boot:spring-boot-starter-data-jpa' + + //MariaDB + implementation 'org.mariadb.jdbc:mariadb-java-client' } node { @@ -35,5 +41,7 @@ tasks.withType(NpmTask) { } } + + assemble.dependsOn npm_install assemble.dependsOn npm_run_build diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/Cache.java b/src/main/java/hhn/labsw/bugageocaching/entities/Cache.java new file mode 100644 index 0000000..0305341 --- /dev/null +++ b/src/main/java/hhn/labsw/bugageocaching/entities/Cache.java @@ -0,0 +1,65 @@ +package hhn.labsw.bugageocaching.entities; + + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table +public class Cache { + + @Id + @GeneratedValue + private int id; + + private String name; + private String description; + private int rankingPoints; + + @OneToMany + private List stationen = new ArrayList<>(); + + public Cache() { + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getRankingPoints() { + return rankingPoints; + } + + public void setRankingPoints(int rankingPoints) { + this.rankingPoints = rankingPoints; + } + + public List getStationen() { + return stationen; + } + + public void setStationen(ArrayList stationen) { + this.stationen = stationen; + } +} diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/Reward.java b/src/main/java/hhn/labsw/bugageocaching/entities/Reward.java new file mode 100644 index 0000000..c83cc88 --- /dev/null +++ b/src/main/java/hhn/labsw/bugageocaching/entities/Reward.java @@ -0,0 +1,37 @@ +package hhn.labsw.bugageocaching.entities; + + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table +public class Reward { + + @Id + @GeneratedValue + private int id; + + private String rewardDescription; + + public Reward() { + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getRewardDescription() { + return rewardDescription; + } + + public void setRewardDescription(String rewardDescription) { + this.rewardDescription = rewardDescription; + } +} diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/Station.java b/src/main/java/hhn/labsw/bugageocaching/entities/Station.java new file mode 100644 index 0000000..0acfaa9 --- /dev/null +++ b/src/main/java/hhn/labsw/bugageocaching/entities/Station.java @@ -0,0 +1,53 @@ +package hhn.labsw.bugageocaching.entities; + + +import javax.persistence.*; + +@Entity +@Table +public class Station { + + @Id + @GeneratedValue + private int id; + + private String description; + private double longitude; + private double lattitude; + + public Station() { + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public double getLongitude() { + return longitude; + } + + public void setLongitude(double longitude) { + this.longitude = longitude; + } + + public double getLattitude() { + return lattitude; + } + + public void setLattitude(double lattitude) { + this.lattitude = lattitude; + } + +} diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/CacheRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/CacheRepository.java new file mode 100644 index 0000000..b480c64 --- /dev/null +++ b/src/main/java/hhn/labsw/bugageocaching/repositories/CacheRepository.java @@ -0,0 +1,7 @@ +package hhn.labsw.bugageocaching.repositories; + +import hhn.labsw.bugageocaching.entities.Cache; +import org.springframework.data.repository.CrudRepository; + +public interface CacheRepository extends CrudRepository { +} diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/RewardRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/RewardRepository.java new file mode 100644 index 0000000..ca51b18 --- /dev/null +++ b/src/main/java/hhn/labsw/bugageocaching/repositories/RewardRepository.java @@ -0,0 +1,7 @@ +package hhn.labsw.bugageocaching.repositories; + +import hhn.labsw.bugageocaching.entities.Reward; +import org.springframework.data.repository.CrudRepository; + +public interface RewardRepository extends CrudRepository { +} diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/StationRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/StationRepository.java new file mode 100644 index 0000000..c902ec5 --- /dev/null +++ b/src/main/java/hhn/labsw/bugageocaching/repositories/StationRepository.java @@ -0,0 +1,7 @@ +package hhn.labsw.bugageocaching.repositories; + +import hhn.labsw.bugageocaching.entities.Station; +import org.springframework.data.repository.CrudRepository; + +public interface StationRepository extends CrudRepository { +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0c5ee2a..10ea689 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,4 +1,5 @@ -#spring.jpa.hibernate.ddl-auto=none -#spring.datasource.url=jdbc:mysql://seserver.se.hs-heilbronn.de:3306/BuGaCommonTest -#spring.datasource.username=BuGaTestUser -#spring.datasource.password=TestPw \ No newline at end of file +spring.datasource.url=jdbc:mariadb://seserver.se.hs-heilbronn.de:3406/buga19Geocaching +spring.datasource.username=BuGa19GeocachingUser +spring.datasource.password=GeocachingPw +spring.datasource.driver-class-name=org.mariadb.jdbc.Driver +spring.jpa.hibernate.ddl-auto=create \ No newline at end of file From 2b21ce0b9c2f0158872ffdb88b59b460139e2baa Mon Sep 17 00:00:00 2001 From: Maximilian Leopold Date: Thu, 21 Mar 2019 15:23:17 +0100 Subject: [PATCH 5/5] Changed application.properties --- .idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml | 2 +- src/main/resources/application.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml index 1314143..ce5f54b 100644 --- a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml +++ b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml @@ -25,8 +25,8 @@ - + diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 10ea689..3fd5f91 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,4 +2,4 @@ spring.datasource.url=jdbc:mariadb://seserver.se.hs-heilbronn.de:3406/buga19Geoc spring.datasource.username=BuGa19GeocachingUser spring.datasource.password=GeocachingPw spring.datasource.driver-class-name=org.mariadb.jdbc.Driver -spring.jpa.hibernate.ddl-auto=create \ No newline at end of file +spring.jpa.hibernate.ddl-auto=update \ No newline at end of file