Merge pull request #8 from atusa17/PAN-5

Pan 5

pandamonium-theorem-prover/build.gradle

@@ -16,6 +16,9 @@ plugins {
     id 'org.unbroken-dome.test-sets' version '1.4.5'
     id 'war'
 }
+
+apply plugin: 'org.springframework.boot'
+
 description = 'Pandamonium Theorem Prover'
 
 group 'edu.msudenver.tsp'
@@ -38,10 +41,42 @@ allprojects {
     apply plugin: 'jacoco'
     apply plugin: 'org.unbroken-dome.test-sets'
     apply plugin: 'idea'
-    apply plugin: 'org.springframework.boot'
     apply plugin: 'io.spring.dependency-management'
 }
 
+subprojects {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        compile 'org.apache.commons:commons-lang3:3.5'
+        // The production code uses the SLF4J logging API at compile time
+        compile 'org.slf4j:slf4j-api:1.7.21'
+        compile "joda-time:joda-time:2.2"
+        compile('org.springframework:spring-context:5.0.9.RELEASE')
+        
+        testCompile group: 'junit', name: 'junit', version: '4.11'
+        testCompile group: 'junit', name: 'junit', version: '4.12'
+        testCompile('org.mockito:mockito-core:1.10.19') {exclude(group: 'org.hamcrest')}
+
+        compileOnly 'org.projectlombok:lombok:1.18.4'
+    }
+
+    test {
+        if (System.properties['test.profile'] != 'integrationTest') {
+            exclude '**/*integrationTest*'
+        } else {
+            exclude '**/*edu/*'
+        }
+    }
+
+    testSets {
+        unitTest
+        integrationTest
+    }
+}
+
 bootJar {
     baseName = 'gs-spring-boot'
     version =  '0.1.0'
@@ -65,7 +100,7 @@ dependencies {
     
     testCompile group: 'junit', name: 'junit', version: '4.11'
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile("org.springframework.boot:spring-boot-starter-test")
+    testCompile "org.springframework:spring-test:5.0.9.RELEASE"
     testCompile('org.mockito:mockito-core:1.10.19') {exclude(group: 'org.hamcrest')}
 
     compileOnly 'org.projectlombok:lombok:1.18.4'

pandamonium-theorem-prover/lombok.config

@@ -4,4 +4,3 @@ lombok.accessors.fluent = false
 lombok.addLombokGeneratedAnnotation = true
 lombok.log.fieldName = LOG
 lombok.toString.includeFieldNames = true
-lombok.data.flagUsage = error

pandamonium-theorem-prover/persistence/build.gradle

@@ -0,0 +1,17 @@
+plugins {
+    id 'java'
+}
+
+group 'edu.msudenver.tsp'
+version '1.0'
+
+sourceCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    compile fileTree(dir: 'lib', include: '**/*.jar')
+}

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/PersistenceConfig.java

@@ -0,0 +1,10 @@
+package edu.msudenver.tsp.persistence;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan
+public class PersistenceConfig {
+
+}

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/BaseDao.java

@@ -0,0 +1,28 @@
+package edu.msudenver.tsp.persistence.dao;
+
+class BaseDao {
+
+//    <T> T findById(final int id) {
+//        //TODO insert DB calls for finding objects by their ID's
+//    }
+
+//    <T> List<T> queryForList(final String query) {
+//        //TODO insert DB calls for querying for lists based on the specified query
+//    }
+
+//    <T> T save(final T t) {
+//        //TODO insert DB calls here for insert and update
+//    }
+
+    <T> void delete(final T t) {
+        //TODO insert DB calls here to delete
+    }
+
+//    private <T> T insert(final T object) {
+//        // TODO insert DB calls to insert records
+//    }
+//
+//    private <T> T update(final T object) {
+//        //TODO insert DB calls to update records
+//    }
+}

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/DefinitionDao.java

@@ -0,0 +1,4 @@
+package edu.msudenver.tsp.persistence.dao;
+
+public class DefinitionDao extends BaseDao {
+}

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/NotationDao.java

@@ -0,0 +1,4 @@
+package edu.msudenver.tsp.persistence.dao;
+
+public class NotationDao extends BaseDao {
+}

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/ProofDao.java

@@ -0,0 +1,4 @@
+package edu.msudenver.tsp.persistence.dao;
+
+public class ProofDao extends BaseDao {
+}

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/TheoremDao.java

@@ -0,0 +1,4 @@
+package edu.msudenver.tsp.persistence.dao;
+
+public class TheoremDao extends BaseDao {
+}

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/BaseDto.java

@@ -0,0 +1,9 @@
+package edu.msudenver.tsp.persistence.dto;
+
+import lombok.Data;
+
+@Data
+class BaseDto {
+    private String id;
+    private int version;
+}

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/DefinitionDto.java

@@ -0,0 +1,4 @@
+package edu.msudenver.tsp.persistence.dto;
+
+public class DefinitionDto extends BaseDto {
+}

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/NotationDto.java

@@ -0,0 +1,4 @@
+package edu.msudenver.tsp.persistence.dto;
+
+public class NotationDto extends BaseDto {
+}

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/ProofDto.java

@@ -0,0 +1,4 @@
+package edu.msudenver.tsp.persistence.dto;
+
+public class ProofDto extends BaseDto {
+}

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/TheoremDto.java

@@ -0,0 +1,4 @@
+package edu.msudenver.tsp.persistence.dto;
+
+public class TheoremDto extends BaseDto {
+}

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/DefinitionManager.java

@@ -0,0 +1,11 @@
+package edu.msudenver.tsp.persistence.manager;
+
+import edu.msudenver.tsp.persistence.dao.DefinitionDao;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@AllArgsConstructor
+public class DefinitionManager {
+    final private DefinitionDao definitionDao;
+}

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java

@@ -0,0 +1,10 @@
+package edu.msudenver.tsp.persistence.manager;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan
+public class ManagerConfig {
+
+}

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/NotationManager.java

@@ -0,0 +1,11 @@
+package edu.msudenver.tsp.persistence.manager;
+
+import edu.msudenver.tsp.persistence.dao.NotationDao;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@AllArgsConstructor
+public class NotationManager {
+    final private NotationDao notationDao;
+}

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ProofManager.java

@@ -0,0 +1,11 @@
+package edu.msudenver.tsp.persistence.manager;
+
+import edu.msudenver.tsp.persistence.dao.ProofDao;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@AllArgsConstructor
+public class ProofManager {
+    final private ProofDao proofDao;
+}

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/TheoremManager.java

@@ -0,0 +1,11 @@
+package edu.msudenver.tsp.persistence.manager;
+
+import edu.msudenver.tsp.persistence.dao.TheoremDao;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@AllArgsConstructor
+public class TheoremManager {
+    final private TheoremDao theoremDao;
+}

pandamonium-theorem-prover/services/build.gradle

@@ -0,0 +1,18 @@
+plugins {
+    id 'java'
+}
+
+group 'edu.msudenver.tsp'
+version '1.0'
+
+sourceCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile project(':persistence')
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    compile fileTree(dir: 'lib', include: '**/*.jar')
+}

pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java

@@ -0,0 +1,11 @@
+package edu.msudenver.tsp.services.parser;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan
+//@PropertySource("classpath:development.properties")
+public class ParserConfig {
+
+}

pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java

@@ -0,0 +1,26 @@
+package edu.msudenver.tsp.services.parser;
+
+import edu.msudenver.tsp.persistence.manager.DefinitionManager;
+import edu.msudenver.tsp.persistence.manager.NotationManager;
+import edu.msudenver.tsp.persistence.manager.ProofManager;
+import edu.msudenver.tsp.persistence.manager.TheoremManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+class ParserService {
+    private final DefinitionManager definitionManager;
+    private final TheoremManager theoremManager;
+    private final NotationManager notationManager;
+    private final ProofManager proofManager;
+
+    @Autowired
+    public ParserService(final DefinitionManager definitionManager, final TheoremManager theoremManager,
+                         final NotationManager notationManager, final ProofManager proofManager) {
+        this.definitionManager = definitionManager;
+        this.theoremManager = theoremManager;
+        this.notationManager = notationManager;
+        this.proofManager = proofManager;
+    }
+
+}

pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java

@@ -0,0 +1,16 @@
+package edu.msudenver.tsp.services.scoring;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan
+//@PropertySource("classpath:development.properties")
+public class ScoringConfig {
+
+    @Bean
+    public TheoremScoringService theoremScoringService() {
+        return new TheoremScoringService();
+    }
+}

pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java

@@ -0,0 +1,8 @@
+package edu.msudenver.tsp.services.scoring;
+
+import org.springframework.stereotype.Service;
+
+@Service
+class TheoremScoringService {
+
+}

pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java

@@ -0,0 +1,17 @@
+package edu.msudenver.tsp.services.parser;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ParserServiceTest {
+
+    @Test
+    public void test() {
+        assertEquals(3,3);
+    }
+
+}

pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/scoring/TheoremScoringServiceTest.java

@@ -0,0 +1,16 @@
+package edu.msudenver.tsp.services.scoring;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TheoremScoringServiceTest {
+
+    @Test
+    public void test() {
+        assertEquals(3,3);
+    }
+}

pandamonium-theorem-prover/settings.gradle

@@ -1,2 +1,5 @@
 rootProject.name = 'pandamonium-theorem-prover'
+include 'services'
+include 'persistence'
+include 'utilities'
 

pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/Application.java

@@ -1,4 +1,4 @@
-package hello;
+package edu.msudenver.tsp.website;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.CommandLineRunner;

pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/HelloController.java

@@ -1,4 +1,4 @@
-package hello;
+package edu.msudenver.tsp.website;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -8,6 +8,6 @@ public class HelloController {
 
     @RequestMapping("/")
     public String index() {
-        return "Greetings from Spring Boot!";
+        return "Welcome to Project Pandamonium!";
     }
 }

pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/ProofsDriver.java

@@ -0,0 +1,4 @@
+package edu.msudenver.tsp.website;
+
+public class ProofsDriver {
+}

pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/WebsiteConfig.java

@@ -0,0 +1,12 @@
+package edu.msudenver.tsp.website;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan
+//@PropertySource("classpath:development.properties")
+public class WebsiteConfig {
+
+
+}

pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/HelloControllerTest.java

@@ -0,0 +1,13 @@
+package edu.msudenver.tsp.website;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class HelloControllerTest {
+
+    @Test
+    public void test() {
+        assertEquals(3, 3);
+    }
+}

pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/ProofsDriverTest.java

@@ -0,0 +1,5 @@
+package edu.msudenver.tsp.website;
+
+public class ProofsDriverTest {
+
+}

pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/integrationTest/HelloControllerIntegrationTest.java

@@ -1,3 +1,5 @@
+package edu.msudenver.tsp.website.integrationTest;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -5,8 +7,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import static org.junit.Assert.assertEquals;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-public class HelloControllerTest {
-
+public class HelloControllerIntegrationTest {
     @Test
     public void test() {
         assertEquals(3,3);

pandamonium-theorem-prover/src/test/java/integrationTest/HelloControllerIntegrationTest.java

@@ -1,36 +0,0 @@
-package integrationTest;
-
-import hello.Application;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.net.URL;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class)
-public class HelloControllerIntegrationTest {
-    @LocalServerPort private int port;
-    private URL base;
-    @Autowired private TestRestTemplate testRestTemplate;
-
-    @Before
-    public void setUp() throws Exception {
-        this.base = new URL("http://localhost:" + port + "/");
-    }
-
-    @Test
-    public void testGetHello() {
-        final ResponseEntity<String> response = testRestTemplate.getForEntity(base.toString(),
-                String.class);
-        assertEquals("Greetings from Spring Boot!", response.getBody());
-    }
-}

pandamonium-theorem-prover/utilities/build.gradle

@@ -0,0 +1,17 @@
+plugins {
+    id 'java'
+}
+
+group 'edu.msudenver.tsp'
+version '1.0'
+
+sourceCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    compile fileTree(dir: 'lib', include: '**/*.jar')
+}