Skip to content

Commit 2a34994

Browse files
author
Justin Richer
committed
cleanup view
1 parent 7a4366c commit 2a34994

File tree

1 file changed

+13
-26
lines changed

1 file changed

+13
-26
lines changed

openid-connect-server/src/main/java/org/mitre/openid/connect/view/UserInfoView.java

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,33 +31,29 @@
3131
import org.springframework.validation.BeanPropertyBindingResult;
3232
import org.springframework.web.servlet.view.AbstractView;
3333

34-
import com.google.common.base.Strings;
3534
import com.google.gson.ExclusionStrategy;
3635
import com.google.gson.FieldAttributes;
3736
import com.google.gson.Gson;
3837
import com.google.gson.GsonBuilder;
39-
import com.google.gson.JsonElement;
4038
import com.google.gson.JsonObject;
4139
import com.google.gson.JsonParser;
4240

43-
4441
@Component("userInfoView")
4542
public class UserInfoView extends AbstractView {
46-
43+
4744
private static JsonParser jsonParser = new JsonParser();
4845

4946
private static Logger logger = LoggerFactory.getLogger(UserInfoView.class);
50-
51-
private Gson gson = new GsonBuilder()
52-
.setExclusionStrategies(new ExclusionStrategy() {
5347

54-
//@Override
48+
private Gson gson = new GsonBuilder().setExclusionStrategies(new ExclusionStrategy() {
49+
50+
@Override
5551
public boolean shouldSkipField(FieldAttributes f) {
5652

5753
return false;
5854
}
5955

60-
//@Override
56+
@Override
6157
public boolean shouldSkipClass(Class<?> clazz) {
6258
// skip the JPA binding wrapper
6359
if (clazz.equals(BeanPropertyBindingResult.class)) {
@@ -68,30 +64,21 @@ public boolean shouldSkipClass(Class<?> clazz) {
6864

6965
}).create();
7066

71-
/* (non-Javadoc)
72-
* @see org.springframework.web.servlet.view.AbstractView#renderMergedOutputModel(java.util.Map, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
67+
/*
68+
* (non-Javadoc)
69+
*
70+
* @see
71+
* org.springframework.web.servlet.view.AbstractView#renderMergedOutputModel
72+
* (java.util.Map, javax.servlet.http.HttpServletRequest,
73+
* javax.servlet.http.HttpServletResponse)
7374
*/
7475
@Override
7576
protected void renderMergedOutputModel(Map<String, Object> model, HttpServletRequest request, HttpServletResponse response) {
7677

7778
UserInfo userInfo = (UserInfo) model.get("userInfo");
7879

7980
Set<String> scope = (Set<String>) model.get("scope");
80-
81-
String claimsRequestJsonString = (String) model.get("claimsRequest");
82-
83-
// getting the 'claims request parameter' from the model
84-
JsonObject claimsRequest = null;
85-
if (!Strings.isNullOrEmpty(claimsRequestJsonString)) {
86-
JsonElement parsed = jsonParser.parse(claimsRequestJsonString);
87-
if (parsed.isJsonObject()) {
88-
claimsRequest = parsed.getAsJsonObject();
89-
} else {
90-
// claimsRequest stays null
91-
logger.warn("Claims parameter not a valid JSON object: " + claimsRequestJsonString);
92-
}
93-
}
94-
81+
9582
response.setContentType("application/json");
9683

9784
Writer out;

0 commit comments

Comments
 (0)