integrated contribution update to limes and import, fixed several bugs in coev

Author: alegrm

pom.xml

@@ -205,7 +205,7 @@
 				<artifactId>tomcat7-maven-plugin</artifactId>
 				<version>2.2</version>
 				<configuration>
-					<server>localhost</server>
+					<server>generator</server>
 					<url>${tomcat.deploy.url}</url>
 					<path>/${project.build.finalName}</path>
 					<update>true</update>

src/main/java/eu/geoknow/generator/graphs/beans/Contribution.java

@@ -1,5 +1,7 @@
 package eu.geoknow.generator.graphs.beans;
 
+import org.hibernate.validator.constraints.NotEmpty;
+
 
 /**
  * This bean is for adding information about the changes made to a graph
@@ -9,9 +11,12 @@
  */
 public class Contribution {
 
+  @NotEmpty
   private String namedGraph;
   private String date;
+  @NotEmpty
   private String source;
+  @NotEmpty
   private String contributor;
 
 

src/main/java/eu/geoknow/generator/rest/AuthorizedSessions.java

@@ -5,7 +5,10 @@
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
@@ -46,11 +49,15 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.ontos.ldiw.vocabulary.LDIWO;
 
 import eu.geoknow.generator.configuration.FrameworkConfiguration;
 import eu.geoknow.generator.exceptions.InformationMissingException;
+import eu.geoknow.generator.graphs.GraphsManager;
+import eu.geoknow.generator.graphs.beans.Contribution;
+import eu.geoknow.generator.graphs.beans.NamedGraph;
 import eu.geoknow.generator.rdf.SecureRdfStoreManagerImpl;
 import eu.geoknow.generator.users.FrameworkUserManager;
 import eu.geoknow.generator.users.UserProfile;
@@ -148,31 +155,14 @@ public Response post(@PathParam("sessionToken") String sessionToken, @Context Ur
       MultivaluedMap<String, String> formParams) throws Exception {
 
     String username = "";
-    /*
-     * retrieves form user that created that session and the rdfUser and paswword for that user
-     */
     try {
-      String query =
-          "PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>" + "\n" + "SELECT ?user FROM <"
-              + sessionsGraph + "> WHERE { ?user " + " <" + LDIWO.sessionToken + "> \""
-              + sessionToken + "\"^^xsd:string .}";
-
-      String result = frameworkRdfStoreManager.execute(query, jsonResponseFormat);
-
-      ObjectMapper mapper = new ObjectMapper();
-      JsonNode rootNode = mapper.readTree(result);
-      Iterator<JsonNode> bindingsIter = rootNode.path("results").path("bindings").elements();
-
-      if (bindingsIter.hasNext()) {
-        JsonNode bindingNode = bindingsIter.next();
-        username = bindingNode.get("user").path("value").textValue();
-      }
-
+      username = getUser(sessionToken);
     } catch (Exception e) {
       log.error(e);
       e.printStackTrace();
       return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
     }
+
     log.debug("user:" + username + "-");
     if (username.equals(""))
       return Response.status(Response.Status.NOT_FOUND).build();
@@ -223,6 +213,30 @@ public void write(OutputStream os) throws IOException, WebApplicationException {
 
   }
 
+  private String getUser(String sessionToken) throws Exception {
+    /*
+     * retrieves form user that created that session and the rdfUser and paswword for that user
+     */
+    String username = "";
+    String query =
+        "PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>" + "\n" + "SELECT ?user FROM <"
+            + sessionsGraph + "> WHERE { ?user " + " <" + LDIWO.sessionToken + "> \""
+            + sessionToken + "\"^^xsd:string .}";
+
+    String result = frameworkRdfStoreManager.execute(query, jsonResponseFormat);
+
+    ObjectMapper mapper = new ObjectMapper();
+    JsonNode rootNode = mapper.readTree(result);
+    Iterator<JsonNode> bindingsIter = rootNode.path("results").path("bindings").elements();
+
+    if (bindingsIter.hasNext()) {
+      JsonNode bindingNode = bindingsIter.next();
+      username = bindingNode.get("user").path("value").textValue();
+    }
+    return username;
+
+  }
+
   @DELETE
   @Path("{sessionToken}")
   public Response delete(@PathParam("sessionToken") String sessionToken, @CookieParam(
@@ -257,4 +271,55 @@ public Response delete(@PathParam("sessionToken") String sessionToken, @CookiePa
 
     return Response.status(Response.Status.NO_CONTENT).build();
   }
+
+  /**
+   * Update the metadata of a contributiuon
+   * 
+   * @param sessionToken
+   * @param userc
+   * @param token
+   * @return
+   */
+  @PUT
+  @Path("{sessionToken}")
+  public Response addContribution(@PathParam("sessionToken") String sessionToken,
+      Contribution contribution) {
+
+    /*
+     * Check that the session exists
+     */
+    String username = "";
+    try {
+      username = getUser(sessionToken);
+    } catch (Exception e) {
+      log.error(e);
+      e.printStackTrace();
+      return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
+    }
+
+    log.debug("user:" + username + "-");
+    if (username.equals(""))
+      return Response.status(Response.Status.UNAUTHORIZED).build();
+
+    try {
+      if (contribution.getDate() == null) {
+        // 2015-06-12T14:35:00
+        Calendar cal = GregorianCalendar.getInstance();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+        format.setCalendar(cal);
+        contribution.setDate(format.format(cal.getTime()));
+      }
+      GraphsManager manager = new GraphsManager();
+      NamedGraph graph = manager.addContribution(contribution);
+
+      Gson gson = new Gson();
+      String json = "{ \"namedgraph\" : " + gson.toJson(graph) + "}";
+      return Response.status(Response.Status.OK).entity(json).type(MediaType.APPLICATION_JSON)
+          .build();
+
+    } catch (Exception e) {
+      log.error(e);
+      return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
+    }
+  }
 }

src/main/java/eu/geoknow/generator/rest/Graphs.java

@@ -1,7 +1,10 @@
 package eu.geoknow.generator.rest;
 
 import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Collection;
+import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -183,6 +186,13 @@ public Response addContribution(@CookieParam(value = "user") Cookie userc, @Cook
     }
 
     try {
+      if (contribution.getDate() == null) {
+        // 2015-06-12T14:35:00
+        Calendar cal = GregorianCalendar.getInstance();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+        format.setCalendar(cal);
+        contribution.setDate(format.format(cal.getTime()));
+      }
       GraphsManager manager = new GraphsManager();
       NamedGraph graph = manager.addContribution(contribution);
 

src/main/java/eu/geoknow/generator/workflow/BatchAdminClient.java

@@ -67,6 +67,9 @@ public class BatchAdminClient {
   /**
    * Retrieves the execution detail of an execution.
    * 
+   * 
+   * http://generator.geoknow.eu:8080/spring-batch-admin-geoknow/jobs/executions/0.json?
+   * 
    * @param jobName name of the job
    * @param executionNum number of the job execution it is not the ID
    * @param springBatchServiceUri the URI of Spring Batch Admin
@@ -80,9 +83,11 @@ public static JobExecutionWrapper getExecutionDetail(String jobName, String exec
       IOException, ServiceNotAvailableException, ServiceInternalServerError {
     // first, we need to get the resource with ID. the URI is:
     // http://localhost:8080/spring-batch-admin-geoknow/jobs/jobName/execNumber.json
+    log.debug(springBatchServiceUri + "/jobs/" + jobName + "/" + executionNum + ".json");
     HttpGet jobInstance =
         new HttpGet(springBatchServiceUri + "/jobs/" + jobName + "/" + executionNum + ".json");
     String jsonString = apiRequest(jobInstance);
+    log.debug(jsonString);
     // create Java object
     ObjectMapper mapper = new ObjectMapper();
     JobInstanceWrapper jobInst = mapper.readValue(jsonString, JobInstanceWrapper.class);

src/main/java/eu/geoknow/generator/workflow/JobsManager.java

@@ -122,8 +122,7 @@ public List<Registration> getUserJobs(UserProfile user) throws Exception {
             + "> ?targetGraph ;" + "<" + LDIWO.xmlDefinition.getURI() + "> ?xml . " + "}";
     log.debug(query);
 
-    String result =
-        frameworkRdfStoreManager.execute(query, MediaType.SPARQL_JSON_RESPONSE_FORMAT);
+    String result = frameworkRdfStoreManager.execute(query, MediaType.SPARQL_JSON_RESPONSE_FORMAT);
     log.debug(result);
     ObjectMapper mapper = new ObjectMapper();
     JsonNode rootNode = mapper.readTree(result);
@@ -306,8 +305,7 @@ public Registration getJob(String jobName, UserProfile user) throws Exception {
             + "> ?created }";
     log.debug(query);
 
-    String result =
-        frameworkRdfStoreManager.execute(query, MediaType.SPARQL_JSON_RESPONSE_FORMAT);
+    String result = frameworkRdfStoreManager.execute(query, MediaType.SPARQL_JSON_RESPONSE_FORMAT);
     log.debug(result);
     ObjectMapper mapper = new ObjectMapper();
     JsonNode rootNode = mapper.readTree(result);
@@ -335,7 +333,7 @@ public JobExecutions getExcecutions(Registration job) throws IOException, Except
 
     if (job.getJobInstances().size() > 0) {
       Set<Integer> instances = job.getJobInstances().keySet();
-      log.debug(instances.size() + "instances ");
+      log.debug(instances.size() + " instances ");
       Iterator<Integer> it = instances.iterator();
 
       while (it.hasNext()) {
@@ -418,8 +416,7 @@ private boolean jobExist(String jobName, String userUri) throws IOException, Exc
         "ASK { GRAPH <" + jobsGraph + "> {<" + uriBase + jobName + "> <" + DCTerms.creator.getURI()
             + "> <" + userUri + "> }}";
     log.debug(query);
-    String result =
-        frameworkRdfStoreManager.execute(query, MediaType.SPARQL_JSON_RESPONSE_FORMAT);
+    String result = frameworkRdfStoreManager.execute(query, MediaType.SPARQL_JSON_RESPONSE_FORMAT);
 
     ObjectMapper mapper = new ObjectMapper();
     JsonNode rootNode = mapper.readTree(result);

src/main/resources/framework-components.ttl

@@ -30,8 +30,8 @@
   a  lds:StorageService ;
   rdfs:label "Virtuoso Conductor" ;
   lds:password "dba"^^xsd:string ;
-  lds:serviceUrl <http://192.168.2.22:8890/conductor> ;
-  lds:connectionString "jdbc:virtuoso://192.168.2.22:1111/"^^xsd:string;
+  lds:serviceUrl <http://localhost:8890/conductor> ;
+  lds:connectionString "jdbc:virtuoso://localhost:1111/"^^xsd:string;
   lds:user   "dba"^^xsd:string .
 
 # #######################################################################################
@@ -42,15 +42,15 @@
   a       lds:SecuredSPARQLEndPointService;
   rdfs:label "Virtuoso Auth-SPARQLEndpoint" ;
   lds:password "generator"^^xsd:string ;
-  lds:serviceUrl <http://192.168.2.22:8890/sparql-auth> ;
-  void:sparqlEndpoint <http://192.168.2.22:8890/sparql-auth> ;
+  lds:serviceUrl <http://localhost:8890/sparql-auth> ;
+  void:sparqlEndpoint <http://localhost:8890/sparql-auth> ;
   lds:user   "generator"^^xsd:string .
 
 :VirtuosoEndpoint
   a       lds:SPARQLEndPointService;
   rdfs:label "Virtuoso Public Endpoint" ;
-  void:sparqlEndpoint <http://192.168.2.22:8890/sparql-auth> ;
-  lds:serviceUrl <http://192.168.2.22:8890/sparql> .
+  void:sparqlEndpoint <http://localhost:8890/sparql-auth> ;
+  lds:serviceUrl <http://localhost:8890/sparql> .
 
 :SpringBatch
   a       lds:StackComponent ;
@@ -64,7 +64,7 @@
       rdfs:label "SpringBatch" ;
       dcterms:description "Provides functionality to create scheduled jobs and workflows."^^xsd:string ;
       lds:serviceUrl <http://localhost:8080/spring-batch-admin-geoknow/> ;
-      ontos:springBatchAdminJobsDir "/Users/alejandragarciarojas/Services/tomcat/webapps/spring-batch-admin-geoknow/WEB-INF/classes/META-INF/batch-jobs/"^^xsd:string .
+      ontos:springBatchAdminJobsDir "/var/generator/jobs/"^^xsd:string .
 
 :RdfImport
   a       lds:StackComponent ;

src/main/webapp/index.html

@@ -70,30 +70,27 @@
             </li>
           </ul>
 
-
           <ul class="nav navbar-nav navbar-right">
 
-
             <li class="navbar-text" ng-if="isUserAuthenticated() && $root.isSystemSetUp">
               Logged in as <strong>{{currentAccount.username}}</strong>
             </li>
 
             <li ng-if="isUserAuthenticated() && $root.isSystemSetUp">
-              <a href="" ng-click="logout()">
+              <a href=""  ng-click="logout()">
                 <div class="glyphicon glyphicon-log-out"></div>Logout</a>
             </li>
 
             <li ng-if="!isUserAuthenticated() && $root.isSystemSetUp">
-              <a href="" ng-click="signUp()">
-                <div class="glyphicon glyphicon-log-in"></div> Sing Up </a>
+              <a href="" ng-click="signUp()">Sing Up </a>
             </li>
 
 
             <li ng-if="!isUserAuthenticated() && $root.isSystemSetUp">
               <a href="" ng-click="login()">
                 <div class="glyphicon glyphicon-log-in"></div> Log In </a>
             </li>
-          </ul>
+          </ul> 
         </div><!-- /.navbar-collapse -->
       </div><!-- /.container-fluid -->
     </nav>

src/main/webapp/js/app.js

@@ -81,11 +81,10 @@ app.config(function($routeSegmentProvider, $routeProvider)
             resolve: {
                         settings : function (ConfigurationService){
                              return ConfigurationService.getSettings();
+                        },
+                        CoevolutionServiceInit : function(CoevolutionService){
+                            return CoevolutionService.promise;
                         }
-                    // }
-                    //     userInfo : function(UsersService) {
-                    //     return UsersService.readUserNamesEmails();
-                    // }
                 }
             })
             .within()

src/main/webapp/js/controllers.js

@@ -23,7 +23,6 @@ function StackMenuCtrl($scope, AccountService, ConfigurationService, Ns) {
 
   ConfigurationService.getIntegratedComponents().then(
     function(resp){
-      console.log(resp);
       var tools = resp.integrated;
       for(var i in tools){
         var category = tools[i].type.replace("http://stack.linkeddata.org/ldis-schema/",'');
@@ -34,7 +33,6 @@ function StackMenuCtrl($scope, AccountService, ConfigurationService, Ns) {
           requiredServices:[] };
         categoryToMenu[category].items.push(item);
       }
-      console.log(categoryToMenu);
 
       $scope.groups = [];
       for(var i in categoryToMenu)