[OSJC-232] Update ImageStream to support jbt explorer view

src/main/java/com/openshift/internal/restclient/model/BuildConfig.java

@@ -26,6 +26,7 @@
 import com.openshift.restclient.IClient;
 import com.openshift.restclient.images.DockerImageURI;
 import com.openshift.restclient.model.IBuildConfig;
+import com.openshift.restclient.model.IObjectReference;
 import com.openshift.restclient.model.build.BuildSourceType;
 import com.openshift.restclient.model.build.BuildStrategyType;
 import com.openshift.restclient.model.build.BuildTriggerType;
@@ -73,6 +74,15 @@ public BuildConfig(ModelNode node, IClient client, Map<String, String []> overri
 		CapabilityInitializer.initializeCapabilities(getModifiableCapabilities(), this, client);
 	}
 
+
+	@Override
+	public IObjectReference getBuildOutputReference() {
+		ModelNode node = get("spec.output.to");
+		if(!node.isDefined()) return null;
+		return new ObjectReference(node);
+	}
+
+
 	@Override
 	public List<IBuildTrigger> getBuildTriggers() {
 		List<IBuildTrigger> triggers = new ArrayList<IBuildTrigger>();

src/main/java/com/openshift/internal/restclient/model/ImageStream.java

@@ -8,49 +8,71 @@
  ******************************************************************************/
 package com.openshift.internal.restclient.model;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.ModelType;
 
+import com.openshift.internal.restclient.model.image.TagReference;
 import com.openshift.restclient.IClient;
 import com.openshift.restclient.images.DockerImageURI;
 import com.openshift.restclient.model.IImageStream;
+import com.openshift.restclient.model.image.ITagReference;
 
 /**
  * @author Jeff Cantrill
  */
 public class ImageStream extends KubernetesResource implements IImageStream {
 
-	private static final String IMAGESTREAM_DOCKER_IMAGE_REPO = "spec.dockerImageRepository";
-	private static final String IMAGESTREAM_SPEC_TAGS = "spec.tags";
-	private static final String IMAGESTREAM_STATUS_TAGS = "status.tags";
+	private static final String DOCKER_IMAGE_REPO = "status.dockerImageRepository";
+	private static final String SPEC_TAGS = "spec.tags";
+	private static final String STATUS_TAGS = "status.tags";
 	private static final String TAG = "tag";
 	private static final String ITEMS = "items";
 	private static final String IMAGE = "image";
+	private Map<String, String[]> propertyKeys;
 
 	public ImageStream(){
 		this(new ModelNode(), null, null);
 	}
 
 	public ImageStream(ModelNode node, IClient client, Map<String, String []> propertyKeys) {
 		super(node, client, propertyKeys);
+		this.propertyKeys = propertyKeys;
 	}
 
 	@Override
 	public void setDockerImageRepository(DockerImageURI uri) {
-		set(IMAGESTREAM_DOCKER_IMAGE_REPO, uri.getAbsoluteUri());		
+		set(DOCKER_IMAGE_REPO, uri.getAbsoluteUri());		
 	}
 
 	@Override
 	public DockerImageURI getDockerImageRepository() {
-		return new DockerImageURI(asString(IMAGESTREAM_DOCKER_IMAGE_REPO));
+		return new DockerImageURI(asString(DOCKER_IMAGE_REPO));
+	}
+
+
+	@Override
+	public Collection<String> getTagNames() {
+		ModelNode node = get(STATUS_TAGS);
+		if(!node.isDefined()) return new ArrayList<>();
+		return node.asList().stream().map(n->asString(n,TAG)).collect(Collectors.toList());
+	}
+
+	@Override
+	public Collection<ITagReference> getTags() {
+		ModelNode node = get(SPEC_TAGS);
+		if(!node.isDefined()) return new ArrayList<>();
+		return node.asList().stream().map(n->new TagReference(n, propertyKeys)).collect(Collectors.toList());
 	}
 
 	@Override
 	public void setTag(String newTag, String fromTag) {
-		ModelNode tags = get(IMAGESTREAM_SPEC_TAGS);
+		ModelNode tags = get(SPEC_TAGS);
 		ModelNode tag = new ModelNode();
 		tag.get("name").set(newTag);
 		ModelNode from = new ModelNode();
@@ -73,7 +95,7 @@ protected String getImageId(List<ModelNode> itemWrappers) {
 	@Override
 	public String getImageId(String tagName) {
 		String imageId = null;
-		ModelNode tags = get(IMAGESTREAM_STATUS_TAGS);
+		ModelNode tags = get(STATUS_TAGS);
 		if (tags.getType() != ModelType.LIST || tagName == null)
 			return null;
 

src/main/java/com/openshift/internal/restclient/model/image/TagReference.java

@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package com.openshift.internal.restclient.model.image;
+
+import static com.openshift.internal.util.JBossDmrExtentions.*;
+import java.util.Map;
+
+import org.jboss.dmr.ModelNode;
+
+import com.openshift.internal.restclient.model.ModelNodeAdapter;
+import com.openshift.internal.restclient.model.ObjectReference;
+import com.openshift.internal.restclient.model.properties.ResourcePropertyKeys;
+import com.openshift.restclient.model.IObjectReference;
+import com.openshift.restclient.model.image.ITagReference;
+
+public class TagReference extends ModelNodeAdapter implements ITagReference, ResourcePropertyKeys {
+
+	private static final String TAG_ANNOTATIONS = "annotations";
+
+	public TagReference(ModelNode node, Map<String, String[]> propertyKeys) {
+		super(node, propertyKeys);
+	}
+
+	@Override
+	public boolean isAnnotatedWith(String key) {
+		return getAnnotations().containsKey(key);
+	}
+
+	@Override
+	public String getAnnotation(String key) {
+		return getAnnotations().get(key);
+	}
+
+	@Override
+	public void setAnnotation(String key, String value) {
+		if(value == null) return;
+		ModelNode annotations = get(getNode(), getPropertyKeys(), TAG_ANNOTATIONS);
+		annotations.get(key).set(value);
+	}
+
+	@Override
+	public Map<String, String> getAnnotations() {
+		return asMap(getNode(), getPropertyKeys(), TAG_ANNOTATIONS);
+	}
+
+	@Override
+	public String getName() {
+		return asString(getNode(),getPropertyKeys(), NAME);
+	}
+
+	@Override
+	public IObjectReference getFrom() {
+		return new ObjectReference(get(getNode(), getPropertyKeys(), "from"));
+	}
+
+}

src/main/java/com/openshift/restclient/model/Annotatable.java

@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package com.openshift.restclient.model;
+
+import java.util.Map;
+
+public interface Annotatable {
+
+	/**
+	 * Returns <code>true</code> if the resource is annotated with
+	 * the given key
+	 * @param key
+	 * @return true if the annotation key exists
+	 */
+	boolean isAnnotatedWith(String key);
+
+	/**
+	 * Retrieves the annotated value for the given key
+	 * @param key
+	 * @return
+	 */
+	String getAnnotation(String key);
+
+	/**
+	 * Set the resource annotation
+	 * @param key
+	 * @param value
+	 */
+	void setAnnotation(String key, String value);
+
+	/**
+	 * Retrieves the annotations associated with the resource
+	 * @return
+	 */
+	Map<String, String> getAnnotations();
+
+}

src/main/java/com/openshift/restclient/model/IBuildConfig.java

@@ -18,7 +18,14 @@
  * @author Jeff Cantrill
  */
 public interface IBuildConfig extends IResource {
-
+
+	/**
+	 * To defines an optional location to push the output of this build to.
+	 * Kind must be one of 'ImageStreamTag' or 'DockerImage'.
+	 * @return
+	 */
+	IObjectReference getBuildOutputReference();
+
 	/**
 	 * Returns the source URL for a build
 	 * @return

src/main/java/com/openshift/restclient/model/IImageStream.java

@@ -8,7 +8,10 @@
  ******************************************************************************/
 package com.openshift.restclient.model;
 
+import java.util.Collection;
+
 import com.openshift.restclient.images.DockerImageURI;
+import com.openshift.restclient.model.image.ITagReference;
 
 /**
  * @author Jeff Cantrill
@@ -38,4 +41,17 @@ public interface IImageStream extends IResource{
 	 * @return
 	 */
 	String getImageId(String tagName);
+
+	/**
+	 * The collection of tag references for this imagestream
+	 * @return
+	 */
+	Collection<ITagReference> getTags();
+
+	/**
+	 * The collection of tag names as listed
+	 * in status.tags
+	 * @return
+	 */
+	Collection<String> getTagNames();
 }

src/main/java/com/openshift/restclient/model/IResource.java

@@ -19,7 +19,7 @@
  * 
  * @author Jeff Cantrill
  */
-public interface IResource extends ICapable {
+public interface IResource extends ICapable, Annotatable {
 
 	Map<String, String> getMetadata();
 
@@ -80,34 +80,6 @@ public interface IResource extends ICapable {
 	 */
 	void addLabel(String key, String value);
 
-	/**
-	 * Returns <code>true</code> if the resource is annotated with
-	 * the given key
-	 * @param key
-	 * @return true if the annotation key exists
-	 */
-	boolean isAnnotatedWith(String key);
-
-	/**
-	 * Retrieves the annotated value for the given key
-	 * @param key
-	 * @return
-	 */
-	String getAnnotation(String key);
-
-	/**
-	 * Set the resource annotation
-	 * @param key
-	 * @param value
-	 */
-	void setAnnotation(String key, String value);
-
-	/**
-	 * Retrieves the annotations associated with the resource
-	 * @return
-	 */
-	Map<String, String> getAnnotations();
-
 	String getResourceVersion();
 
 	/**

src/main/java/com/openshift/restclient/model/image/ITagReference.java

@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package com.openshift.restclient.model.image;
+
+import com.openshift.restclient.model.Annotatable;
+import com.openshift.restclient.model.IObjectReference;
+
+public interface ITagReference extends Annotatable {
+
+	/**
+	 * Returns the identifier for this reference
+	 * @return
+	 */
+	String getName();
+
+	/**
+	 * if specified, a reference to another image that this tag should point to. 
+	 * Valid values are ImageStreamTag, ImageStreamImage, and DockerImage.
+	 * @return
+	 */
+	IObjectReference getFrom();
+
+	String toJson();
+}

src/test/java/com/openshift/internal/restclient/model/v1/ImageStreamTest.java

@@ -11,6 +11,9 @@
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
 
+import java.util.Collection;
+import java.util.stream.Collectors;
+
 import org.jboss.dmr.ModelNode;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -34,11 +37,18 @@ public class ImageStreamTest {
 	public static void setup(){
 		client = mock(IClient.class);
 	}
-
+
+	@Test
+	public void testGetTags() {
+		IImageStream stream = getImageStream();
+		Collection<String> tags = stream.getTags().stream().map(tr->tr.getName()).collect(Collectors.toList());
+		assertArrayEquals(new Object [] {"8.1", "latest"}, tags.toArray());
+	}
+
 	@Test
 	public void getDockerImageRepository() {
 		IImageStream repo = getImageStream();
-		assertEquals(new DockerImageURI("172.30.244.213:5000/test/origin-ruby-sample"), repo.getDockerImageRepository());
+		assertEquals(new DockerImageURI("172.30.224.48:5000/openshift/wildfly:latest"), repo.getDockerImageRepository());
 	}
 
 	@Test