diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/config/JsonMessageSource.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/config/JsonMessageSource.java index 6186a9392..90d71a5d3 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/config/JsonMessageSource.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/config/JsonMessageSource.java @@ -16,18 +16,6 @@ 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.FileNotFoundException; import java.io.IOException; @@ -40,6 +28,19 @@ import java.util.List; import java.util.Locale; 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 */ @@ -85,6 +86,9 @@ public class JsonMessageSource extends AbstractMessageSource { /** * 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 langs) { if (langs == null || langs.isEmpty()) { @@ -106,6 +110,9 @@ public class JsonMessageSource extends AbstractMessageSource { /** * Get a value from a single map + * @param code + * @param lang + * @return */ private String getValue(String code, JsonObject lang) { @@ -144,7 +151,6 @@ public class JsonMessageSource extends AbstractMessageSource { } return value; - } /** @@ -186,7 +192,6 @@ public class JsonMessageSource extends AbstractMessageSource { } return languageMaps.get(locale); - } /**