Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-22 22:50:11 +01:00
Code Issues Packages Projects Releases Activity

refactor: replace removed Guava API calls

Browse Source
This commit is contained in:
broDom
2017-07-05 21:23:28 +02:00
parent 1da3c7436c
commit 46f5002f29
54 changed files with 410 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-webapp/src/test/java/sonia/scm/cache/CacheConfigurationTestLoader.java vendored
View File

@@ -43,6 +43,7 @@ import org.junit.rules.TemporaryFolder;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.Collections;
import java.util.Iterator;
import static org.mockito.Mockito.mock;
@@ -190,7 +191,7 @@ public class CacheConfigurationTestLoader implements CacheConfigurationLoader
if (moduleConfigurations == null)
{
urlIterator = Iterators.emptyIterator();
urlIterator = Collections.emptyIterator();
}
else
{

13
scm-webapp/src/test/java/sonia/scm/selenium/page/RepositoriesAddPage.java
View File

@@ -30,17 +30,14 @@
*/
package sonia.scm.selenium.page;
import com.google.common.base.Objects;
import java.util.List;
import org.openqa.selenium.By;
import org.openqa.selenium.JavascriptExecutor;
import org.openqa.selenium.NotFoundException;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import com.google.common.base.MoreObjects;
import org.openqa.selenium.*;
import org.openqa.selenium.support.FindBy;
import org.openqa.selenium.support.ui.WebDriverWait;
import sonia.scm.repository.Repository;
import java.util.List;
/**
* Page object for scm-manager's repository creation page.
*
@@ -130,7 +127,7 @@ public class RepositoriesAddPage extends BasePage<RepositoriesAddPage> {
String script = "Sonia.repository.getTypeByName('" + type + "').displayName;";
displayName = (String) ((JavascriptExecutor)driver).executeScript(script);
}
return Objects.firstNonNull(displayName, type);
return MoreObjects.firstNonNull(displayName, type);
}
}