changed around some classes and added new packages

.gitignore

@@ -1,7 +1,7 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# Controllers.User-specific stuff:
+# Controllers.com.tyler.motivateme.model.User-specific stuff:
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/dictionaries
@@ -38,7 +38,7 @@ cmake-build-debug/
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# Controllers.User-specific stuff:
+# Controllers.com.tyler.motivateme.model.User-specific stuff:
 *.iml
 .idea/**
 .idea/**/workspace.xml
@@ -88,7 +88,7 @@ crashlytics-build.properties
 fabric.properties# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
                  # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-                 # Controllers.User-specific stuff:
+                 # Controllers.com.tyler.motivateme.model.User-specific stuff:
                  .idea/**/workspace.xml
                  .idea/**/tasks.xml
                  .idea/dictionaries

derby.log

@@ -0,0 +1,13 @@
+----------------------------------------------------------------
+Fri Jul 13 10:24:59 EDT 2018:
+Booting Derby version The Apache Software Foundation - Apache Derby - 10.14.1.0 - (1808820): instance a816c00e-0164-9407-d674-0000039a2310 
+on database directory memory:/Users/williams/Labs/ZCW-SpringOne/motivateme/testdb with class loader sun.misc.Launcher$AppClassLoader@18b4aac2 
+Loaded from file:/Users/williams/.m2/repository/org/apache/derby/derby/10.14.1.0/derby-10.14.1.0.jar
+java.vendor=Oracle Corporation
+java.runtime.version=1.8.0_172-b11
+user.dir=/Users/williams/Labs/ZCW-SpringOne/motivateme
+os.name=Mac OS X
+os.arch=x86_64
+os.version=10.13.4
+derby.system.home=null
+Database Class Loader started - derby.database.classpath=''

pom.xml

@@ -1,44 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.tyler</groupId>
     <artifactId>motivateme</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>motivateme</name>
+    <description>Demo project for Spring Boot</description>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.0.3.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-rest</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-hateoas</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>RELEASE</version>
-            <scope>test</scope>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
         </dependency>
-
         <dependency>
-            <groupId>net.anthavio.disquo</groupId>
-            <artifactId>disquo-api</artifactId>
-            <version>1.0.2</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
-
-
     <build>
         <plugins>
             <plugin>
@@ -48,4 +63,5 @@
         </plugins>
     </build>
 
-</project>
+
+</project>

src/main/java/Controllers/TopicsController.java

@@ -1,11 +0,0 @@
-package Controllers;
-
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public interface TopicsController {
-
-    public String getDescription();
-    public String getAdviceAndStrategies();
-
-}

src/main/java/Controllers/User.java

@@ -1,20 +0,0 @@
-package Controllers;
-
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public abstract class User {
-    private int id;
-    private String name;
-    private String username;
-    private String password;
-    private String email;
-
-    public User(int id, String name, String username, String password, String email){
-        this.id = id;
-        this.name = name;
-        this.username = username;
-        this.password = password;
-        this.email = email;
-    }
-}

src/main/java/Model/NewAccountCreator.java

@@ -1,14 +0,0 @@
-package Model;
-
-import Controllers.User;
-
-public class NewAccountCreator extends User {
-
-    public NewAccountCreator(int id, String name, String username, String password, String email) {
-        super(id, name, username, password, email);
-    }
-
-    public User createUser(){
-        return null;
-    }
-}

src/main/java/View/Forum.java → src/main/java/com/tyler/motivateme/Forum.java

@@ -1,8 +1,6 @@
-package View;
+package com.tyler.motivateme;
 
