From 506018ddf80865b7339dc18867d81b342ff80ea4 Mon Sep 17 00:00:00 2001 From: Greg Messner Date: Sat, 27 Jul 2019 13:08:24 -0700 Subject: [PATCH] Mods related to GitLab 12.0 changes (#420). --- .../gitlab4j/api/ApplicationSettingsApi.java | 2 +- .../java/org/gitlab4j/api/models/Setting.java | 11 +++++++ .../org/gitlab4j/api/TestNamespaceApi.java | 30 ++++++++----------- .../java/org/gitlab4j/api/TestProjectApi.java | 4 +-- 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java b/src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java index 1d53437b..8ab93e16 100644 --- a/src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java +++ b/src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java @@ -101,7 +101,7 @@ public class ApplicationSettingsApi extends AbstractApi { } /** - * Pareses the returned JSON and returns an ApplicationSettings instance. + * Parses the returned JSON and returns an ApplicationSettings instance. * * @param root the root JsonNode * @return the populated ApplicationSettings instance diff --git a/src/main/java/org/gitlab4j/api/models/Setting.java b/src/main/java/org/gitlab4j/api/models/Setting.java index 9ccdc83e..8c0d9725 100644 --- a/src/main/java/org/gitlab4j/api/models/Setting.java +++ b/src/main/java/org/gitlab4j/api/models/Setting.java @@ -300,6 +300,12 @@ public enum Setting { */ GITALY_TIMEOUT_MEDIUM(Integer.class), + /** Undocumented setting. */ + GRAFANA_ENABLED(Boolean.class), + + /** Undocumented setting. */ + GRAFANA_URL(String.class), + /** Enable Gravatar. */ GRAVATAR_ENABLED(Boolean.class), @@ -685,6 +691,11 @@ public enum Setting { */ THROTTLE_UNAUTHENTICATED_REQUESTS_PER_PERIOD(Integer.class), + /** + * Limit display of time tracking units to hours. Default is false. + */ + TIME_TRACKING_LIMIT_TO_HOURS(Boolean.class), + /** * required by: require_two_factor_authentication Amount of time (in hours) that * users are allowed to skip forced configuration of two-factor authentication. diff --git a/src/test/java/org/gitlab4j/api/TestNamespaceApi.java b/src/test/java/org/gitlab4j/api/TestNamespaceApi.java index f7e42f91..dd2bfb33 100644 --- a/src/test/java/org/gitlab4j/api/TestNamespaceApi.java +++ b/src/test/java/org/gitlab4j/api/TestNamespaceApi.java @@ -2,10 +2,12 @@ package org.gitlab4j.api; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.junit.Assume.assumeNotNull; import java.util.List; +import java.util.Optional; import org.gitlab4j.api.models.Namespace; import org.junit.Before; @@ -47,12 +49,9 @@ public class TestNamespaceApi extends AbstractIntegrationTest { public void testGetNamespaces() throws GitLabApiException { List namespaces = gitLabApi.getNamespaceApi().getNamespaces(); assertNotNull(namespaces); - for (Namespace namespace : namespaces) { - if (TEST_NAMESPACE.equals(namespace.getName())) - return; - } - - fail(TEST_NAMESPACE + " not found!"); + Optional matchingNamespace = namespaces.stream(). + filter(n -> n.getPath().equals(TEST_NAMESPACE)).findFirst(); + assertTrue(TEST_NAMESPACE + " not found!", matchingNamespace.isPresent()); } @Test @@ -63,7 +62,7 @@ public class TestNamespaceApi extends AbstractIntegrationTest { while (pager.hasNext()) { List namespaces = pager.next(); for (Namespace namespace : namespaces) { - if (TEST_NAMESPACE.equals(namespace.getName())) + if (TEST_NAMESPACE.equals(namespace.getPath())) return; } } @@ -75,39 +74,36 @@ public class TestNamespaceApi extends AbstractIntegrationTest { public void testGetNamespacesByPage() throws GitLabApiException { List namespaces = gitLabApi.getNamespaceApi().getNamespaces(1, 10); assertNotNull(namespaces); - for (Namespace namespace : namespaces) { - if (TEST_NAMESPACE.equals(namespace.getName())) - return; - } - - fail(TEST_NAMESPACE + " not found!"); + Optional matchingNamespace = namespaces.stream(). + filter(n -> n.getPath().equals(TEST_NAMESPACE)).findFirst(); + assertTrue(TEST_NAMESPACE + " not found!", matchingNamespace.isPresent()); } @Test public void testFindNamespaces() throws GitLabApiException { List namespaces = gitLabApi.getNamespaceApi().findNamespaces(TEST_NAMESPACE); assertNotNull(namespaces); - assertEquals(TEST_NAMESPACE, namespaces.get(0).getName()); + assertEquals(TEST_NAMESPACE, namespaces.get(0).getPath()); } @Test public void testFindSubgroupNamespaces() throws GitLabApiException { List namespaces = gitLabApi.getNamespaceApi().findNamespaces(TEST_SUB_GROUP); assertNotNull(namespaces); - assertEquals(TEST_SUB_GROUP, namespaces.get(0).getName()); + assertEquals(TEST_SUB_GROUP, namespaces.get(0).getPath()); } @Test public void testFindNamespacesByPage() throws GitLabApiException { List namespaces = gitLabApi.getNamespaceApi().findNamespaces(TEST_NAMESPACE, 1, 10); assertNotNull(namespaces); - assertEquals(TEST_NAMESPACE, namespaces.get(0).getName()); + assertEquals(TEST_NAMESPACE, namespaces.get(0).getPath()); } @Test public void testFindNamespacesViaPager() throws GitLabApiException { Pager pager = gitLabApi.getNamespaceApi().findNamespaces(TEST_NAMESPACE, 10); assertNotNull(pager); - assertEquals(TEST_NAMESPACE, pager.next().get(0).getName()); + assertEquals(TEST_NAMESPACE, pager.next().get(0).getPath()); } } diff --git a/src/test/java/org/gitlab4j/api/TestProjectApi.java b/src/test/java/org/gitlab4j/api/TestProjectApi.java index 391afd03..3dd3ea83 100644 --- a/src/test/java/org/gitlab4j/api/TestProjectApi.java +++ b/src/test/java/org/gitlab4j/api/TestProjectApi.java @@ -691,12 +691,12 @@ public class TestProjectApi extends AbstractIntegrationTest { assertFalse(matchingVariable.getProtected()); assertNull(matchingVariable.getEnvironmentScope()); - gitLabApi.getProjectApi().updateVariable(testProject, key, "NONE", true, "DEV"); + gitLabApi.getProjectApi().updateVariable(testProject, key, "NO_VALUE", true, "DEV"); variable = gitLabApi.getProjectApi().getVariable(testProject, key); assertNotNull(variable); assertEquals(key, variable.getKey()); - assertEquals("NONE", variable.getValue()); + assertEquals("NO_VALUE", variable.getValue()); assertTrue(variable.getProtected()); gitLabApi.getProjectApi().updateVariable(testProject, key, value, Variable.Type.ENV_VAR, false, true, "DEV"); -- GitLab