Skip to content

Commit 0ee4ee2

Browse files
committed
undid some autoformatting changes
1 parent 0b531a0 commit 0ee4ee2

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

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

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,6 @@
1616

1717
package org.mitre.openid.connect.config;
1818

19-
import com.google.common.base.Splitter;
20-
import com.google.gson.JsonElement;
21-
import com.google.gson.JsonIOException;
22-
import com.google.gson.JsonObject;
23-
import com.google.gson.JsonParser;
24-
import com.google.gson.JsonSyntaxException;
25-
import org.slf4j.Logger;
26-
import org.slf4j.LoggerFactory;
27-
import org.springframework.beans.factory.annotation.Autowired;
28-
import org.springframework.context.support.AbstractMessageSource;
29-
import org.springframework.core.io.Resource;
30-
3119
import java.io.File;
3220
import java.io.FileNotFoundException;
3321
import java.io.IOException;
@@ -40,6 +28,19 @@
4028
import java.util.Locale;
4129
import java.util.Map;
4230

31+
import org.slf4j.Logger;
32+
import org.slf4j.LoggerFactory;
33+
import org.springframework.beans.factory.annotation.Autowired;
34+
import org.springframework.context.support.AbstractMessageSource;
35+
import org.springframework.core.io.Resource;
36+
37+
import com.google.common.base.Splitter;
38+
import com.google.gson.JsonElement;
39+
import com.google.gson.JsonIOException;
40+
import com.google.gson.JsonObject;
41+
import com.google.gson.JsonParser;
42+
import com.google.gson.JsonSyntaxException;
43+
4344
/**
4445
* @author jricher
4546
*/
@@ -85,6 +86,9 @@ protected MessageFormat resolveCode(String code, Locale locale) {
8586

8687
/**
8788
* Get a value from the set of maps, taking the first match in order
89+
* @param code
90+
* @param langs
91+
* @return
8892
*/
8993
private String getValue(String code, List<JsonObject> langs) {
9094
if (langs == null || langs.isEmpty()) {
@@ -106,6 +110,9 @@ private String getValue(String code, List<JsonObject> langs) {
106110

107111
/**
108112
* Get a value from a single map
113+
* @param code
114+
* @param lang
115+
* @return
109116
*/
110117
private String getValue(String code, JsonObject lang) {
111118

@@ -144,7 +151,6 @@ private String getValue(String code, JsonObject lang) {
144151
}
145152

146153
return value;
147-
148154
}
149155

150156
/**
@@ -186,7 +192,6 @@ List<JsonObject> getLanguageMap(Locale locale) {
186192
}
187193

188194
return languageMaps.get(locale);
189-
190195
}
191196

192197
/**

0 commit comments

Comments
 (0)