-import Controllers.CommentController;
-
-public class Forum extends CommentController {
+public class Forum {
     private int forumId;
 
     public Forum(int forumId) {

src/main/java/View/Inbox.java → src/main/java/com/tyler/motivateme/Inbox.java

@@ -1,8 +1,6 @@
-package View;
+package com.tyler.motivateme;
 
-import Controllers.MessageController;
-
-public class Inbox extends MessageController {
+public class Inbox {
     private int id;
 
     public Inbox(int id){

src/main/java/View/MainApplication.java → src/main/java/com/tyler/motivateme/MainApplication.java

@@ -1,4 +1,4 @@
-package View;
+package com.tyler.motivateme;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/View/MainTopicsPage.java → src/main/java/com/tyler/motivateme/MainTopicsPage.java

@@ -1,4 +1,4 @@
-package View;
+package com.tyler.motivateme;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/Model/NewTopicCreator.java → src/main/java/com/tyler/motivateme/TopicInfoPage.java

@@ -1,15 +1,11 @@
-package Model;
+package com.tyler.motivateme;
 
-import Controllers.TopicsController;
+public class TopicInfoPage{
 
-public class NewTopicCreator implements TopicsController {
-
-    @Override
     public String getDescription() {
         return null;
     }
 
-    @Override
     public String getAdviceAndStrategies() {
         return null;
     }

src/main/java/Controllers/CommentController.java → src/main/java/com/tyler/motivateme/controller/CommentController.java

@@ -1,8 +1,10 @@
-package Controllers;
+package com.tyler.motivateme.controller;
 
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
+@RequestMapping("/comments")
 public class CommentController {
 
     public String postComment(int id){

src/main/java/Controllers/MessageController.java → src/main/java/com/tyler/motivateme/controller/MessageController.java

@@ -1,11 +1,13 @@
-package Controllers;
+package com.tyler.motivateme.controller;
 
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
+@RequestMapping("/messages")
 public class MessageController {
 
     public String sendMessage(int id){
         return null;
     }
-}
+}

src/main/java/com/tyler/motivateme/controller/NewTopicCreatorController.java

@@ -0,0 +1,24 @@
+package com.tyler.motivateme.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class NewTopicCreatorController {
+
+//    @Autowired
+//    private NewTopicCreatorService newTopicCreatorService;
+//
+//    @RequestMapping(path="/topics")
+//    public List<Topic> allTopics() {
+//
+//        return newTopicCreatorService.allTopics();
+//    }
+
+    @RequestMapping(value="/api/topics")
+    public String what(){
+        return "topic";
+    }
+
+
+}

src/main/java/com/tyler/motivateme/controller/TestController1.java

@@ -0,0 +1,13 @@
+package com.tyler.motivateme.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class TestController1 {
+
+    @GetMapping(value = "/hello")
+    public String hello(){
+        return "world";
+    }
+}

src/main/java/com/tyler/motivateme/controller/TopicsController.java

@@ -0,0 +1,13 @@
+package com.tyler.motivateme.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/mytopics")
+public class TopicsController {
+
+    public String getDescription() {return null;}
+    public String getAdviceAndStrategies() {return null;}
+
+}

src/main/java/Model/Console.java → src/main/java/com/tyler/motivateme/model/Console.java

@@ -1,4 +1,4 @@
-package Model;
+package com.tyler.motivateme.model;
 
 public class Console {
 

src/main/java/View/TopicInfoPage.java → src/main/java/com/tyler/motivateme/model/NewTopicCreator.java

@@ -1,15 +1,13 @@
-package View;
+package com.tyler.motivateme.model;
 
-import Controllers.TopicsController;
 
-public class TopicInfoPage implements TopicsController {
+public class NewTopicCreator{
 
-    @Override
     public String getDescription() {
+
         return null;
     }
 
-    @Override
     public String getAdviceAndStrategies() {
         return null;
     }

src/main/java/com/tyler/motivateme/model/NewTopicCreatorService.java

@@ -0,0 +1,18 @@
+package com.tyler.motivateme.model;
+
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Service
+public class NewTopicCreatorService {
+
+    private List<Topic> topics = new ArrayList<Topic>(Arrays.asList(new Topic(1, "Quit drinking"), new Topic(2, "Quit Smoking"), new Topic(3, "Eat healthier")));
+
+    public List<Topic> allTopics() {
+
+        return topics;
+    }
+}

src/main/java/com/tyler/motivateme/model/Topic.java

@@ -0,0 +1,35 @@
+package com.tyler.motivateme.model;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+public class Topic {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+    private String name;
+
+    public Topic(int id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public Topic(){};
+
+    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;
+    }
+}

src/main/java/com/tyler/motivateme/model/User.java

@@ -0,0 +1,68 @@
+package com.tyler.motivateme.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class User {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    private String name;
+    private String username;
+    private String password;
+    private String email;
+
+    public User(){}
+
+    public User(int id, String name, String username, String password, String email){
+        this.id = id;
+        this.name = name;
+        this.username = username;
+        this.password = password;
+        this.email = email;
+    }
+
+    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 getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+}

src/main/java/com/tyler/motivateme/repository/UserRepository.java

@@ -0,0 +1,9 @@
+package com.tyler.motivateme.repository;
+
+import com.tyler.motivateme.model.User;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UserRepository extends CrudRepository<User, Integer> {
+}

src/main/resources/application.properties

@@ -0,0 +1,3 @@
+spring.jpa.hibernate.ddl-auto=create-drop
+spring.datasource.url=jdbc:mysql://localhost:3306/demo1?useSSL=false
+spring.datasource.username=root

src/test/java/Controllers/CommentControllerTest.java

@@ -1,7 +1,12 @@
 package Controllers;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 
+@RunWith(SpringRunner.class)
+@SpringBootTest
 public class CommentControllerTest {
 
     @Test

src/test/java/Controllers/MessageControllerTest.java

@@ -1,7 +1,13 @@
 package Controllers;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
 public class MessageControllerTest {
 
     @Test

src/test/java/Model/ConsoleTest.java

@@ -1,7 +1,13 @@
 package Model;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
 public class ConsoleTest {
 
     @Test

src/test/java/Model/NewAccountCreatorTest.java

@@ -1,7 +1,17 @@
 package Model;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
 public class NewAccountCreatorTest {
 
+    @Test
+    public void testCreateUser() {
 
+    }
 
 }

src/test/java/Model/NewTopicCreatorTest.java

@@ -1,7 +1,12 @@
 package Model;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 
+@RunWith(SpringRunner.class)
+@SpringBootTest
 public class NewTopicCreatorTest {
 
     @Test

src/test/java/View/ForumTest.java

@@ -1,7 +1,12 @@
 package View;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 
+@RunWith(SpringRunner.class)
+@SpringBootTest
 public class ForumTest {
 
     @Test

src/test/java/View/InboxTest.java

@@ -1,7 +1,12 @@
 package View;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 
+@RunWith(SpringRunner.class)
+@SpringBootTest
 public class InboxTest {
 
     @Test

src/test/java/View/MainTopicsPageTest.java

@@ -1,7 +1,12 @@
 package View;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 
+@RunWith(SpringRunner.class)
+@SpringBootTest
 public class MainTopicsPageTest {
 
     @Test

src/test/java/View/TopicInfoPageTest.java

@@ -1,7 +1,12 @@
 package View;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 
+@RunWith(SpringRunner.class)
+@SpringBootTest
 public class TopicInfoPageTest {
 
     @Test