Skip to content

Commit 82bcebb

Browse files
committed
Cloud Foundry Version Update
This commit brings the client into line with version 2.103.0 of the Cloud Controller API.
1 parent c4ee6cc commit 82bcebb

File tree

8 files changed

+54
-30
lines changed

8 files changed

+54
-30
lines changed

cloudfoundry-client/src/main/java/org/cloudfoundry/client/CloudFoundryClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public interface CloudFoundryClient {
6767
/**
6868
* The currently supported Cloud Controller API version
6969
*/
70-
String SUPPORTED_API_VERSION = "2.98.0";
70+
String SUPPORTED_API_VERSION = "2.103.0";
7171

7272
/**
7373
* Main entry point to the Cloud Foundry Application Usage Events Client API

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/servicebindings/_ServiceBindingEntity.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,13 @@ abstract class _ServiceBindingEntity {
7878
@Nullable
7979
abstract String getGatewayName();
8080

81+
/**
82+
* The service binding name
83+
*/
84+
@JsonProperty("name")
85+
@Nullable
86+
abstract String getName();
87+
8188
/**
8289
* The service instance id
8390
*/

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/serviceinstances/BaseServiceInstanceEntity.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,20 @@ public abstract class BaseServiceInstanceEntity {
5757
@Nullable
5858
public abstract String getServiceBindingsUrl();
5959

60+
/**
61+
* The shared from url
62+
*/
63+
@JsonProperty("shared_from_url")
64+
@Nullable
65+
public abstract String getSharedFromUrl();
66+
67+
/**
68+
* The shared to url
69+
*/
70+
@JsonProperty("shared_to_url")
71+
@Nullable
72+
public abstract String getSharedToUrl();
73+
6074
/**
6175
* The space id
6276
*/

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/serviceinstances/_ServiceInstance.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import org.cloudfoundry.Nullable;
2222
import org.immutables.value.Value;
2323

24+
import java.util.List;
25+
2426
/**
2527
* A service instance
2628
*/
@@ -70,4 +72,18 @@ abstract class _ServiceInstance {
7072
@Nullable
7173
abstract Plan getServicePlan();
7274

75+
/**
76+
* The shared from
77+
*/
78+
@JsonProperty("shared_from")
79+
@Nullable
80+
abstract String getSharedFrom();
81+
82+
/**
83+
* The shared to
84+
*/
85+
@JsonProperty("shared_to")
86+
@Nullable
87+
abstract List<String> getSharedTo();
88+
7389
}

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/spaces/Space.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,11 @@ public abstract class Space extends Resource {
3131
@JsonProperty("name")
3232
public abstract String getName();
3333

34+
/**
35+
* The relationships
36+
*/
37+
@JsonProperty("relationships")
38+
@Nullable
39+
abstract SpaceRelationships getRelationships();
40+
3441
}

cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/identityproviders/_LdapConfiguration.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ abstract class _LdapConfiguration extends AbstractExternalIdentityProviderConfig
4646
* The URL to the ldap server, must start with ldap:// or ldaps://
4747
*/
4848
@JsonProperty("baseUrl")
49+
@Nullable
4950
abstract String getBaseUrl();
5051

5152
/**
@@ -108,12 +109,14 @@ abstract class _LdapConfiguration extends AbstractExternalIdentityProviderConfig
108109
* The file to be used for group integration.
109110
*/
110111
@JsonProperty("ldapGroupFile")
112+
@Nullable
111113
abstract LdapGroupFile getLdapGroupFile();
112114

113115
/**
114116
* The file to be used for configuring the LDAP authentication.
115117
*/
116118
@JsonProperty("ldapProfileFile")
119+
@Nullable
117120
abstract LdapProfileFile getLdapProfileFile();
118121

119122
/**

cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/LdapConfigurationTest.java

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,36 +20,9 @@
2020

2121
public final class LdapConfigurationTest {
2222

23-
@Test(expected = IllegalStateException.class)
24-
public void noBaseUrl() {
25-
LdapConfiguration.builder()
26-
.ldapProfileFile(LdapProfileFile.SIMPLE_BIND)
27-
.ldapGroupFile(LdapGroupFile.NO_GROUP)
28-
.build();
29-
}
30-
31-
@Test(expected = IllegalStateException.class)
32-
public void noLdapGroupFile() {
33-
LdapConfiguration.builder()
34-
.ldapProfileFile(LdapProfileFile.SIMPLE_BIND)
35-
.baseUrl("test-base-url")
36-
.build();
37-
}
38-
39-
@Test(expected = IllegalStateException.class)
40-
public void noLdapProfileFile() {
41-
LdapConfiguration.builder()
42-
.ldapGroupFile(LdapGroupFile.NO_GROUP)
43-
.baseUrl("test-base-url")
44-
.build();
45-
}
46-
4723
@Test
4824
public void valid() {
4925
LdapConfiguration.builder()
50-
.ldapProfileFile(LdapProfileFile.SIMPLE_BIND)
51-
.ldapGroupFile(LdapGroupFile.NO_GROUP)
52-
.baseUrl("test-base-url")
5326
.build();
5427
}
5528

cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DefaultApplicationsTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3047,7 +3047,9 @@ private static void requestApplicationSummary(CloudFoundryClient cloudFoundryCli
30473047
.path("/test-path")
30483048
.port(null)
30493049
.build())
3050-
.service(fill(ServiceInstance.builder(), "service-instance-").build())
3050+
.service(ServiceInstance.builder()
3051+
.name("test-service-instance-name")
3052+
.build())
30513053
.build()));
30523054
}
30533055

@@ -3109,7 +3111,9 @@ private static void requestApplicationSummaryTcp(CloudFoundryClient cloudFoundry
31093111
.domain(fill(org.cloudfoundry.client.v2.domains.Domain.builder(), "domain-").build())
31103112
.port(999)
31113113
.build())
3112-
.service(fill(ServiceInstance.builder(), "service-instance-").build())
3114+
.service(ServiceInstance.builder()
3115+
.name("test-service-instance-name")
3116+
.build())
31133117
.build()));
31143118
}
31153119

0 commit comments

Comments
 (0)