Skip to content

Commit db5aad5

Browse files
wooreawoorea
committed
new api
1 parent e27bd92 commit db5aad5

99 files changed

Lines changed: 889 additions & 686 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ceilometer-client/src/main/java/org/openstack/ceilometer/v1/api/ExtensionList.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
public class ExtensionList implements CeilometerCommand<Extensions> {
99

1010
@Override
11-
public Extensions execute(OpenStackClientConnector connector, OpenStackRequest request) {
11+
public OpenStackRequest execute(OpenStackClient client) {
1212
//return target.path("extensions").request(MediaType.APPLICATION_JSON).get(Extensions.class);
1313
return null;
1414
}

‎ceilometer-client/src/main/java/org/openstack/ceilometer/v1/api/MeterFunction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public MeterFunction volumeSum() {
3939
}
4040

4141
@Override
42-
public BigDecimal execute(OpenStackClientConnector connector, OpenStackRequest request) {
42+
public OpenStackRequest execute(OpenStackClient client) {
4343
if(source != null) {
4444
request.path("sources").path(source);
4545
} else if(project != null) {

‎ceilometer-client/src/main/java/org/openstack/ceilometer/v1/api/ResourceList.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public ResourceList user(String user) {
2929
}
3030

3131
@Override
32-
public Resources execute(OpenStackClientConnector connector, OpenStackRequest request) {
32+
public OpenStackRequest execute(OpenStackClient client) {
3333
// if(source != null) {
3434
// target = target.path("sources").path(source);
3535
// } else if(project != null) {

‎ceilometer-client/src/main/java/org/openstack/ceilometer/v1/api/ShowExtension.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public ShowExtension(String alias) {
1414
}
1515

1616
@Override
17-
public Extension execute(OpenStackClientConnector connector, OpenStackRequest request) {
17+
public OpenStackRequest execute(OpenStackClient client) {
1818
//return target.path("extensions").path(alias).request(MediaType.APPLICATION_JSON).get(Extension.class);
1919
return null;
2020
}

‎ceilometer-client/src/main/java/org/openstack/ceilometer/v1/api/ShowVersion.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
public class ShowVersion implements CeilometerCommand<Version> {
99

1010
@Override
11-
public Version execute(OpenStackClientConnector connector, OpenStackRequest request) {
11+
public OpenStackRequest execute(OpenStackClient client) {
1212
//return target.request(MediaType.APPLICATION_JSON).get(Version.class);
1313
return null;
1414
}

‎ceilometer-client/src/main/java/org/openstack/ceilometer/v1/api/SourceList.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
public class SourceList implements CeilometerCommand<Sources> {
99

1010
@Override
11-
public Sources execute(OpenStackClientConnector connector, OpenStackRequest request) {
11+
public OpenStackRequest execute(OpenStackClient client) {
1212
//return target.path("v1/sources").request(MediaType.APPLICATION_JSON).get(Sources.class);
1313
return null;
1414
}

‎ceilometer-client/src/main/java/org/openstack/ceilometer/v2/api/ResourceShow.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public ResourceShow id(String id) {
1616
}
1717

1818
@Override
19-
public Resource execute(OpenStackClientConnector connector, OpenStackRequest request) {
19+
public OpenStackRequest execute(OpenStackClient client) {
2020
// if(id == null) {
2121
// throw new UnsupportedOperationException("resource id is mandatory");
2222
// }

‎glance-client/src/main/java/org/openstack/glance/GlanceClient.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ public GlanceClient(String endpoint, OpenStackClientConnector connector) {
1414
super(endpoint, connector);
1515
}
1616

17+
@SuppressWarnings("unchecked")
1718
public <R> R execute(GlanceCommand<R> command) {
18-
OpenStackRequest request = new OpenStackRequest();
19-
request.endpoint(endpoint);
20-
request.header("X-Auth-Token", properties.getProperty("os.token"));
21-
return command.execute(connector, request);
19+
OpenStackRequest request = command.execute(this);
20+
return (R) connector.execute(request, request.returnType());
2221
}
2322

2423
}

‎glance-client/src/main/java/org/openstack/glance/GlanceCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.openstack.glance;
22

3-
import org.openstack.base.client.OpenStackClientConnector;
3+
import org.openstack.base.client.OpenStackClient;
44
import org.openstack.base.client.OpenStackRequest;
55

66
public interface GlanceCommand<R> {
77

8-
R execute(OpenStackClientConnector connector, OpenStackRequest request);
8+
OpenStackRequest execute(OpenStackClient client);
99

1010
}

‎glance-client/src/main/java/org/openstack/glance/api/AddMemberToImage.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.openstack.glance.api;
22

3-
import org.openstack.base.client.OpenStackClientConnector;
3+
import org.openstack.base.client.HttpMethod;
4+
import org.openstack.base.client.OpenStackClient;
45
import org.openstack.base.client.OpenStackRequest;
56
import org.openstack.glance.GlanceCommand;
67
import org.openstack.glance.model.ImageMember;
@@ -17,11 +18,13 @@ public AddMemberToImage(String id, String tenantId) {
1718
}
1819

1920
@Override
20-
public ImageMember execute(OpenStackClientConnector connector, OpenStackRequest request) {
21-
request.method("PUT");
21+
public OpenStackRequest execute(OpenStackClient client) {
22+
OpenStackRequest request = client.newOpenStackRequest();
23+
request.method(HttpMethod.PUT);
2224
request.path("/images/").path(id).path("/members/").path(tenantId);
2325
request.header("Accept", "application/json");
24-
return connector.execute(request, ImageMember.class);
26+
request.returnType(ImageMember.class);
27+
return request;
2528
}
2629

2730
}

0 commit comments

Comments
 (0)