Skip to content
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

Jump to bottom

[JBIDE-21704] re-create deployment mapper upon connection change #963

Merged
merged 2 commits into from Feb 19, 2016
Merged

[JBIDE-21704] re-create deployment mapper upon connection change #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb65cd6
[JBIDE-21704] re-create deployment mapper upon connection change
adietish Feb 18, 2016
e77a887
[JBIDE-21704] preload all image stream tags (was: loading in UI thread)
adietish Feb 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 17 additions & 4 deletions ...enshift.ui/src/org/jboss/tools/openshift/internal/ui/models/DeploymentResourceMapper.java
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
Expand Down Expand Up @@ -78,20 +79,32 @@ public synchronized void refresh() {
}


@Override
public Map<IService, Collection<IResource>> getAllImageStreamTags() {
return deployments.stream()
.collect(Collectors.toMap(
deployment -> deployment.getService(),
deployment -> getImageStreamTagsFor(deployment)));
}

@Override
public Collection<IResource> getImageStreamTagsFor(IService service) {
Optional<Deployment> deployment = deployments.stream().filter(d->service.equals(d.getService())).findFirst();
if(deployment.isPresent()) {
Set<String> imageRefs = deployment.get()
return getImageStreamTagsFor(deployment.get());
}
return Collections.emptySet();
}

private Collection<IResource> getImageStreamTagsFor(Deployment deployment) {
Set<String> imageRefs = deployment
.getBuildConfigs()
.stream()
.map(bc->ResourceUtils.imageRef((IBuildConfig) bc.getResource())).collect(Collectors.toSet());
final String projectName = service.getNamespace();
final String projectName = deployment.getService().getNamespace();
return imageRefs.stream()
.map(ref->conn.<IResource>getResource(ResourceKind.IMAGE_STREAM_TAG, projectName, ref))
.collect(Collectors.toSet());
}
return Collections.emptySet();
}

@Override
Expand Down
3 changes: 3 additions & 0 deletions ...nshift.ui/src/org/jboss/tools/openshift/internal/ui/models/IDeploymentResourceMapper.java
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@
package org.jboss.tools.openshift.internal.ui.models;

import java.util.Collection;
import java.util.Map;

import org.jboss.tools.common.databinding.IObservablePojo;
import org.jboss.tools.openshift.common.core.IRefreshable;
Expand All @@ -31,4 +32,6 @@ public interface IDeploymentResourceMapper extends IObservablePojo, IRefreshable
* @return The collection of imagestreamtags or an empty collection
*/
Collection<IResource> getImageStreamTagsFor(IService service);

Map<IService, Collection<IResource>> getAllImageStreamTags();
}
5 changes: 2 additions & 3 deletions ...shift.ui/src/org/jboss/tools/openshift/internal/ui/server/OpenShiftServerEditorModel.java
View file
Open in desktop
Expand Up @@ -16,7 +16,6 @@

import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.jboss.tools.openshift.core.connection.Connection;
import org.jboss.tools.openshift.internal.ui.models.IDeploymentResourceMapper;
import org.jboss.tools.openshift.internal.ui.treeitem.ObservableTreeItem;

import com.openshift.restclient.model.IService;
Expand All @@ -37,7 +36,7 @@ public OpenShiftServerEditorModel(IServerWorkingCopy server, Connection connecti

private void update(boolean overrideProject, Connection connection, List<Connection> connections,
org.eclipse.core.resources.IProject deployProject, List<org.eclipse.core.resources.IProject> projects,
String sourcePath, String podPath, Map<String, IDeploymentResourceMapper> deploymentMapperByProjectName,
String sourcePath, String podPath, Map<String, ProjectImageStreamTags> deploymentMapperByProjectName,
IService service, List<ObservableTreeItem> serviceItems) {
update(connection, connections, deployProject, projects, sourcePath, podPath, deploymentMapperByProjectName, service, serviceItems);
firePropertyChange(PROPERTY_OVERRIDE_PROJECT, this.overrideProject, this.overrideProject = overrideProject);
Expand All @@ -49,7 +48,7 @@ public boolean isOverrideProject() {

public void setOverrideProject(boolean overrideProject) {
update(overrideProject, getConnection(), getConnections(), getDeployProject(), getProjects(),
getSourcePath(), getPodPath(), getImageStreamTags(), getService(), getServiceItems());
getSourcePath(), getPodPath(), getImageStreamTagsMap(), getService(), getServiceItems());
}

@Override
Expand Down