Skip to content

Commit bb270ef

Browse files
committed
fix formattingt
1 parent c97b84b commit bb270ef

File tree

6 files changed

+36
-24
lines changed

6 files changed

+36
-24
lines changed

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/applications/ReactorApplicationsV3Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@
111111
import org.cloudfoundry.client.v3.processes.Data;
112112
import org.cloudfoundry.client.v3.processes.HealthCheck;
113113
import org.cloudfoundry.client.v3.processes.HealthCheckType;
114-
import org.cloudfoundry.client.v3.processes.ReadinessHealthCheck;
115-
import org.cloudfoundry.client.v3.processes.ReadinessHealthCheckType;
116114
import org.cloudfoundry.client.v3.processes.PortMapping;
117115
import org.cloudfoundry.client.v3.processes.ProcessRelationships;
118116
import org.cloudfoundry.client.v3.processes.ProcessResource;
119117
import org.cloudfoundry.client.v3.processes.ProcessState;
120118
import org.cloudfoundry.client.v3.processes.ProcessStatisticsResource;
121119
import org.cloudfoundry.client.v3.processes.ProcessUsage;
120+
import org.cloudfoundry.client.v3.processes.ReadinessHealthCheck;
121+
import org.cloudfoundry.client.v3.processes.ReadinessHealthCheckType;
122122
import org.cloudfoundry.client.v3.routes.Application;
123123
import org.cloudfoundry.client.v3.routes.Destination;
124124
import org.cloudfoundry.client.v3.routes.Process;

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/processes/ReactorProcessesTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@
3535
import org.cloudfoundry.client.v3.processes.GetProcessStatisticsResponse;
3636
import org.cloudfoundry.client.v3.processes.HealthCheck;
3737
import org.cloudfoundry.client.v3.processes.HealthCheckType;
38-
import org.cloudfoundry.client.v3.processes.ReadinessHealthCheck;
39-
import org.cloudfoundry.client.v3.processes.ReadinessHealthCheckType;
4038
import org.cloudfoundry.client.v3.processes.ListProcessesRequest;
4139
import org.cloudfoundry.client.v3.processes.ListProcessesResponse;
4240
import org.cloudfoundry.client.v3.processes.PortMapping;
@@ -45,6 +43,8 @@
4543
import org.cloudfoundry.client.v3.processes.ProcessState;
4644
import org.cloudfoundry.client.v3.processes.ProcessStatisticsResource;
4745
import org.cloudfoundry.client.v3.processes.ProcessUsage;
46+
import org.cloudfoundry.client.v3.processes.ReadinessHealthCheck;
47+
import org.cloudfoundry.client.v3.processes.ReadinessHealthCheckType;
4848
import org.cloudfoundry.client.v3.processes.ScaleProcessRequest;
4949
import org.cloudfoundry.client.v3.processes.ScaleProcessResponse;
5050
import org.cloudfoundry.client.v3.processes.TerminateProcessInstanceRequest;

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/processes/PATCH_{id}_response.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"readiness_health_check": {
1616
"type": "port",
1717
"data": {
18-
"interval": null,
18+
"interval": null,
1919
"endpoint": null,
2020
"invocation_timeout": null
2121
}

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/processes/Process.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public abstract class Process extends Resource {
4343
@JsonProperty("health_check")
4444
public abstract HealthCheck getHealthCheck();
4545

46-
/**
46+
/**
4747
* The readiness health check
4848
*/
4949
@JsonProperty("readiness_health_check")

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/processes/ReadinessHealthCheckType.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public static ReadinessHealthCheckType from(String s) {
5252
case "process":
5353
return PROCESS;
5454
default:
55-
throw new IllegalArgumentException(String.format("Unknown health check type: %s", s));
55+
throw new IllegalArgumentException(
56+
String.format("Unknown health check type: %s", s));
5657
}
5758
}
5859

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsV3.java

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -210,23 +210,27 @@ private static ManifestV3Process getProcess(
210210
variables,
211211
s -> HealthCheckType.from((String) s),
212212
builder::healthCheckType);
213-
asString(raw, "readiness-health-check-http-endpoint", variables, builder::readinessHealthCheckHttpEndpoint);
213+
asString(
214+
raw,
215+
"readiness-health-check-http-endpoint",
216+
variables,
217+
builder::readinessHealthCheckHttpEndpoint);
214218
asInteger(
215-
raw,
216-
"readiness-health-check-invocation-timeout",
217-
variables,
218-
builder::readinessHealthCheckInvocationTimeout);
219+
raw,
220+
"readiness-health-check-invocation-timeout",
221+
variables,
222+
builder::readinessHealthCheckInvocationTimeout);
219223
asInteger(
220-
raw,
221-
"readiness-health-check-interval",
222-
variables,
223-
builder::readinessHealthCheckInterval);
224+
raw,
225+
"readiness-health-check-interval",
226+
variables,
227+
builder::readinessHealthCheckInterval);
224228
as(
225-
raw,
226-
"readiness-health-check-type",
227-
variables,
228-
s -> ReadinessHealthCheckType.from((String) s),
229-
builder::readinessHealthCheckType);
229+
raw,
230+
"readiness-health-check-type",
231+
variables,
232+
s -> ReadinessHealthCheckType.from((String) s),
233+
builder::readinessHealthCheckType);
230234
asInteger(raw, "instances", variables, builder::instances);
231235
asString(raw, "memory", variables, builder::memory);
232236
asInteger(raw, "timeout", variables, builder::timeout);
@@ -313,9 +317,16 @@ private static Map<String, Object> toProcessYaml(ManifestV3Process process) {
313317
yaml, "health-check-invocation-timeout", process.getHealthCheckInvocationTimeout());
314318
putIfPresent(yaml, "health-check-type", process.getHealthCheckType());
315319
putIfPresent(yaml, "readiness-health-check-type", process.getReadinessHealthCheckType());
316-
putIfPresent(yaml, "readiness-health-check-http-endpoint", process.getReadinessHealthCheckHttpEndpoint());
317-
putIfPresent(yaml, "readiness-health-check-invocation-timeout", process.getReadinessHealthCheckInvocationTimeout());
318-
putIfPresent(yaml, "readiness-health-check-interval", process.getReadinessHealthCheckInterval());
320+
putIfPresent(
321+
yaml,
322+
"readiness-health-check-http-endpoint",
323+
process.getReadinessHealthCheckHttpEndpoint());
324+
putIfPresent(
325+
yaml,
326+
"readiness-health-check-invocation-timeout",
327+
process.getReadinessHealthCheckInvocationTimeout());
328+
putIfPresent(
329+
yaml, "readiness-health-check-interval", process.getReadinessHealthCheckInterval());
319330
putIfPresent(yaml, "instances", process.getInstances());
320331
putIfPresent(yaml, "memory", process.getMemory());
321332
putIfPresent(yaml, "timeout", process.getTimeout());

0 commit comments

Comments
 (0)