github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Working on error handling

pull/306/merge
Amanda Anganes 2013-03-01 16:30:06 -05:00
parent 1630814b9f
commit dbc68e4074
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
openid-connect-server/src/main/java/org/mitre/openid/connect/web/BlacklistAPI.java
View File

@ -75,12 +75,15 @@ public class BlacklistAPI {
BlacklistedSite newBlacklist = blacklistService.saveNew(blacklist); BlacklistedSite newBlacklist = blacklistService.saveNew(blacklist);
m.put("entity", newBlacklist); m.put("entity", newBlacklist);
} catch (JsonSyntaxException e) {
//TODO: Error Handling
} catch (IllegalStateException e) {
} }
//TODO: Java 7 combine catch statements
catch (JsonSyntaxException e) {
m.put("code", HttpStatus.BAD_REQUEST);
return "httpCodeView";
} catch (IllegalStateException e) {
m.put("code", HttpStatus.BAD_REQUEST);
return "httpCodeView";
}
return "jsonEntityView"; return "jsonEntityView";
@ -101,10 +104,14 @@ public class BlacklistAPI {
json = parser.parse(jsonString).getAsJsonObject(); json = parser.parse(jsonString).getAsJsonObject();
blacklist = gson.fromJson(json, BlacklistedSite.class); blacklist = gson.fromJson(json, BlacklistedSite.class);
} catch (JsonSyntaxException e) { }
//TODO: Error Handling //TODO: Java 7 combine catch statements
catch (JsonSyntaxException e) {
m.put("code", HttpStatus.BAD_REQUEST);
return "httpCodeView";
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
m.put("code", HttpStatus.BAD_REQUEST);
return "httpCodeView";
} }

20
openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java
View File

@ -131,10 +131,14 @@ public class ClientAPI {
try { try {
json = parser.parse(jsonString).getAsJsonObject(); json = parser.parse(jsonString).getAsJsonObject();
client = gson.fromJson(json, ClientDetailsEntity.class); client = gson.fromJson(json, ClientDetailsEntity.class);
} catch (JsonSyntaxException e) { }
//TODO: Error Handling //TODO: Java 7 combine catch statements
catch (JsonSyntaxException e) {
m.addAttribute("code", HttpStatus.BAD_REQUEST);
return "httpCodeView";
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
m.addAttribute("code", HttpStatus.BAD_REQUEST);
return "httpCodeView";
} }
// if they leave the client secret empty, force it to be generated // if they leave the client secret empty, force it to be generated
@ -181,10 +185,14 @@ public class ClientAPI {
// parse the client passed in (from JSON) and fetch the old client from the store // parse the client passed in (from JSON) and fetch the old client from the store
json = parser.parse(jsonString).getAsJsonObject(); json = parser.parse(jsonString).getAsJsonObject();
client = gson.fromJson(json, ClientDetailsEntity.class); client = gson.fromJson(json, ClientDetailsEntity.class);
} catch (JsonSyntaxException e) { }
//TODO: Error Handling //TODO: Java 7 combine catch statements
catch (JsonSyntaxException e) {
m.addAttribute("code", HttpStatus.BAD_REQUEST);
return "httpCodeView";
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
m.addAttribute("code", HttpStatus.BAD_REQUEST);
return "httpCodeView";
} }
ClientDetailsEntity oldClient = clientService.getClientById(id); ClientDetailsEntity oldClient = clientService.getClientById(id);