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

undid some autoformatting changes

pull/1385/head
Evan Lennick 2018-04-21 13:22:17 -04:00
parent 0b531a0fd3
commit 0ee4ee2f58
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
openid-connect-server/src/main/java/org/mitre/openid/connect/config/JsonMessageSource.java
View File

@ -16,18 +16,6 @@
package org.mitre.openid.connect.config; package org.mitre.openid.connect.config;
import com.google.common.base.Splitter;
import com.google.gson.JsonElement;
import com.google.gson.JsonIOException;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonSyntaxException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.support.AbstractMessageSource;
import org.springframework.core.io.Resource;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
@ -40,6 +28,19 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.support.AbstractMessageSource;
import org.springframework.core.io.Resource;
import com.google.common.base.Splitter;
import com.google.gson.JsonElement;
import com.google.gson.JsonIOException;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonSyntaxException;
/** /**
* @author jricher * @author jricher
*/ */
@ -85,6 +86,9 @@ public class JsonMessageSource extends AbstractMessageSource {
/** /**
* Get a value from the set of maps, taking the first match in order * Get a value from the set of maps, taking the first match in order
* @param code
* @param langs
* @return
*/ */
private String getValue(String code, List<JsonObject> langs) { private String getValue(String code, List<JsonObject> langs) {
if (langs == null || langs.isEmpty()) { if (langs == null || langs.isEmpty()) {
@ -106,6 +110,9 @@ public class JsonMessageSource extends AbstractMessageSource {
/** /**
* Get a value from a single map * Get a value from a single map
* @param code
* @param lang
* @return
*/ */
private String getValue(String code, JsonObject lang) { private String getValue(String code, JsonObject lang) {
@ -144,7 +151,6 @@ public class JsonMessageSource extends AbstractMessageSource {
} }
return value; return value;
} }
/** /**
@ -186,7 +192,6 @@ public class JsonMessageSource extends AbstractMessageSource {
} }
return languageMaps.get(locale); return languageMaps.get(locale);
} }
/** /**