application won't start

SharedTravelMapIonicApp

@@ -1 +0,0 @@
-Subproject commit f7280c048e787a8e96199514ab31df131263e79c

pom.xml

@@ -14,6 +14,14 @@
         <version>1.3.1.RELEASE</version>
     </parent>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -28,7 +36,30 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>5.1.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>4.1.4.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>5.2.3.Final</version>
+        </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

src/main/java/com/alidade/config/PersistenceConfiguration.java

@@ -0,0 +1,19 @@
+package com.alidade.config;
+
+import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+import javax.sql.DataSource;
+
+@Configuration
+public class PersistenceConfiguration {
+    @Bean
+    @ConfigurationProperties(prefix="spring.datasource")
+    @Primary
+    public DataSource dataSource(){
+        return DataSourceBuilder.create().build();
+    }
+}

src/main/java/com/alidade/controller/DestinationController.java

@@ -1,13 +1,45 @@
 package com.alidade.controller;
 
+import com.alidade.model.Destination;
 import com.alidade.repository.DestinationRepository;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
+@RequestMapping("api/v1/")
 public class DestinationController {
 
     @Autowired
     DestinationRepository destinationRepository;
 
+    //CREATE
+    @RequestMapping(value = "destinations", method = RequestMethod.POST)
+    public Destination create(@RequestBody Destination destination){
+        return destinationRepository.saveAndFlush(destination);
+    }
+
+    //READ
+    @RequestMapping(value = "destinations/{id}", method = RequestMethod.GET)
+    public Destination get(@PathVariable Long id){
+        return destinationRepository.findOne(id);
+    }
+
+    //UPDATE
+    @RequestMapping(value = "destinations/{id}", method = RequestMethod.PUT)
+    public Destination update(@PathVariable Long id, @RequestBody Destination destination){
+        Destination destinationToUpdate = destinationRepository.findOne(id);
+        BeanUtils.copyProperties(destination, destinationToUpdate);
+        return destinationRepository.saveAndFlush(destinationToUpdate);
+    }
+
+    //DELETE
+    @RequestMapping(value = "destinations/{id}", method = RequestMethod.DELETE)
+    public Destination delete(@PathVariable Long id){
+        Destination destinationToDelete = destinationRepository.findOne(id);
+        destinationRepository.delete(destinationToDelete);
+        return destinationToDelete;
+    }
+
 }

src/main/java/com/alidade/controller/FriendListController.java

@@ -2,9 +2,12 @@ package com.alidade.controller;
 
 import com.alidade.repository.FriendListRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
+@RequestMapping("api/v1/")
 public class FriendListController {
 
     @Autowired

src/main/java/com/alidade/controller/HomeController.java

@@ -1,9 +1,11 @@
 package com.alidade.controller;
 
+import org.springframework.context.annotation.Configuration;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
+@RequestMapping("api/v1/")
 public class HomeController {
 
     @RequestMapping("/")

src/main/java/com/alidade/controller/MapController.java

@@ -2,9 +2,12 @@ package com.alidade.controller;
 
 import com.alidade.repository.MapRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
+@RequestMapping("api/v1/")
 public class MapController {
 
     @Autowired

src/main/java/com/alidade/controller/MessageBoardController.java

@@ -2,9 +2,12 @@ package com.alidade.controller;
 
 import com.alidade.repository.MessageBoardRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
+@RequestMapping("api/v1/")
 public class MessageBoardController {
 
     @Autowired

src/main/java/com/alidade/controller/MessageController.java

@@ -1,12 +0,0 @@
-package com.alidade.controller;
-
-import com.alidade.repository.MessageRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class MessageController {
-
-    @Autowired
-    MessageRepository messageRepository;
-}

src/main/java/com/alidade/controller/UserController.java

@@ -4,9 +4,11 @@ import com.alidade.model.User;
 import com.alidade.repository.UserRepository;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
+@RequestMapping("api/v1/")
 public class UserController {
 
     @Autowired

src/main/java/com/alidade/controller/UserLoginController.java

@@ -2,9 +2,12 @@ package com.alidade.controller;
 
 import com.alidade.repository.UserLoginRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
+@RequestMapping("api/v1/")
 public class UserLoginController {
 
     @Autowired

src/main/java/com/alidade/model/Destination.java

@@ -7,14 +7,21 @@ public class Destination {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "DESTINATION_ID")
     private Long id;
+    private String destinationType;
     private String city;
-    private String state;
+    private String country;
     private String startDate;
     private String endDate;
     private String travelType;
     private String favoriteThing;
     private String notes;
 
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return this.id;
+    }
 }

src/main/java/com/alidade/model/FriendList.java

@@ -1,15 +1,12 @@
 package com.alidade.model;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 import java.util.List;
 
+@Entity
 public class FriendList {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "FRIENDLIST_ID")
     private Long id;
     private List<User> friends;
 }

src/main/java/com/alidade/model/Map.java

@@ -1,15 +1,12 @@
 package com.alidade.model;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 import java.util.List;
 
+@Entity
 public class Map {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "MAP_ID")
     private Long id;
     private List<Destination> destinations;
 }

src/main/java/com/alidade/model/Message.java

@@ -1,15 +0,0 @@
-package com.alidade.model;
-
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-public class Message {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "MESSAGE_ID")
-    private Long id;
-    String userFromId;
-    String body;
-}

src/main/java/com/alidade/model/MessageBoard.java

@@ -1,15 +1,12 @@
 package com.alidade.model;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 import java.util.List;
 
+@Entity
 public class MessageBoard {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "MESSAGEBOARD_ID")
     private Long id;
-    List<Message> messages;
+    List<String> messages;
 }

