Added logger usage in the reasonner and the unit repo web service classes

Author: benjaminbertin

src/main/java/com/mycsense/carbondb/Reasoner.java

@@ -21,6 +21,8 @@
 
 import org.mindswap.pellet.jena.PelletReasonerFactory;
 import org.mindswap.pellet.jena.PelletInfGraph;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Reasoner {
 
@@ -41,6 +43,8 @@ public class Reasoner {
     public ReasonnerReport report = new ReasonnerReport();
     protected UnitsRepo unitsRepo;
 
+    private final Logger log = LoggerFactory.getLogger(Reasoner.class);
+
     public Reasoner (Model model, UnitsRepo unitsRepo) {
         this.model = model;
         this.unitsRepo = unitsRepo;
@@ -53,7 +57,7 @@ public void run () {
         convert source relations -> sourceRelations convert
         calculate ecological flows -> calculate ecological flows
         */
-        System.out.println("begin reasonning");
+        log.info("Begin reasonning");
         infModel = ModelFactory.createInfModel( jenaReasoner, model );
         ((PelletInfGraph) infModel.getGraph()).classify();
         ((PelletInfGraph) infModel.getGraph()).realize();
@@ -64,7 +68,7 @@ public void run () {
         RepoFactory.setReasonnerReport(report);
         relationRepo = RepoFactory.getRelationRepo();
         singleElementRepo = RepoFactory.getSingleElementRepo();
-        System.out.println("loading and translating sourceRelations");
+        log.info("Loading and translating sourceRelations");
         for (Resource sourceRelationResource: relationRepo.getSourceRelationsResources()) {
             try {
                 SourceRelation sourceRelation = relationRepo.getSourceRelation(sourceRelationResource);
@@ -75,14 +79,14 @@ public void run () {
             }
         }
 
-        System.out.println("getting single processes");
+        log.info("Getting single processes");
         processes = singleElementRepo.getSingleProcesses();
-        System.out.println("getting elementary flow types");
+        log.info("getting elementary flow types");
         elementaryFlowTypes = singleElementRepo.getElementaryFlowTypes();
-        System.out.println("getting impact types");
+        log.info("Getting impact types");
         impactTypes = singleElementRepo.getImpactTypes();
 
-        System.out.println("creating ecological matrices");
+        log.info("Creating ecological matrices");
         createEcologicalMatrix();
         createFlowToImpactsMatrix();
 
@@ -95,20 +99,20 @@ public void run () {
         //createMatrix();
         //calculateCumulatedEcologicalFlows();
 
-        System.out.println("creating matrix");
+        log.info("Creating matrix");
         createMatrices();
-        System.out.println("calculating cumulative flows");
+        log.info("Calculating cumulative flows");
         iterativeCalculationWithoutUncertainties();
         cumulativeEcologicalMatrix = transitiveDependencyMatrix.multiply(ecologicalMatrix);
-        System.out.println("calculating impacts");
+        log.info("Calculating impacts");
         impactMatrix = cumulativeEcologicalMatrix.multiply(flowToImpactsMatrix.transpose());
 
-        System.out.println("creating calculated flows");
+        log.info("Creating calculated flows");
         createCumulatedEcologicalFlows();
-        System.out.println("creating impacts");
+        log.info("Creating impacts");
         createImpacts();
 
-        System.out.println("reasoning finished");
+        log.info("Reasoning finished");
     }
 
     public void createMatrix() {

src/main/java/com/mycsense/carbondb/architecture/UnitsRepoWebService.java

@@ -11,6 +11,8 @@
 import com.mycsense.carbondb.domain.Unit;
 import org.json.JSONObject;
 import org.json.JSONArray;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class UnitsRepoWebService implements UnitsRepo, UnitsRepoCache {
     protected HashMap<String, Double> conversionFactorsCache = new HashMap<>();
@@ -22,10 +24,12 @@ public void setUnitsAPIURI(String unitsAPIURI) {
         this.unitsAPIURI = unitsAPIURI;
     }
 
+    private final Logger log = LoggerFactory.getLogger(UnitsRepoWebService.class);
+
     public Double getConversionFactor(String unitID)
     {
         if (!conversionFactorsCache.containsKey(unitID)) {
-            System.out.println("fetching conversion factor for " + unitID);
+            log.debug("fetching conversion factor for " + unitID);
             String unitOfReference = findUnitOfReference(unitID);
             if (null == unitOfReference) {
                 // unit not found (or error)
@@ -58,7 +62,7 @@ public boolean areCompatible(String unitID1, String unitID2)
             compatibleUnitsCache.put(unitID1, new HashMap<String, Boolean>());
         }
         if (!compatibleUnitsCache.get(unitID1).containsKey(unitID2)) {
-            System.out.println("fetching compatibility between " + unitID1 + " & " + unitID2);
+            log.debug("fetching compatibility between " + unitID1 + " & " + unitID2);
             Response response = buildBaseWebTarget()
                     .path("compatible")
                     .queryParam("units[0]", unitID1)
@@ -95,7 +99,7 @@ public String getUnitsMultiplication(Unit unit1, Unit unit2, int exponent)
     public String getUnitSymbol(String unitID)
     {
         if (!symbolsCache.containsKey(unitID)) {
-            System.out.println("fetching symbol for " + unitID);
+            log.debug("fetching symbol for " + unitID);
             Response response = buildBaseWebTarget()
                     .path("unit")
                     .path(unitID)