diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/DefinitionManager.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/DefinitionManager.java index e12987e..ed0052b 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/DefinitionManager.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/DefinitionManager.java @@ -6,6 +6,6 @@ import org.springframework.stereotype.Component; @Component @AllArgsConstructor -class DefinitionManager { +public class DefinitionManager { final private DefinitionDao definitionDao; } diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java index 95772e2..93c0dc7 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java @@ -5,7 +5,6 @@ import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan -//@PropertySource("classpath:development.properties") public class ManagerConfig { } diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/NotationManager.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/NotationManager.java index a6d50c5..f298199 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/NotationManager.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/NotationManager.java @@ -6,6 +6,6 @@ import org.springframework.stereotype.Component; @Component @AllArgsConstructor -class NotationManager { +public class NotationManager { final private NotationDao notationDao; } diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ProofManager.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ProofManager.java index b891add..a248b8b 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ProofManager.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ProofManager.java @@ -1,13 +1,11 @@ package edu.msudenver.tsp.persistence.manager; import edu.msudenver.tsp.persistence.dao.ProofDao; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @Component -class ProofManager { +@AllArgsConstructor +public class ProofManager { final private ProofDao proofDao; - - ProofManager(final ProofDao proofDao) { - this.proofDao = proofDao; - } } diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/TheoremManager.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/TheoremManager.java index 3fdad3e..1d8dc2c 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/TheoremManager.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/TheoremManager.java @@ -6,6 +6,6 @@ import org.springframework.stereotype.Component; @Component @AllArgsConstructor -class TheoremManager { +public class TheoremManager { final private TheoremDao theoremDao; } diff --git a/pandamonium-theorem-prover/services/build.gradle b/pandamonium-theorem-prover/services/build.gradle index b8e0e3f..efcc2d3 100644 --- a/pandamonium-theorem-prover/services/build.gradle +++ b/pandamonium-theorem-prover/services/build.gradle @@ -12,6 +12,7 @@ repositories { } dependencies { + compile project(':persistence') testCompile group: 'junit', name: 'junit', version: '4.12' compile fileTree(dir: 'lib', include: '**/*.jar') } diff --git a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java index 64726fb..8c71f25 100644 --- a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java +++ b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java @@ -1,8 +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; + } } diff --git a/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/HelloController.java b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/HelloController.java index a9f1ad5..0e6a635 100644 --- a/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/HelloController.java +++ b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/HelloController.java @@ -8,6 +8,6 @@ public class HelloController { @RequestMapping("/") public String index() { - return "Greetings from Spring Boot!"; + return "Welcome to Project Pandamonium!"; } }