src/main/java/com/alidade/model/User.java

@@ -1,14 +1,11 @@
 package com.alidade.model;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 
+@Entity
 public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "USER_ID")
     private Long id;
     private String userName;
     private String firstName;

src/main/java/com/alidade/model/UserLogin.java

@@ -1,14 +1,12 @@
 package com.alidade.model;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 
+@Entity
 public class UserLogin {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "USERLOGIN_ID")
     private String email;
+
     private String password;
 }

src/main/java/com/alidade/repository/DestinationRepository.java

@@ -2,6 +2,8 @@ package com.alidade.repository;
 
 import com.alidade.model.Destination;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface DestinationRepository extends JpaRepository<Destination, Long> {
 }

src/main/java/com/alidade/repository/FriendListRepository.java

@@ -2,6 +2,8 @@ package com.alidade.repository;
 
 import com.alidade.model.FriendList;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface FriendListRepository extends JpaRepository<FriendList, Long> {
 }

src/main/java/com/alidade/repository/MapRepository.java

@@ -2,6 +2,8 @@ package com.alidade.repository;
 
 import com.alidade.model.Map;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface MapRepository extends JpaRepository<Map,Long> {
 }

src/main/java/com/alidade/repository/MessageBoardRepository.java

@@ -2,6 +2,8 @@ package com.alidade.repository;
 
 import com.alidade.model.MessageBoard;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface MessageBoardRepository extends JpaRepository<MessageBoard, Long> {
 }

src/main/java/com/alidade/repository/MessageRepository.java

@@ -1,7 +0,0 @@
-package com.alidade.repository;
-
-import com.alidade.model.Message;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface MessageRepository extends JpaRepository<Message, Long> {
-}

src/main/java/com/alidade/repository/UserLoginRepository.java

@@ -2,6 +2,8 @@ package com.alidade.repository;
 
 import com.alidade.model.UserLogin;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface UserLoginRepository extends JpaRepository<UserLogin, Long> {
 }

src/main/java/com/alidade/repository/UserRepository.java

@@ -2,6 +2,8 @@ package com.alidade.repository;
 
 import com.alidade.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface UserRepository extends JpaRepository<User, Long> {
 }

src/main/resources/application.properties

@@ -1,3 +1,9 @@
 logging.level.org.springframework.web=DEBUG
 
-server.port=8080
+server.port=8080
+
+spring.jpa.hibernate.ddl-auto=create
+spring.datasource.url=jdbc:mysql://localhost:3306/shared_travel_map
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.username=springuser
+spring.datasource.password=Password

src/test/java/DestinationControllerTest.java

@@ -0,0 +1,44 @@
+import com.alidade.controller.DestinationController;
+import com.alidade.model.Destination;
+import com.alidade.repository.DestinationRepository;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class DestinationControllerTest {
+
+    @InjectMocks
+    private DestinationController dc;
+
+    @Mock
+    private DestinationRepository destinationRepository;
+
+    @Before
+    public void init() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+
+    @Test
+    public void testUserCreate() {
+        Destination destination = new Destination();
+        destination.setId(1L);
+    }
+
+    @Test
+    public void testUserGet() {
+        Destination destination = new Destination();
+        destination.setId(1L);
+        when(destinationRepository.findOne(1l)).thenReturn(destination);
+        Destination destinationTest = dc.get(1L);
+        verify(destinationRepository).findOne(1l);
+        assertThat(destinationTest.getId(), is(1l));
+    }
+}

target/classes/application.properties

@@ -1,3 +1,9 @@
 logging.level.org.springframework.web=DEBUG
 
-server.port=8080
+server.port=8080
+
+spring.jpa.hibernate.ddl-auto=create
+spring.datasource.url=jdbc:mysql://localhost:3306/shared_travel_map
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.username=springuser
+spring.datasource.password=Password