Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2014-09-05 18:57:13 -0400
committerRoberto E. Escobar2014-09-05 18:58:37 -0400
commitd82bdc7198aafa917e3d084e8306e62cad8d6b08 (patch)
tree427186074b6bc23ebf5dd8568717872846bf1bfa
parent4b39f62387cc56ab3acfd5157a8af30f409facde (diff)
downloadorg.eclipse.osee-d82bdc7198aafa917e3d084e8306e62cad8d6b08.tar.gz
org.eclipse.osee-d82bdc7198aafa917e3d084e8306e62cad8d6b08.tar.xz
org.eclipse.osee-d82bdc7198aafa917e3d084e8306e62cad8d6b08.zip
feature: Update to Apache CXF 3.0.1
-rw-r--r--plugins/org.eclipse.osee.jaxrs.client.test/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2FlowsTest.java4
-rw-r--r--plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Flows.java6
2 files changed, 3 insertions, 7 deletions
diff --git a/plugins/org.eclipse.osee.jaxrs.client.test/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2FlowsTest.java b/plugins/org.eclipse.osee.jaxrs.client.test/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2FlowsTest.java
index 0dcc7e12f7..de9c202c73 100644
--- a/plugins/org.eclipse.osee.jaxrs.client.test/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2FlowsTest.java
+++ b/plugins/org.eclipse.osee.jaxrs.client.test/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2FlowsTest.java
@@ -81,7 +81,7 @@ public class OAuth2FlowsTest {
private static final String AUTH_CODE = "authorization_code_1";
private static final String CONFIRM_URI = "confirm_uri";
- private static final String APP_CERTIFICATE = "app_cert_1";
+ private static final List<String> APP_CERTIFICATE = Arrays.asList("app_cert_1");
private static final String APP_DESCRIPTION = "app_description_1";
private static final String APP_LOGO_URI = "app_logo_uri_1";
private static final String APP_NAME = "app_name_1";
@@ -145,7 +145,7 @@ public class OAuth2FlowsTest {
appProperties.put("prop1", "a");
appProperties.put("prop2", "b");
- when(authData.getApplicationCertificate()).thenReturn(APP_CERTIFICATE);
+ when(authData.getApplicationCertificates()).thenReturn(APP_CERTIFICATE);
when(authData.getApplicationDescription()).thenReturn(APP_DESCRIPTION);
when(authData.getApplicationLogoUri()).thenReturn(APP_LOGO_URI);
when(authData.getApplicationName()).thenReturn(APP_NAME);
diff --git a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Flows.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Flows.java
index 78ca637901..f4754999e8 100644
--- a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Flows.java
+++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/OAuth2Flows.java
@@ -292,11 +292,7 @@ public class OAuth2Flows {
@Override
public String getApplicationName() {
- String applicationName = data.getApplicationName();
- if (!Strings.isValid(applicationName)) {
- applicationName = data.getApplicationCertificate();
- }
- return applicationName;
+ return data.getApplicationName();
}
@Override

Back to the top