From 0b0e52b7a3530292426823de9cc7b420d2eb10e7 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Fri, 19 Apr 2013 14:22:21 -0400 Subject: [PATCH] extracted parsers and rest templates appropriately --- .../impl/DynamicServerConfigurationService.java | 5 +++-- .../client/service/impl/WebfingerIssuerService.java | 12 ++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicServerConfigurationService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicServerConfigurationService.java index 8eb9f41c4..0ef3cad74 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicServerConfigurationService.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicServerConfigurationService.java @@ -58,10 +58,11 @@ public class DynamicServerConfigurationService implements ServerConfigurationSer private class OpenIDConnectServiceConfigurationFetcher extends CacheLoader { private HttpClient httpClient = new DefaultHttpClient(); private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(httpClient); - private RestTemplate restTemplate = new RestTemplate(httpFactory); + private JsonParser parser = new JsonParser(); @Override public ServerConfiguration load(String issuer) throws Exception { + RestTemplate restTemplate = new RestTemplate(httpFactory); // data holder ServerConfiguration conf = new ServerConfiguration(); @@ -72,7 +73,7 @@ public class DynamicServerConfigurationService implements ServerConfigurationSer // fetch the value String jsonString = restTemplate.getForObject(url, String.class); - JsonElement parsed = new JsonParser().parse(jsonString); + JsonElement parsed = parser.parse(jsonString); if (parsed.isJsonObject()) { JsonObject o = parsed.getAsJsonObject(); diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/WebfingerIssuerService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/WebfingerIssuerService.java index 23b57fedd..d8f385eaa 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/WebfingerIssuerService.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/WebfingerIssuerService.java @@ -3,8 +3,6 @@ */ package org.mitre.openid.connect.client.service.impl; -import java.net.URI; -import java.net.URISyntaxException; import java.util.concurrent.ExecutionException; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -16,7 +14,6 @@ import org.apache.http.client.utils.URIBuilder; import org.apache.http.impl.client.DefaultHttpClient; import org.mitre.openid.connect.client.model.IssuerServiceResponse; import org.mitre.openid.connect.client.service.IssuerService; -import org.mitre.openid.connect.config.ServerConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; @@ -171,10 +168,9 @@ public class WebfingerIssuerService implements IssuerService { private class WebfingerIssuerFetcher extends CacheLoader { private HttpClient httpClient = new DefaultHttpClient(); private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(httpClient); - /* (non-Javadoc) - * @see com.google.common.cache.CacheLoader#load(java.lang.Object) - */ - @Override + private JsonParser parser = new JsonParser(); + + @Override public String load(NormalizedURI key) throws Exception { RestTemplate restTemplate = new RestTemplate(httpFactory); @@ -196,7 +192,7 @@ public class WebfingerIssuerService implements IssuerService { // TODO: catch and handle HTTP errors - JsonElement json = new JsonParser().parse(webfingerResponse); + JsonElement json = parser.parse(webfingerResponse); // TODO: catch and handle JSON errors