Skip to content

[OSJC-217] Use the resources version when creating lists of things #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 4, 2015
Merged

[OSJC-217] Use the resources version when creating lists of things #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/main/java/com/openshift/internal/restclient/DefaultClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public Collection<IResource> create(IList list, String namespace){
List<IResource> results = new ArrayList<IResource>(list.getItems().size());
for (IResource resource : list.getItems()) {
try{
results.add(create(resource, namespace));
results.add(createVersion(resource, namespace, resource.getApiVersion()));
}catch(OpenShiftException e){
if(e.getStatus() != null){
results.add(e.getStatus());
Expand All @@ -176,8 +176,13 @@ public <T extends IResource> T create(T resource) {
return create(resource, resource.getNamespace());
}


@Override
public <T extends IResource> T create(T resource, String namespace) {
return createVersion(resource, namespace, null);
}

private <T extends IResource> T createVersion(T resource, String namespace, String version) {
if(ResourceKind.LIST.equals(resource.getKind())) throw new UnsupportedOperationException("Generic create operation not supported for resource type 'List'");
try {
namespace = ResourceKind.PROJECT.equals(resource.getKind()) ? "" : namespace;
Expand Down Expand Up @@ -363,11 +368,13 @@ private <T extends Enum<T>> List<T> getVersion(Class<T> klass, String endpoint)
return new ArrayList<T>();
}
}

private Map<String, String> getTypeMappings(){
return getTypeMappings(null);
}
private Map<String, String> getTypeMappings(String apiVersion){
if(typeMappings.isEmpty()){
//OpenShift endpoints
final String version = getOpenShiftAPIVersion();
final String version = StringUtils.defaultIfEmpty(apiVersion, getOpenShiftAPIVersion());
final String osEndpoint = String.format("%s/%s", OpenShiftAPIVersion.v1beta3.toString().equals(version) ? OS_API_LEGACY_ENDPOINT : OS_API_ENDPOINT, version);
typeMappings.put(ResourceKind.BUILD, osEndpoint);
typeMappings.put(ResourceKind.BUILD_CONFIG, osEndpoint);
Expand All @@ -391,7 +398,8 @@ private Map<String, String> getTypeMappings(){
typeMappings.put(ResourceKind.PROCESSED_TEMPLATES, osEndpoint);

//Kubernetes endpoints
final String k8eEndpoint = String.format("%s/%s", API_ENDPOINT, getKubernetesVersion());
final String k8eApiVersion = StringUtils.defaultIfEmpty(apiVersion, getKubernetesVersion());
final String k8eEndpoint = String.format("%s/%s", API_ENDPOINT, k8eApiVersion);
typeMappings.put(ResourceKind.EVENT, k8eEndpoint);
typeMappings.put(ResourceKind.POD, k8eEndpoint);
typeMappings.put(ResourceKind.PVC, k8eEndpoint);
Expand Down