Manage the new ORecordDuplicatedException exception

giastfader · giastfader · commit 2ecbf3d8fd58 · 2013-11-22T19:59:26.000+01:00
diff --git a/app/com/baasbox/controllers/Admin.java b/app/com/baasbox/controllers/Admin.java
@@ -97,6 +97,7 @@
 import com.orientechnologies.orient.core.index.OIndexException;
 import com.orientechnologies.orient.core.record.impl.ODocument;
 import com.orientechnologies.orient.core.serialization.serializer.OJSONWriter;
+import com.orientechnologies.orient.core.storage.ORecordDuplicatedException;
 
 @With  ({UserCredentialWrapFilter.class,ConnectToDBFilter.class, CheckAdminRoleFilter.class,ExtractQueryParameters.class})
 public class Admin extends Controller {
@@ -261,6 +262,8 @@ public static Result editRole(String name){
 			return badRequest("Role " + name + " is not modifiable");
 		} catch (RoleNotFoundException e) {
 			return notFound("Role " + name + " does not exists");
+		}catch (ORecordDuplicatedException e){
+	    	return badRequest("Role " + name + " already exists");
 		} catch (OIndexException e){
 			return badRequest("Role " + name + " already exists");
 		}
diff --git a/app/com/baasbox/controllers/Asset.java b/app/com/baasbox/controllers/Asset.java
@@ -281,6 +281,8 @@ private static Result postFile() throws  Throwable{
 		    try{
 		    	ODocument doc=AssetService.createFile(name[0],fileName,metaJson,contentType, fileContentAsByteArray);
 		    	ret=prepareResponseToJson(doc);
+		    }catch (ORecordDuplicatedException e){
+		    	return badRequest("An asset with the same name already exists");
 		    }catch (OIndexException e){
 		    	return badRequest("An asset with the same name already exists");
 		    }

Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,8 @@ private static Result postFile() throws Throwable{`
`281`	`281`	`try{`
`282`	`282`	`ODocument doc=AssetService.createFile(name[0],fileName,metaJson,contentType, fileContentAsByteArray);`
`283`	`283`	`ret=prepareResponseToJson(doc);`
	`284`	`+ }catch (ORecordDuplicatedException e){`
	`285`	`+ return badRequest("An asset with the same name already exists");`
`284`	`286`	`}catch (OIndexException e){`
`285`	`287`	`return badRequest("An asset with the same name already exists");`
`286`	`288`	`}`