several fixes and improvement of in-place graph creation directive, closes #43

Author: alegrm

pom.xml

@@ -176,8 +176,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.3.2</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>1.7</source>
+					<target>1.7</target>
 					<compilerArguments>
 						<endorseddirs>${endorsed.dir}</endorseddirs>
 					</compilerArguments>

src/main/java/eu/geoknow/generator/publish/DataHandler.java

@@ -4,9 +4,10 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.sql.SQLException;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.UUID;
@@ -39,6 +40,7 @@
 import eu.geoknow.generator.users.VirtuosoUserManager;
 import eu.geoknow.generator.utils.Utils;
 
+
 /**
  * Class which does the data handling for the REST API.
  * 
@@ -51,8 +53,14 @@ public class DataHandler {
   private static final String jsonResponseFormat = "application/sparql-results+json";
   private PublishingConfiguration config;
   private String statefulUri;
-  private LocalDateTime dateTime;
-  private LocalDate date;
+  // private LocalDateTime dateTime;
+  // private LocalDate date;
+  private Date date;
+
+  // 2007-12-03.
+  SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-M-dd");
+  // 2007-12-03T10:15:30.
+  SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yy-M-dd'T'HH:mm:ss");
   private SecureRdfStoreManagerImpl frameworkRdfStoreManager;
 
   /**
@@ -69,8 +77,9 @@ public DataHandler(PublishingConfiguration config) throws InformationMissingExce
     // create current data and date since both are requierd for metadata and
     // eventually for the
     // stateful graph
-    this.date = LocalDate.now();
-    this.dateTime = LocalDateTime.now();
+    this.date = GregorianCalendar.getInstance().getTime();
+    // this.date = LocalDate.now();
+    // this.dateTime = LocalDateTime.now();
     try {
       frameworkRdfStoreManager = FrameworkConfiguration.getInstance().getSystemRdfStoreManager();
     } catch (IOException e) {
@@ -171,13 +180,15 @@ private void createStatefulGraphAndCopyData() throws ClientProtocolException, IO
     if (!stateful.endsWith("/")) {
       stateful += "/";
     }
-    stateful += this.date.toString();
+    // stateful += this.date.toString();
+    stateful += dateFormat.format(this.date);
     if (graphExists(stateful)) {
       stateful = config.getTargetGraphUri();
       if (!stateful.endsWith("/")) {
         stateful += "/";
       }
-      stateful += this.dateTime.toString();
+      // stateful += this.dateTime.toString();
+      stateful += dateTimeFormat.format(this.date);
     }
     // create the graph
     createGraph(stateful);
@@ -433,7 +444,7 @@ private void addMetadataToTargetGraph() throws ClientProtocolException, IOExcept
 
     query +=
         "<" + config.getTargetGraphUri() + "> <" + DCTerms.created.getURI() + "> \""
-            + this.dateTime.toString() + "\"^^<" + XSD.dateTime.getURI() + "> .} }";
+            + dateTimeFormat.format(this.date) + "\"^^<" + XSD.dateTime.getURI() + "> .} }";
     try {
       frameworkRdfStoreManager.execute(query, jsonResponseFormat);
     } catch (Exception e) {

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

@@ -96,7 +96,7 @@ public Response deleteJob(@CookieParam(value = "user") Cookie userc,
       return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
     }
     try {
-
+      log.debug("delete job" + jobName);
       if (jmanager.deleteJob(jobName, user))
         return Response.status(Response.Status.NO_CONTENT).build();
       else

src/main/java/eu/geoknow/generator/servlets/AuthenticationServlet.java

@@ -6,7 +6,6 @@
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Locale;
 import java.util.UUID;
 
 import javax.mail.MessagingException;
@@ -16,9 +15,6 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.Response;
-
-import org.apache.log4j.Logger;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -30,7 +26,6 @@
 import eu.geoknow.generator.utils.HttpUtils;
 import eu.geoknow.generator.utils.RandomStringGenerator;
 
-
 /**
  * Servlet provides some authentication functions: login, logout, register new user, restore
  * password, change password.
@@ -47,9 +42,6 @@ public class AuthenticationServlet extends HttpServlet {
    * 
    */
   private static final long serialVersionUID = 1L;
