Skip to content

[OSJC-131] allow tools to tests StandaloneCartridgeResource #168

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
Nov 3, 2014
Merged

[OSJC-131] allow tools to tests StandaloneCartridgeResource #168

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
36 changes: 23 additions & 13 deletions src/main/java/com/openshift/internal/client/StandaloneCartridgeResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@
package com.openshift.internal.client;

import java.net.URL;
import java.util.Map;

import com.openshift.client.IGearGroup;
import com.openshift.client.Messages;
import com.openshift.client.OpenShiftException;
import com.openshift.client.cartridge.IDeployedStandaloneCartridge;
import com.openshift.client.cartridge.IStandaloneCartridge;
import com.openshift.internal.client.httpclient.request.Parameter;
import com.openshift.internal.client.response.CartridgeResourceDTO;
import com.openshift.internal.client.response.Link;
import com.openshift.internal.client.utils.Assert;
import com.openshift.internal.client.utils.IOpenShiftJsonConstants;

Expand All @@ -41,14 +44,21 @@ public class StandaloneCartridgeResource extends AbstractOpenShiftResource imple
private boolean obsolete;

protected StandaloneCartridgeResource(final CartridgeResourceDTO dto, final ApplicationResource application) {
super(application.getService(), dto.getLinks(), dto.getMessages());
Assert.isTrue(dto.getType().equals(CartridgeType.STANDALONE));
this.name = dto.getName();
this.displayName = dto.getDisplayName();
this.description = dto.getDescription();
this.url = dto.getUrl();
this.cartridgeType = dto.getType();
this.obsolete = dto.getObsolete();
this(dto.getName(), dto.getDisplayName(), dto.getDescription(), dto.getUrl(), dto.getType(), dto.getObsolete(),
application, application.getService(), dto.getLinks(), dto.getMessages());
}

protected StandaloneCartridgeResource(String name, String displayName, String description, URL url,
CartridgeType cartridgeType, boolean obsolete, final ApplicationResource application,
final IRestService service, Map<String, Link> links, Messages messages) {
super(service, links, messages);
Assert.isTrue(cartridgeType != null && cartridgeType.equals(CartridgeType.STANDALONE));
this.name = name;
this.displayName = displayName;
this.description = description;
this.url = url;
this.cartridgeType = cartridgeType;
this.obsolete = obsolete;
this.application = application;
}

Expand Down Expand Up @@ -98,27 +108,27 @@ public String getName() {

@Override
public String getDisplayName() {
return this.displayName;
return displayName;
}

@Override
public String getDescription() {
return this.description;
return description;
}

@Override
public boolean isDownloadable() {
return this.url != null;
return url != null;
}

@Override
public URL getUrl() {
return this.url;
return url;
}

@Override
public CartridgeType getType() {
return this.cartridgeType;
return cartridgeType;
}

@Override
Expand Down