Author: beve
Date: 2009-10-13 04:13:13 -0400 (Tue, 13 Oct 2009)
New Revision: 855
Modified:
identity-federation/trunk/jboss-identity-fed-core/pom.xml
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/STSClientConfig.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/handlers/STSSecurityHandler.java
identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/wstrust/STSClientConfigUnitTestCase.java
identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/wstrust/STSClientUnitTestCase.java
Log:
Work for
https://jira.jboss.org/jira/browse/JBID-202 "STSClientConfig: Add parse
method to populate the builder to allow properties overrides"
Modified: identity-federation/trunk/jboss-identity-fed-core/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/pom.xml 2009-10-13 03:32:56 UTC (rev
854)
+++ identity-federation/trunk/jboss-identity-fed-core/pom.xml 2009-10-13 08:13:13 UTC (rev
855)
@@ -114,6 +114,12 @@
<version>2.2.14.GA</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>2.0.1.GA</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<reporting>
Modified:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/STSClientConfig.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/STSClientConfig.java 2009-10-13
03:32:56 UTC (rev 854)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/STSClientConfig.java 2009-10-13
08:13:13 UTC (rev 855)
@@ -44,7 +44,7 @@
* <h3>Configure from file</h3>
* Example:
* <pre>{@code
- * STSClientConfig config = new STSClientConfig.Builder().build(configFile);
+ * STSClientConfig config = new STSClientConfig.Builder(configFile).build();
* }</pre>
*
* @author <a href="mailto:dbevenius@jboss.com">Daniel
Bevenius</a>
@@ -112,6 +112,15 @@
private String endpointAddress;
private String username;
private String password;
+
+ public Builder()
+ {
+ }
+
+ public Builder(final String configFile)
+ {
+ populate(configFile);
+ }
public Builder serviceName(final String serviceName)
{
@@ -149,31 +158,10 @@
return new STSClientConfig(this);
}
- private void validate(Builder builder)
+ private void populate(final String configFile)
{
- checkPropertyShowValue(serviceName, SERVICE_NAME);
- checkPropertyShowValue(portName, PORT_NAME);
- checkPropertyShowValue(endpointAddress, endpointAddress);
- checkProperty(username, USERNAME);
- checkProperty(password, PASSWORD);
- }
-
- private void checkPropertyShowValue(final String propertyName, final String
propertyValue)
- {
- if (propertyValue == null || propertyValue.equals(""))
- throw new IllegalArgumentException(propertyName + " property must
not be null or empty was:" + propertyValue);
- }
-
- private void checkProperty(final String propertyName, final String
propertyValue)
- {
- if (propertyValue == null || propertyValue.equals(""))
- throw new IllegalArgumentException(propertyName + " property must
not be null");
- }
-
- public STSClientConfig build(final String configFile)
- {
InputStream in = null;
-
+
try
{
in = getResource(configFile);
@@ -206,10 +194,28 @@
ignored.printStackTrace();
}
}
+ }
- validate(this);
- return new STSClientConfig(this);
+ private void validate(Builder builder)
+ {
+ checkPropertyShowValue(serviceName, SERVICE_NAME);
+ checkPropertyShowValue(portName, PORT_NAME);
+ checkPropertyShowValue(endpointAddress, endpointAddress);
+ checkProperty(username, USERNAME);
+ checkProperty(password, PASSWORD);
}
+
+ private void checkPropertyShowValue(final String propertyName, final String
propertyValue)
+ {
+ if (propertyValue == null || propertyValue.equals(""))
+ throw new IllegalArgumentException(propertyName + " property must
not be null or empty was:" + propertyValue);
+ }
+
+ private void checkProperty(final String propertyName, final String
propertyValue)
+ {
+ if (propertyValue == null || propertyValue.equals(""))
+ throw new IllegalArgumentException(propertyName + " property must
not be null");
+ }
}
private static InputStream getResource(String resource) throws IOException
Modified:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/handlers/STSSecurityHandler.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/handlers/STSSecurityHandler.java 2009-10-13
03:32:56 UTC (rev 854)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/handlers/STSSecurityHandler.java 2009-10-13
08:13:13 UTC (rev 855)
@@ -137,7 +137,7 @@
{
try
{
- final STSClientConfig config = new
STSClientConfig.Builder().build(configFile);
+ final STSClientConfig config = new
STSClientConfig.Builder(configFile).build();
wsTrustClient = STSClientFactory.getInstance().create(config);
}
catch (final ParsingException e)
Modified:
identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/wstrust/STSClientConfigUnitTestCase.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/wstrust/STSClientConfigUnitTestCase.java 2009-10-13
03:32:56 UTC (rev 854)
+++
identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/wstrust/STSClientConfigUnitTestCase.java 2009-10-13
08:13:13 UTC (rev 855)
@@ -20,12 +20,11 @@
*/
package org.jboss.test.identity.federation.core.wstrust;
+import junit.framework.TestCase;
+
import org.jboss.identity.federation.core.wstrust.STSClientConfig;
import org.jboss.identity.federation.core.wstrust.STSClientConfig.Builder;
-import org.junit.Test;
-import junit.framework.TestCase;
-
/**
* Unit test for {@link WSTrustClientConfig}.
*
@@ -40,7 +39,6 @@
final String username = "admin";
final String password = "admin";
- @Test
public void testBuild()
{
final Builder builder = new STSClientConfig.Builder();
@@ -50,11 +48,21 @@
public void testBuildFromConfigPropertiesFile()
{
- final Builder builder = new STSClientConfig.Builder();
- STSClientConfig config =
builder.build("wstrust/sts-client.properties");
- assertAllProperties(config);
+ final Builder builder = new
STSClientConfig.Builder("wstrust/sts-client.properties");
+ assertAllProperties(builder.build());
}
+ public void testBuildFromConfigPropertiesFileOverridePassword()
+ {
+ final Builder builder = new
STSClientConfig.Builder("wstrust/sts-client.properties");
+ assertAllProperties(builder.build());
+
+ final String overriddenPassword = "newPassword";
+ builder.password(overriddenPassword);
+ final STSClientConfig config = builder.build();
+ assertEquals(overriddenPassword, config.getPassword());
+ }
+
private void assertAllProperties(final STSClientConfig config)
{
assertEquals(serviceName, config.getServiceName());
Modified:
identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/wstrust/STSClientUnitTestCase.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/wstrust/STSClientUnitTestCase.java 2009-10-13
03:32:56 UTC (rev 854)
+++
identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/wstrust/STSClientUnitTestCase.java 2009-10-13
08:13:13 UTC (rev 855)
@@ -223,11 +223,8 @@
System.out.println("Renewed Token=" +
DocumentUtil.getNodeAsString(renewedToken));
}
- public void testIssue_Niehter_AppliesTo_Or_TokenType_Specified()
+ public void testIssue_Neither_AppliesTo_Or_TokenType_Specified()
{
- if(usetest == false)
- return;
-
Builder stsConfigBuilder = new STSClientConfig.Builder();
stsConfigBuilder.serviceName("JBossSTS");
stsConfigBuilder.portName("JBossSTSPort");