diff --git a/pom.xml b/pom.xml
index 3b841aa4..494afe9c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
com.openshift
openshift-restclient-java
- 5.4.0-SNAPSHOT
+ 5.4.1.Final
jar
OpenShift Java REST Client
http://openshift.redhat.com
diff --git a/src/main/java/com/openshift/internal/restclient/URLBuilder.java b/src/main/java/com/openshift/internal/restclient/URLBuilder.java
index 1f6f5c69..4045fd97 100644
--- a/src/main/java/com/openshift/internal/restclient/URLBuilder.java
+++ b/src/main/java/com/openshift/internal/restclient/URLBuilder.java
@@ -151,7 +151,7 @@ private void buildWithNamespaceInPath(StringBuilder url) {
if(namespace == null && apiResource.isNamespaced()) {
LOG.debug("The api endpoint for kind '{}' requires a namespace but none was provided. Will only work for priviledged user.", kind);
}
- if(namespace != null) {
+ if(!ResourceKind.PROJECT.equals(kind) && namespace != null) {
url.append("/namespaces/")
.append(namespace);
}
diff --git a/src/test/java/com/openshift/internal/restclient/DefaultClientIntegrationTest.java b/src/test/java/com/openshift/internal/restclient/DefaultClientIntegrationTest.java
index 6c3ea1e6..74c35479 100644
--- a/src/test/java/com/openshift/internal/restclient/DefaultClientIntegrationTest.java
+++ b/src/test/java/com/openshift/internal/restclient/DefaultClientIntegrationTest.java
@@ -10,9 +10,9 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import static com.openshift.internal.restclient.IntegrationTestHelper.*;
-import java.net.MalformedURLException;
import java.util.List;
import org.junit.Before;
@@ -26,21 +26,13 @@
import com.openshift.internal.restclient.model.template.Template;
import com.openshift.restclient.IClient;
import com.openshift.restclient.IResourceFactory;
-import com.openshift.restclient.OpenShiftException;
import com.openshift.restclient.ResourceKind;
import com.openshift.restclient.authorization.UnauthorizedException;
-import com.openshift.restclient.images.DockerImageURI;
import com.openshift.restclient.model.IBuildConfig;
-import com.openshift.restclient.model.IContainer;
-import com.openshift.restclient.model.IDeploymentConfig;
import com.openshift.restclient.model.IProject;
import com.openshift.restclient.model.build.IBuildConfigBuilder;
-import com.openshift.restclient.model.deploy.DeploymentTriggerType;
import com.openshift.restclient.model.project.IProjectRequest;
import com.openshift.restclient.model.template.ITemplate;
-import com.openshift.restclient.model.volume.IHostPathVolumeSource;
-import com.openshift.restclient.model.volume.IVolumeMount;
-import com.openshift.restclient.model.volume.VolumeType;
/**
* @author Jeff Cantrill
@@ -76,6 +68,10 @@ public void testAuthContextIsAuthorizedWithoutPasswordThrows() {
client.getAuthorizationContext().isAuthorized();
}
+ public void testListprojects() {
+ assertTrue(client.list(ResourceKind.PROJECT, "default").size() > 0);
+ }
+
@Test
public void testReady() {
client.getServerReadyStatus();
diff --git a/src/test/java/com/openshift/internal/restclient/URLBuilderTest.java b/src/test/java/com/openshift/internal/restclient/URLBuilderTest.java
index e687f98e..0d1e84dd 100644
--- a/src/test/java/com/openshift/internal/restclient/URLBuilderTest.java
+++ b/src/test/java/com/openshift/internal/restclient/URLBuilderTest.java
@@ -77,7 +77,7 @@ public void testBuildingURLForAProjectUsingResource() throws Exception {
resource(resource)
.name("foo")
.build().toString();
- assertEquals(String.format("%s/oapi/v1/namespaces/foo/projects/foo", BASE_URL),url.toString());
+ assertEquals(String.format("%s/oapi/v1/projects/foo", BASE_URL),url.toString());
}
@Test