Skip to content

[OSJC-178] Allow a resource to return their project #33

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
Jun 12, 2015
Merged

[OSJC-178] Allow a resource to return their project #33

Show file tree
Hide file tree
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
10 changes: 10 additions & 0 deletions src/main/java/com/openshift/internal/restclient/model/KubernetesResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.openshift.restclient.ResourceKind;
import com.openshift.restclient.capability.CapabilityVisitor;
import com.openshift.restclient.capability.ICapability;
import com.openshift.restclient.model.IProject;
import com.openshift.restclient.model.IResource;

/**
Expand All @@ -37,6 +38,7 @@ public abstract class KubernetesResource implements IResource, ResourcePropertyK
private IClient client;
private Map<Class<? extends ICapability>, ICapability> capabilities = new HashMap<Class<? extends ICapability>, ICapability>();
private Map<String, String []> propertyKeys;
private IProject project;

protected KubernetesResource(ModelNode node, IClient client, Map<String, String []> propertyKeys){
this.node = node;
Expand Down Expand Up @@ -74,6 +76,14 @@ public <T extends ICapability, R> R accept(CapabilityVisitor<T, R> visitor, R un
return unsupportedValue;
}

@Override
public IProject getProject() {
if(this.project == null) {
this.project = client.get(ResourceKind.Project, getNamespace(), "");
}
return this.project;
}

@Override
public Map<String, String> getAnnotations() {
return asMap(ANNOTATIONS);
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/com/openshift/internal/restclient/model/Project.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ public Project(ModelNode node, IClient client, Map<String, String []> propertyKe
initializeCapabilities(getModifiableCapabilities(), this, getClient());
}


@Override
public IProject getProject() {
return this;
}

@Override
public String getNamespace() {
if(StringUtils.isEmpty(super.getNamespace()))
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/openshift/restclient/model/IResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ public interface IResource extends ICapable {
*/
String getNamespace();

/**
* Return the project of the resource which
* corresponds to the namespace
* @return
*/
IProject getProject();

/**
* Retrieves the labels associated with the resource
* @return
Expand Down