From 1fbe4632bbe68ab88077a2503706f7fdbd130eaf Mon Sep 17 00:00:00 2001 From: Amanda Anganes Date: Fri, 9 Dec 2011 16:13:17 -0500 Subject: [PATCH] Previous commit did not include newly created files. Removed local-value.conf from git tracking since it should not be tracked. --- .../mitre/openid/connect/exception/empty.txt | 0 .../mitre/openid/connect/model/Address.java | 88 +++++++++++++++++++ .../model/serializer/JSONIdTokenView.java | 56 ++++++++++++ .../model/serializer/JSONUserInfoView.java | 56 ++++++++++++ .../mitre/openid/connect/repository/empty.txt | 0 .../openid/connect/repository/impl/empty.txt | 0 .../mitre/openid/connect/service/empty.txt | 0 .../openid/connect/service/impl/empty.txt | 0 8 files changed, 200 insertions(+) create mode 100644 src/main/java/org/mitre/openid/connect/exception/empty.txt create mode 100644 src/main/java/org/mitre/openid/connect/model/Address.java create mode 100644 src/main/java/org/mitre/openid/connect/model/serializer/JSONIdTokenView.java create mode 100644 src/main/java/org/mitre/openid/connect/model/serializer/JSONUserInfoView.java create mode 100644 src/main/java/org/mitre/openid/connect/repository/empty.txt create mode 100644 src/main/java/org/mitre/openid/connect/repository/impl/empty.txt create mode 100644 src/main/java/org/mitre/openid/connect/service/empty.txt create mode 100644 src/main/java/org/mitre/openid/connect/service/impl/empty.txt diff --git a/src/main/java/org/mitre/openid/connect/exception/empty.txt b/src/main/java/org/mitre/openid/connect/exception/empty.txt new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/java/org/mitre/openid/connect/model/Address.java b/src/main/java/org/mitre/openid/connect/model/Address.java new file mode 100644 index 000000000..f74b968e6 --- /dev/null +++ b/src/main/java/org/mitre/openid/connect/model/Address.java @@ -0,0 +1,88 @@ +package org.mitre.openid.connect.model; + +import javax.persistence.Entity; + +@Entity +public class Address { + + private String formatted; + private String street_address; + private String locality; + private String region; + private String postal_code; + private String country; + + /** + * @return the formatted + */ + public String getFormatted() { + return formatted; + } + /** + * @param formatted the formatted to set + */ + public void setFormatted(String formatted) { + this.formatted = formatted; + } + /** + * @return the street_address + */ + public String getStreet_address() { + return street_address; + } + /** + * @param street_address the street_address to set + */ + public void setStreet_address(String street_address) { + this.street_address = street_address; + } + /** + * @return the locality + */ + public String getLocality() { + return locality; + } + /** + * @param locality the locality to set + */ + public void setLocality(String locality) { + this.locality = locality; + } + /** + * @return the region + */ + public String getRegion() { + return region; + } + /** + * @param region the region to set + */ + public void setRegion(String region) { + this.region = region; + } + /** + * @return the postal_code + */ + public String getPostal_code() { + return postal_code; + } + /** + * @param postal_code the postal_code to set + */ + public void setPostal_code(String postal_code) { + this.postal_code = postal_code; + } + /** + * @return the country + */ + public String getCountry() { + return country; + } + /** + * @param country the country to set + */ + public void setCountry(String country) { + this.country = country; + } + +} diff --git a/src/main/java/org/mitre/openid/connect/model/serializer/JSONIdTokenView.java b/src/main/java/org/mitre/openid/connect/model/serializer/JSONIdTokenView.java new file mode 100644 index 000000000..d02bbb4c1 --- /dev/null +++ b/src/main/java/org/mitre/openid/connect/model/serializer/JSONIdTokenView.java @@ -0,0 +1,56 @@ +package org.mitre.openid.connect.model.serializer; + +import java.io.Writer; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.validation.BeanPropertyBindingResult; +import org.springframework.web.servlet.view.AbstractView; + +import com.google.gson.ExclusionStrategy; +import com.google.gson.FieldAttributes; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +public class JSONIdTokenView extends AbstractView { + + /* (non-Javadoc) + * @see org.springframework.web.servlet.view.AbstractView#renderMergedOutputModel(java.util.Map, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) + */ + protected void renderMergedOutputModel(Map model, + HttpServletRequest request, HttpServletResponse response) + throws Exception { + + Gson gson = new GsonBuilder() + .setExclusionStrategies(new ExclusionStrategy() { + + public boolean shouldSkipField(FieldAttributes f) { + + return false; + } + + public boolean shouldSkipClass(Class clazz) { + // skip the JPA binding wrapper + if (clazz.equals(BeanPropertyBindingResult.class)) { + return true; + } + return false; + } + + }).create(); + + response.setContentType("application/json"); + + Writer out = response.getWriter(); + + Object obj = model.get("entity"); + if (obj == null) { + obj = model; + } + + gson.toJson(obj, out); + } + +} diff --git a/src/main/java/org/mitre/openid/connect/model/serializer/JSONUserInfoView.java b/src/main/java/org/mitre/openid/connect/model/serializer/JSONUserInfoView.java new file mode 100644 index 000000000..8fcfe3ccc --- /dev/null +++ b/src/main/java/org/mitre/openid/connect/model/serializer/JSONUserInfoView.java @@ -0,0 +1,56 @@ +package org.mitre.openid.connect.model.serializer; + +import java.io.Writer; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.validation.BeanPropertyBindingResult; +import org.springframework.web.servlet.view.AbstractView; + +import com.google.gson.ExclusionStrategy; +import com.google.gson.FieldAttributes; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +public class JSONUserInfoView extends AbstractView{ + + /* (non-Javadoc) + * @see org.springframework.web.servlet.view.AbstractView#renderMergedOutputModel(java.util.Map, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) + */ + protected void renderMergedOutputModel(Map model, + HttpServletRequest request, HttpServletResponse response) + throws Exception { + + Gson gson = new GsonBuilder() + .setExclusionStrategies(new ExclusionStrategy() { + + public boolean shouldSkipField(FieldAttributes f) { + + return false; + } + + public boolean shouldSkipClass(Class clazz) { + // skip the JPA binding wrapper + if (clazz.equals(BeanPropertyBindingResult.class)) { + return true; + } + return false; + } + + }).create(); + + response.setContentType("application/json"); + + Writer out = response.getWriter(); + + Object obj = model.get("entity"); + if (obj == null) { + obj = model; + } + + gson.toJson(obj, out); + } + +} diff --git a/src/main/java/org/mitre/openid/connect/repository/empty.txt b/src/main/java/org/mitre/openid/connect/repository/empty.txt new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/java/org/mitre/openid/connect/repository/impl/empty.txt b/src/main/java/org/mitre/openid/connect/repository/impl/empty.txt new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/java/org/mitre/openid/connect/service/empty.txt b/src/main/java/org/mitre/openid/connect/service/empty.txt new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/java/org/mitre/openid/connect/service/impl/empty.txt b/src/main/java/org/mitre/openid/connect/service/impl/empty.txt new file mode 100644 index 000000000..e69de29bb