Return 404 if user not found.

Author: Cristian Cotes

config.properties

@@ -9,7 +9,7 @@ datasource=postgresql
 # ========================
 # 
 # Host
-postgresql.host=10.30.233.214
+postgresql.host=10.30.235.91
 #
 # Port 
 postgresql.port=5432
@@ -21,32 +21,4 @@ postgresql.database=stacksync_db
 postgresql.user=stacksync_user
 #
 # Password
-postgresql.password=stacksync_pass
-#
-#
-# 
-# ObjectMQ configuration
-# ======================
-# ObjectMQ is the middleware that abstracts the communication between
-# the SyncService and the clients. This configuration corresponds with 
-# the message broker service (AMQP compliant) in charge of handling this
-# communication.
-#  
-# Host
-omq.host=10.30.233.214
-#
-# Port
-omq.port=5672
-#
-# User
-omq.username=guest
-#
-# Password
-omq.pass=guest
-#
-# Number of threads 
-omq.num_threads=4
-#
-# Exchange queue. 
-# Must be the same as the one the clients send their requests.
-omq.rpc_exchange=rpc_global_exchange
+postgresql.password=stacksync_pass

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.stacksync</groupId>
     <artifactId>stacksync-quota-server</artifactId>
-    <version>0.1</version>
+    <version>0.2</version>
     <repositories>
         <repository>
             <id>Sonatype repository</id>
@@ -145,9 +145,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.14.1</version>
-                <!--<configuration>
+                <configuration>
                     <skipTests>true</skipTests>
-                </configuration>-->
+                </configuration>
             </plugin>
         </plugins>
     </build>

src/main/java/com/stacksync/quotaserver/db/WorkspaceDAO.java

@@ -1,12 +1,12 @@
 package com.stacksync.quotaserver.db;
 
 import com.stacksync.commons.models.User;
-import com.stacksync.commons.models.Workspace;
 import com.stacksync.quotaserver.exceptions.dao.DAOException;
+import com.stacksync.quotaserver.exceptions.dao.NoResultReturnedDAOException;
 
 public interface WorkspaceDAO {
 
-	public User getOwnerBySwiftContainer(String swiftContainer) throws DAOException;
+	public User getOwnerBySwiftContainer(String swiftContainer) throws NoResultReturnedDAOException, DAOException;
 
 
 }

src/main/java/com/stacksync/quotaserver/db/postgresql/PostgresqlWorkspaceDAO.java

@@ -11,6 +11,7 @@
 import com.stacksync.quotaserver.db.WorkspaceDAO;
 import com.stacksync.quotaserver.exceptions.dao.DAOException;
 import com.stacksync.quotaserver.db.DAOError;
+import com.stacksync.quotaserver.exceptions.dao.NoResultReturnedDAOException;
 
 public class PostgresqlWorkspaceDAO extends PostgresqlDAO implements WorkspaceDAO {
 
@@ -21,7 +22,7 @@ public PostgresqlWorkspaceDAO(Connection connection) {
 	}
 
 	@Override
-	public User getOwnerBySwiftContainer(String swiftContainer) throws DAOException {
+	public User getOwnerBySwiftContainer(String swiftContainer) throws NoResultReturnedDAOException, DAOException {
 		ResultSet resultSet = null;
 		User user = null;
 
@@ -31,6 +32,10 @@ public User getOwnerBySwiftContainer(String swiftContainer) throws DAOException
 			if (resultSet.next()) {
 				user = mapUser(resultSet);
 			}
+                        
+                        if (user == null) {
+                            throw new NoResultReturnedDAOException(DAOError.USER_NOT_FOUND);
+                        }
 		}catch(SQLException e){
 			logger.error(e);
 			throw new DAOException(DAOError.INTERNAL_SERVER_ERROR);

src/main/java/com/stacksync/quotaserver/rpc/XmlRpcQuotaHandler.java

@@ -13,12 +13,12 @@
 import com.stacksync.quotaserver.db.UserDAO;
 import com.stacksync.quotaserver.db.WorkspaceDAO;
 import com.stacksync.quotaserver.exceptions.dao.DAOException;
+import com.stacksync.quotaserver.exceptions.dao.NoResultReturnedDAOException;
 import com.stacksync.quotaserver.util.Config;
 
 public class XmlRpcQuotaHandler {
 
     private static final Logger logger = Logger.getLogger(XmlRpcQuotaHandler.class.getName());
-    
     private UserDAO userDAO;
     private WorkspaceDAO workspaceDAO;
 
@@ -37,15 +37,22 @@ public String getAvailableQuota(String strSwiftContainer) {
 
         logger.debug(String.format("XMLRPC Request. getAvailableQuota [containerdId: %s]", strSwiftContainer));
         JsonObject jResponse = new JsonObject();
-        
-        
+
         try {
-        	User user = workspaceDAO.getOwnerBySwiftContainer(strSwiftContainer);
+            User user = workspaceDAO.getOwnerBySwiftContainer(strSwiftContainer);
             jResponse.addProperty("quota_used", user.getQuotaUsedReal());
             jResponse.addProperty("quota_limit", user.getQuotaLimit());
             jResponse.addProperty("user", user.getSwiftUser());
+            
+        } catch (NoResultReturnedDAOException ex) {
+            logger.error("User not found: " + ex);
+            jResponse.addProperty("error", 404);
+            jResponse.addProperty("description", "User not found");
         } catch (DAOException ex) {
             logger.error("Can't get user from swiftContainer: " + strSwiftContainer);
+            logger.error(ex.toString());
+            jResponse.addProperty("error", 500);
+            jResponse.addProperty("description", "DAOException");
             jResponse.addProperty("quota_used", -1);
             jResponse.addProperty("quota_limit", -1);
         }
@@ -54,32 +61,31 @@ public String getAvailableQuota(String strSwiftContainer) {
 
         return jResponse.toString();
     }
-    
-    public String updateAvailableQuota(String strUser, String strNewQuota){
+
+    public String updateAvailableQuota(String strUser, String strNewQuota) {
         logger.debug(String.format("XMLRPC Request. getAvailableQuota [user: %s, newQuota: %s]", strUser, strNewQuota));
 
-		Long newQuota = null;
-		User user = null;
+        Long newQuota = null;
+        User user = null;
         JsonObject jResponse = new JsonObject();
 
-		try {
-			newQuota = Long.parseLong(strNewQuota);
-		} catch (NumberFormatException ex) {
-			logger.error("Can't parse the new quota value: " + strNewQuota);
-		}
-		
-    	 try {
-             user = userDAO.findBySwiftName(strUser);
-             user.setQuotaUsedReal(newQuota);
-             userDAO.updateQuota(user);
-         } catch (DAOException ex) {
-             logger.error("Can't get user from ID: " + strUser);
-         }
-    	 jResponse.addProperty("ok", 1);
-         logger.debug(String.format("XMLRPC Response. %s", jResponse.toString()));
-
-    	 
-    	 return jResponse.toString();
-    }
+        try {
+            newQuota = Long.parseLong(strNewQuota);
+        } catch (NumberFormatException ex) {
+            logger.error("Can't parse the new quota value: " + strNewQuota);
+        }
 
+        try {
+            user = userDAO.findBySwiftName(strUser);
+            user.setQuotaUsedReal(newQuota);
+            userDAO.updateQuota(user);
+        } catch (DAOException ex) {
+            logger.error("Can't get user from ID: " + strUser);
+        }
+        jResponse.addProperty("ok", 1);
+        logger.debug(String.format("XMLRPC Response. %s", jResponse.toString()));
+
+
+        return jResponse.toString();
+    }
 }