Merge branch 'master' into PAN-15

services/src/main/java/edu/msudenver/tsp/services/RestService.java

@@ -57,6 +57,10 @@ public class RestService {
         return send(requestFactory.put(uri, requestJson), null, connectionTimeout, socketTimeout, type);
     }
 
+    <T> Optional<T> patch(final String uri, final String requestJson, final TypeToken<T> type, final Integer connectionTimeout, final Integer socketTimeout) {
+        LOG.info("Sending PATCH {} with body: {}", uri, requestJson);
+        return send(requestFactory.patch(uri, requestJson), null, connectionTimeout, socketTimeout, type);
+    }
 
     private <T> Optional<T> send(final Request request, final String auth, final Integer connectionTimeout, final Integer socketTimeout, final TypeToken<T> type) {
         try {

services/src/main/java/edu/msudenver/tsp/services/dto/Account.java

@@ -21,5 +21,4 @@ public class Account extends BaseDto implements Serializable {
 
     private static final long serialVersionUID = 7095627971593953734L;
 
-
 }

services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java

@@ -1,23 +1,24 @@
 package edu.msudenver.tsp.services.parser;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@Slf4j
 @Service
 class ParserService {
-    private Node root;
 
     public boolean parseUserInput(final String userInput)
     {
         try {
             final Node tree = parseRawInput(userInput);
-            final List<String> statements = retrieveStatements(tree);
+            retrieveStatements(tree);
 
             return true;
         } catch(final Exception e) {
-            e.printStackTrace();
+            LOG.error(e.getMessage());
         }
         return false;
     }
@@ -26,7 +27,7 @@ class ParserService {
     {
         input = input.toLowerCase();
 
-        root = new Node(input, null);
+        final Node root = new Node(input, null);
 
         if(input.equals(""))
         {

services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java

@@ -1,16 +0,0 @@
-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();
-    }
-}

services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java

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