From 3286aee51f64076b35d3dddac578b5e92335572f Mon Sep 17 00:00:00 2001 From: skavanagh Date: Sat, 30 Aug 2014 07:02:49 -0400 Subject: [PATCH 1/3] Added id to user resource Modified resource inorder to obtain user identifer --- src/main/java/com/openshift/client/IUser.java | 4 +++- .../com/openshift/internal/client/UserResource.java | 7 +++++++ .../client/response/OpenShiftJsonDTOFactory.java | 3 ++- .../internal/client/response/UserResourceDTO.java | 11 ++++++++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/openshift/client/IUser.java b/src/main/java/com/openshift/client/IUser.java index 3f420614..b1a23d9b 100755 --- a/src/main/java/com/openshift/client/IUser.java +++ b/src/main/java/com/openshift/client/IUser.java @@ -20,6 +20,8 @@ public interface IUser extends IOpenShiftResource { public static final String ID = "com.openshift.client"; + public String getId(); + public String getRhlogin(); public String getPassword(); @@ -83,4 +85,4 @@ public interface IUser extends IOpenShiftResource { public int getConsumedGears(); -} \ No newline at end of file +} diff --git a/src/main/java/com/openshift/internal/client/UserResource.java b/src/main/java/com/openshift/internal/client/UserResource.java index 5397ad85..68057411 100755 --- a/src/main/java/com/openshift/internal/client/UserResource.java +++ b/src/main/java/com/openshift/internal/client/UserResource.java @@ -36,6 +36,7 @@ public class UserResource extends AbstractOpenShiftResource implements IUser { private final APIResource api; + private final String id; private final String rhLogin; private final String password; private final int maxGears; @@ -46,6 +47,7 @@ public class UserResource extends AbstractOpenShiftResource implements IUser { public UserResource(final APIResource api, final UserResourceDTO dto, final String password) { super(api.getService(), dto.getLinks(), dto.getMessages()); this.api = api; + this.id = dto.getId(); this.rhLogin = dto.getRhLogin(); this.maxGears = dto.getMaxGears(); this.consumedGears = dto.getConsumedGears(); @@ -57,6 +59,11 @@ public IOpenShiftConnection getConnection() { return api; } + @Override + public String getId() { + return id; + } + @Override public String getRhlogin() { return rhLogin; diff --git a/src/main/java/com/openshift/internal/client/response/OpenShiftJsonDTOFactory.java b/src/main/java/com/openshift/internal/client/response/OpenShiftJsonDTOFactory.java index 03129c64..9e923d87 100755 --- a/src/main/java/com/openshift/internal/client/response/OpenShiftJsonDTOFactory.java +++ b/src/main/java/com/openshift/internal/client/response/OpenShiftJsonDTOFactory.java @@ -126,11 +126,12 @@ private UserResourceDTO createUser(ModelNode userNode) throws OpenShiftException if (!userNode.isDefined()) { return null; } + final String id = getAsString(userNode, PROPERTY_ID); final String rhlogin = getAsString(userNode, PROPERTY_LOGIN); final int maxGears = getAsInteger(userNode, PROPERTY_MAX_GEARS); final int consumedGears = getAsInteger(userNode, PROPERTY_CONSUMED_GEARS); final Map links = createLinks(userNode.get(PROPERTY_LINKS)); - return new UserResourceDTO(rhlogin, maxGears, consumedGears, links); + return new UserResourceDTO(id, rhlogin, maxGears, consumedGears, links); } /** diff --git a/src/main/java/com/openshift/internal/client/response/UserResourceDTO.java b/src/main/java/com/openshift/internal/client/response/UserResourceDTO.java index db21ed7f..4cdb618c 100755 --- a/src/main/java/com/openshift/internal/client/response/UserResourceDTO.java +++ b/src/main/java/com/openshift/internal/client/response/UserResourceDTO.java @@ -14,19 +14,28 @@ public class UserResourceDTO extends BaseResourceDTO { + private final String id; /** the user's login on rhcloud. */ private final String rhLogin; private final int maxGears; private final int consumedGears; - UserResourceDTO(final String rhLogin, final int maxGears, final int consumedGears, final Map links) { + UserResourceDTO(final String id, final String rhLogin, final int maxGears, final int consumedGears, final Map links) { super(links, null); + this.id = id; this.rhLogin = rhLogin; this.maxGears = maxGears; this.consumedGears = consumedGears; } + /** + * @return the id + */ + public String getId() { + return id; + } + /** * @return the rhLogin */ From 10156c8ad411c7b0eb304e4761d0f7bb4c6e3703 Mon Sep 17 00:00:00 2001 From: skavanagh Date: Thu, 4 Sep 2014 05:48:48 -0400 Subject: [PATCH 2/3] Moved Client ID to IOpenShiftConnection Moved Client ID to IOpenShiftConnection --- src/main/java/com/openshift/client/IOpenShiftConnection.java | 2 ++ src/main/java/com/openshift/client/IUser.java | 2 -- src/test/java/com/openshift/client/utils/SSHKeyTestUtils.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/openshift/client/IOpenShiftConnection.java b/src/main/java/com/openshift/client/IOpenShiftConnection.java index 89ff4b32..9cc58cf9 100755 --- a/src/main/java/com/openshift/client/IOpenShiftConnection.java +++ b/src/main/java/com/openshift/client/IOpenShiftConnection.java @@ -24,6 +24,8 @@ */ public interface IOpenShiftConnection { + public static final String DEFAULT_CLIENT_ID = "com.openshift.client"; + /** * Returns the server this connection is bound to. * diff --git a/src/main/java/com/openshift/client/IUser.java b/src/main/java/com/openshift/client/IUser.java index b1a23d9b..07f3c97b 100755 --- a/src/main/java/com/openshift/client/IUser.java +++ b/src/main/java/com/openshift/client/IUser.java @@ -18,8 +18,6 @@ */ public interface IUser extends IOpenShiftResource { - public static final String ID = "com.openshift.client"; - public String getId(); public String getRhlogin(); diff --git a/src/test/java/com/openshift/client/utils/SSHKeyTestUtils.java b/src/test/java/com/openshift/client/utils/SSHKeyTestUtils.java index 80fbf9e0..f65b383a 100644 --- a/src/test/java/com/openshift/client/utils/SSHKeyTestUtils.java +++ b/src/test/java/com/openshift/client/utils/SSHKeyTestUtils.java @@ -23,6 +23,7 @@ import com.jcraft.jsch.KeyPair; import com.openshift.client.IOpenShiftSSHKey; import com.openshift.client.IUser; +import com.openshift.client.IOpenShiftConnection; import com.openshift.client.OpenShiftException; import com.openshift.client.SSHPublicKey; @@ -74,7 +75,7 @@ public static IOpenShiftSSHKey getKey(String name, List keys) public static KeyPair createDsaKeyPair(String publicKeyPath, String privateKeyPath) throws IOException, JSchException { KeyPair keyPair = KeyPair.genKeyPair(new JSch(), KeyPair.DSA, 1024); keyPair.setPassphrase(DEFAULT_PASSPHRASE); - keyPair.writePublicKey(publicKeyPath, "created by " + IUser.ID); + keyPair.writePublicKey(publicKeyPath, "created by " + IOpenShiftConnection.DEFAULT_CLIENT_ID); keyPair.writePrivateKey(privateKeyPath); return keyPair; } From a875c2bb22df6b05aeb4e659219e5abf9b033d11 Mon Sep 17 00:00:00 2001 From: Andre Dietisheim Date: Wed, 10 Sep 2014 16:28:04 +0200 Subject: [PATCH 3/3] [OSJC-122] offer "id" in UserResource --- .../internal/client/UserResourceIntegrationTest.java | 10 ++++++++++ .../java/com/openshift/internal/client/UserTest.java | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/src/test/java/com/openshift/internal/client/UserResourceIntegrationTest.java b/src/test/java/com/openshift/internal/client/UserResourceIntegrationTest.java index c3c8665f..acce75d1 100755 --- a/src/test/java/com/openshift/internal/client/UserResourceIntegrationTest.java +++ b/src/test/java/com/openshift/internal/client/UserResourceIntegrationTest.java @@ -46,6 +46,16 @@ public void setUp() throws OpenShiftException, DatatypeConfigurationException, I this.user = new TestConnectionFactory().getConnection().getUser(); } + @Test + public void shouldReturnId() throws OpenShiftException { + // precondition + DomainTestUtils.ensureHasDomain(user); + // operation + String id = user.getId(); + // verification + assertThat(id).isNotEmpty(); + } + @Test(expected = InvalidCredentialsOpenShiftException.class) public void shouldThrowIfInvalidCredentials() throws Exception { // dont test on dev server diff --git a/src/test/java/com/openshift/internal/client/UserTest.java b/src/test/java/com/openshift/internal/client/UserTest.java index 532b2950..5119910e 100644 --- a/src/test/java/com/openshift/internal/client/UserTest.java +++ b/src/test/java/com/openshift/internal/client/UserTest.java @@ -71,4 +71,11 @@ public void shouldHaveMaxGears() throws Throwable { // verifications assertThat(user.getMaxGears()).isEqualTo(10); } + + @Test + public void shouldHaveId() throws Throwable { + // pre-conditions + // verifications + assertThat(user.getId()).isEqualTo("511a780cf2cb83f4d0001b23"); + } }