Skip to content

Commit ffbb70e

Browse files
authored
Merge pull request #12 from takipi/servers-applications-deployments
adding "active" to deployments. adding list servers and list applicat…
2 parents 5fc98e3 + c8059ef commit ffbb70e

File tree

8 files changed

+185
-6
lines changed

8 files changed

+185
-6
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.takipi.common.api.data.application;
2+
3+
public class SummarizedApplication {
4+
public String name;
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.takipi.common.api.data.server;
2+
3+
public class SummarizedServer {
4+
public String name;
5+
}
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package com.takipi.common.api.request;
2+
3+
import java.io.UnsupportedEncodingException;
4+
5+
public abstract class ProcessTagRequest extends ServiceRequest {
6+
private final boolean active;
7+
8+
protected ProcessTagRequest(String serviceId, boolean active) {
9+
super(serviceId);
10+
11+
this.active = active;
12+
}
13+
14+
@Override
15+
public String[] queryParams() throws UnsupportedEncodingException {
16+
String[] params = new String[1];
17+
18+
params[0] = "active=" + String.valueOf(active);
19+
20+
return params;
21+
}
22+
23+
public static Builder newBuilder() {
24+
return new Builder();
25+
}
26+
27+
public static class Builder extends ServiceRequest.Builder {
28+
protected boolean active;
29+
30+
protected Builder() {
31+
32+
}
33+
34+
public Builder setActive(boolean active) {
35+
this.active = active;
36+
37+
return this;
38+
}
39+
}
40+
}
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package com.takipi.common.api.request.application;
2+
3+
import com.takipi.common.api.request.ProcessTagRequest;
4+
import com.takipi.common.api.request.intf.ApiGetRequest;
5+
import com.takipi.common.api.result.application.ApplicationsResult;
6+
7+
public class ApplicationsRequest extends ProcessTagRequest implements ApiGetRequest<ApplicationsResult> {
8+
ApplicationsRequest(String serviceId, boolean active) {
9+
super(serviceId, active);
10+
}
11+
12+
@Override
13+
public Class<ApplicationsResult> resultClass() {
14+
return ApplicationsResult.class;
15+
}
16+
17+
@Override
18+
public String urlPath() {
19+
return baseUrlPath() + "/applications";
20+
}
21+
22+
public static Builder newBuilder() {
23+
return new Builder();
24+
}
25+
26+
public static class Builder extends ProcessTagRequest.Builder {
27+
Builder() {
28+
29+
}
30+
31+
@Override
32+
public Builder setServiceId(String serviceId) {
33+
super.setServiceId(serviceId);
34+
35+
return this;
36+
}
37+
38+
@Override
39+
public Builder setActive(boolean active) {
40+
this.active = active;
41+
42+
return this;
43+
}
44+
45+
public ApplicationsRequest build() {
46+
validate();
47+
48+
return new ApplicationsRequest(serviceId, active);
49+
}
50+
}
51+
}

api-client/src/main/java/com/takipi/common/api/request/deployment/DeploymentsRequest.java

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.takipi.common.api.request.deployment;
22

3-
import com.takipi.common.api.request.ServiceRequest;
3+
import com.takipi.common.api.request.ProcessTagRequest;
44
import com.takipi.common.api.request.intf.ApiGetRequest;
55
import com.takipi.common.api.result.deployment.DeploymentsResult;
66

7-
public class DeploymentsRequest extends ServiceRequest implements ApiGetRequest<DeploymentsResult> {
8-
DeploymentsRequest(String serviceId) {
9-
super(serviceId);
7+
public class DeploymentsRequest extends ProcessTagRequest implements ApiGetRequest<DeploymentsResult> {
8+
DeploymentsRequest(String serviceId, boolean active) {
9+
super(serviceId, active);
1010
}
1111

1212
@Override
@@ -23,7 +23,7 @@ public static Builder newBuilder() {
2323
return new Builder();
2424
}
2525

26-
public static class Builder extends ServiceRequest.Builder {
26+
public static class Builder extends ProcessTagRequest.Builder {
2727
Builder() {
2828

2929
}
@@ -35,10 +35,17 @@ public Builder setServiceId(String serviceId) {
3535
return this;
3636
}
3737

38+
@Override
39+
public Builder setActive(boolean active) {
40+
this.active = active;
41+
42+
return this;
43+
}
44+
3845
public DeploymentsRequest build() {
3946
validate();
4047

41-
return new DeploymentsRequest(serviceId);
48+
return new DeploymentsRequest(serviceId, active);
4249
}
4350
}
4451
}
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package com.takipi.common.api.request.server;
2+
3+
import com.takipi.common.api.request.ProcessTagRequest;
4+
import com.takipi.common.api.request.intf.ApiGetRequest;
5+
import com.takipi.common.api.result.server.ServersResult;
6+
7+
public class ServersRequest extends ProcessTagRequest implements ApiGetRequest<ServersResult> {
8+
ServersRequest(String serviceId, boolean active) {
9+
super(serviceId, active);
10+
}
11+
12+
@Override
13+
public Class<ServersResult> resultClass() {
14+
return ServersResult.class;
15+
}
16+
17+
@Override
18+
public String urlPath() {
19+
return baseUrlPath() + "/servers";
20+
}
21+
22+
public static Builder newBuilder() {
23+
return new Builder();
24+
}
25+
26+
public static class Builder extends ProcessTagRequest.Builder {
27+
Builder() {
28+
29+
}
30+
31+
@Override
32+
public Builder setServiceId(String serviceId) {
33+
super.setServiceId(serviceId);
34+
35+
return this;
36+
}
37+
38+
@Override
39+
public Builder setActive(boolean active) {
40+
this.active = active;
41+
42+
return this;
43+
}
44+
45+
public ServersRequest build() {
46+
validate();
47+
48+
return new ServersRequest(serviceId, active);
49+
}
50+
}
51+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package com.takipi.common.api.result.application;
2+
3+
import java.util.List;
4+
5+
import com.takipi.common.api.data.application.SummarizedApplication;
6+
import com.takipi.common.api.result.intf.ApiResult;
7+
8+
public class ApplicationsResult implements ApiResult {
9+
public List<SummarizedApplication> applications;
10+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package com.takipi.common.api.result.server;
2+
3+
import java.util.List;
4+
5+
import com.takipi.common.api.data.server.SummarizedServer;
6+
import com.takipi.common.api.result.intf.ApiResult;
7+
8+
public class ServersResult implements ApiResult {
9+
public List<SummarizedServer> servers;
10+
}

0 commit comments

Comments
 (0)