-
-  private static final Logger log = Logger.getLogger(AuthenticationServlet.class);
-
   private FrameworkUserManager frameworkUserManager;
 
   @Override
@@ -76,10 +68,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
     String mode = request.getParameter("mode");
 
-    String language = request.getParameter("lang");
-    if (language == null)
-      language = "en";
-    Locale locale = new Locale(language);
 
     PrintWriter out = response.getWriter();
 
@@ -90,16 +78,16 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       // check username and password
       boolean correctCredentials = false;
       try {
-
-        correctCredentials = frameworkUserManager.checkPassword(username, password);
+        if (username != null && !username.isEmpty())
+          correctCredentials = frameworkUserManager.checkPassword(username, password);
       } catch (Exception e) {
         e.printStackTrace();
         response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getMessage());
         return;
       }
 
       if (!correctCredentials) {
-        response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
+        response.sendError(HttpServletResponse.SC_OK);
         return;
       }
 
@@ -122,8 +110,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         userProfile = frameworkUserManager.getUserProfile(username);
         // send request with session token and user profile
 
-        log.debug(userProfile.getRole().getName());
-
         ObjectMapper objectMapper = new ObjectMapper();
         String responseStr = objectMapper.writeValueAsString(userProfile);
 
@@ -142,7 +128,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       String username = request.getParameter("username");
       // remove user session tokens
       try {
-        frameworkUserManager.removeAllSessionTokens(username);
+        if (username != null && !username.isEmpty())
+          frameworkUserManager.removeAllSessionTokens(username);
         // remove session token from cookies
         Cookie tokenCookie = new Cookie("token", "");
         Cookie userCookie = new Cookie("user", "");
@@ -157,32 +144,33 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     } else if ("create".equals(mode)) {
 
       String username = request.getParameter("username");
-      String email = request.getParameter("email");
+      String emailTo = request.getParameter("email");
       // check if user already exists
       boolean userExists = false;
       try {
-        userExists = frameworkUserManager.checkUserExists(username, email);
+        userExists = frameworkUserManager.checkUserExists(username, emailTo);
       } catch (Exception e) {
         e.printStackTrace();
       }
       if (userExists) {
-        response.setStatus(Response.Status.CONFLICT.ordinal());
-        out.print("User already exists");
+        response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        response.setHeader("content-type", "application/json");
+        out.print("{\"code\" : \"1\", \"message\" : \"User already exists\"}");
         return;
       }
       // create user
       String password = new RandomStringGenerator().generateBasic(6);
 
       try {
-        frameworkUserManager.createUser(username, password, email);
+        frameworkUserManager.createUser(username, password, emailTo);
 
 
         EmailSender emailSender = FrameworkConfiguration.getInstance().getDefaultEmailSender();
-
-        emailSender.send(email, "GeoKnow registration", "Your login: " + username + ", password: "
-            + password);
+        emailSender.send(emailTo, "GeoKnow registration", "Your login: " + username
+            + ", password: " + password);
         String responseStr =
-            "{\"message\" : \"Your password will be sent to your e-mail address " + email + " \"}";
+            "{\"message\" : \"Your password will be sent to your e-mail address " + emailTo
+                + " \"}";
         response.getWriter().print(responseStr);
 
       } catch (MessagingException e) {
@@ -204,13 +192,13 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       try {
         valid = frameworkUserManager.checkToken(username, token);
         if (!valid) {
-          response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "invalid token " + token
+          response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "invalid token " + token
               + " for user " + username);
         } else {
           // check old password
           boolean isCorrect = frameworkUserManager.checkPassword(username, oldPassword);
           if (!isCorrect) {
-            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+            response.setStatus(HttpServletResponse.SC_FORBIDDEN);
             out.print("{\"code\" : \"2\", \"message\" : \"Incorrect old password\"}");
             return;
           }
@@ -221,12 +209,11 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
           // send new password to user
           UserProfile userProfile = frameworkUserManager.getUserProfile(username);
           if (userProfile == null) {
-            response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "User profile "
-                + username + " not found");
+            response.sendError(HttpServletResponse.SC_NOT_FOUND, "User profile " + username
+                + " not found");
             return;
           }
           FrameworkConfiguration frameworkConfiguration = FrameworkConfiguration.getInstance();
-
           EmailSender emailSender = frameworkConfiguration.getDefaultEmailSender();
           emailSender.send(userProfile.getEmail(), "GeoKnow change password",
               "Your password was changed. Your login: " + username + ", new password: "
@@ -248,7 +235,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       try {
         userProfile = frameworkUserManager.getUserProfile(username);
         if (userProfile == null) {
-          response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+          response.setStatus(HttpServletResponse.SC_NOT_FOUND);
           out.print("{\"code\" : \"3\", \"message\" : \"User doesn't exists\"}");
           return;
         }
@@ -258,9 +245,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 
         // send new password to user
         FrameworkConfiguration frameworkConfiguration = FrameworkConfiguration.getInstance();
-
         EmailSender emailSender = frameworkConfiguration.getDefaultEmailSender();
-
         emailSender.send(userProfile.getEmail(), "GeoKnow registration", "Your login: " + username
             + ", password: " + password);
         String responseStr =
@@ -292,7 +277,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         accounts.add(p.getAccountURI());
       String responseStr = new ObjectMapper().writeValueAsString(accounts);
       response.getWriter().print(responseStr);
+
     } else {
+
       // throw new ServletException("Unexpected mode: " + mode);
       response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Unexpected mode: " + mode);
 

src/main/java/eu/geoknow/generator/users/FrameworkUserManager.java

@@ -336,8 +336,8 @@ public void setPassword(String usernameOrEmail, String password) throws Exceptio
             + "> {?account gkg:passwordSha1Hash \"" + DigestUtils.sha1Hex(password) + "\"} } "
             + " WHERE { " + " {GRAPH <" + frameworkConfig.getAccountsGraph()
             + "> {?account foaf:accountName \"" + usernameOrEmail
-            + "\" . OPTIONAL { ?account gkg:passwordSha1Hash ?o . } } } " + " UNION " + " GRAPH <"
-            + frameworkConfig.getAccountsGraph() + "> { ?account foaf:mbox <mailto:"
+            + "\" . OPTIONAL { ?account gkg:passwordSha1Hash ?o . } } } " + " UNION { "
+            + " GRAPH <" + frameworkConfig.getAccountsGraph() + "> { ?account foaf:mbox <mailto:"
             + usernameOrEmail + "> . OPTIONAL { ?account gkg:passwordSha1Hash ?o . } } } " + " }";
     // TODO: replace 2 queries with this query when OntoQuad will support
     // DELETE {...} INSERT {...} WHERE {...} queries
@@ -351,6 +351,8 @@ public void setPassword(String usernameOrEmail, String password) throws Exceptio
     // " UNION "
     // + " { ?account foaf:mbox <mailto:" + usernameOrEmail
     // + "> . OPTIONAL { ?account gkg:passwordSha1Hash ?o . } } " + " }";
+    log.debug(deleteQuery);
+    log.debug(insertQuery);
     rdfStoreManager.execute(deleteQuery, jsonResponseFormat);
     rdfStoreManager.execute(insertQuery, jsonResponseFormat);
 
@@ -374,6 +376,7 @@ public boolean checkPassword(String usernameOrEmail, String password) throws Exc
             + "\" . ?account gkg:passwordSha1Hash ?passwordHash . } " + " UNION "
             + " {?account foaf:mbox <mailto:" + usernameOrEmail
             + "> . ?account gkg:passwordSha1Hash ?passwordHash . } " + "}";
+    log.debug(query);
     String result = rdfStoreManager.execute(query, jsonResponseFormat);
     ObjectMapper mapper = new ObjectMapper();
     JsonNode rootNode = mapper.readTree(result);
@@ -382,6 +385,7 @@ public boolean checkPassword(String usernameOrEmail, String password) throws Exc
       return false;
     JsonNode bindingNode = bindingsIter.next();
     String correctPasswordHash = bindingNode.path("passwordHash").path("value").textValue();
+    log.debug(DigestUtils.sha1Hex(password) + " vs " + correctPasswordHash);
     return DigestUtils.sha1Hex(password).equals(correctPasswordHash);
   }