Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-21 15:02:17 +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

11
scm-core/src/main/java/sonia/scm/cache/CacheStatistics.java vendored
View File

@@ -33,6 +33,7 @@ package sonia.scm.cache;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -101,11 +102,11 @@ public final class CacheStatistics
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("name", name)
.add("hitCount", hitCount)
.add("missCount", missCount)
.toString();
return MoreObjects.toStringHelper(this)
.add("name", name)
.add("hitCount", hitCount)
.add("missCount", missCount)
.toString();
//J+
}

11
scm-core/src/main/java/sonia/scm/event/AbstractHandlerEvent.java
View File

@@ -33,6 +33,7 @@ package sonia.scm.event;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import sonia.scm.HandlerEventType;
@@ -127,11 +128,11 @@ public class AbstractHandlerEvent<T> implements HandlerEvent<T>
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("eventType", eventType)
.add("item", item)
.add("oldItem", oldItem)
.toString();
return MoreObjects.toStringHelper(this)
.add("eventType", eventType)
.add("item", item)
.add("oldItem", oldItem)
.toString();
//J+
}

29
scm-core/src/main/java/sonia/scm/group/Group.java
View File

@@ -37,23 +37,22 @@ package sonia.scm.group;
import com.github.sdorra.ssp.PermissionObject;
import com.github.sdorra.ssp.StaticPermissions;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
import sonia.scm.BasicPropertiesAware;
import sonia.scm.ModelObject;
import sonia.scm.util.Util;
import sonia.scm.util.ValidationUtil;
//~--- JDK imports ------------------------------------------------------------
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
//~--- JDK imports ------------------------------------------------------------
/**
* Organizes users into a group for easier permissions management.
@@ -274,15 +273,15 @@ public class Group extends BasicPropertiesAware
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("name", name)
.add("description", description)
.add("members", members)
.add("type", type)
.add("creationDate", creationDate)
.add("lastModified", lastModified)
.add("properties", properties)
.toString();
return MoreObjects.toStringHelper(this)
.add("name", name)
.add("description", description)
.add("members", members)
.add("type", type)
.add("creationDate", creationDate)
.add("lastModified", lastModified)
.add("properties", properties)
.toString();
//J+
}

9
scm-core/src/main/java/sonia/scm/plugin/ClassElement.java
View File

@@ -33,6 +33,7 @@ package sonia.scm.plugin;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
@@ -117,10 +118,10 @@ public final class ClassElement
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("clazz", clazz)
.add("description", description)
.toString();
return MoreObjects.toStringHelper(this)
.add("clazz", clazz)
.add("description", description)
.toString();
//J+
}

13
scm-core/src/main/java/sonia/scm/plugin/ExtensionPointElement.java
View File

@@ -33,6 +33,7 @@ package sonia.scm.plugin;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
@@ -129,12 +130,12 @@ public final class ExtensionPointElement
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("class", clazz)
.add("description", description)
.add("multiple", multiple)
.add("autoBind", autoBind)
.toString();
return MoreObjects.toStringHelper(this)
.add("class", clazz)
.add("description", description)
.add("multiple", multiple)
.add("autoBind", autoBind)
.toString();
//J+
}

26
scm-core/src/main/java/sonia/scm/plugin/Plugin.java
View File

@@ -35,18 +35,14 @@ package sonia.scm.plugin;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
//~--- JDK imports ------------------------------------------------------------
import javax.xml.bind.annotation.*;
import java.util.Set;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
//~--- JDK imports ------------------------------------------------------------
/**
*
@@ -142,14 +138,14 @@ public final class Plugin extends ScmModule
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("scmVersion", scmVersion)
.add("condition", condition)
.add("information", information)
.add("resources", resources)
.add("childFirstClassLoader", childFirstClassLoader)
.add("dependencies", dependencies)
.toString();
return MoreObjects.toStringHelper(this)
.add("scmVersion", scmVersion)
.add("condition", condition)
.add("information", information)
.add("resources", resources)
.add("childFirstClassLoader", childFirstClassLoader)
.add("dependencies", dependencies)
.toString();
//J+
}

11
scm-core/src/main/java/sonia/scm/plugin/PluginCondition.java
View File

@@ -35,6 +35,7 @@ package sonia.scm.plugin;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import sonia.scm.PlatformType;
import sonia.scm.SCMContext;
@@ -157,11 +158,11 @@ public class PluginCondition implements Cloneable, Serializable
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("arch", arch)
.add("minVersion", minVersion)
.add("os", os)
.toString();
return MoreObjects.toStringHelper(this)
.add("arch", arch)
.add("minVersion", minVersion)
.add("os", os)
.toString();
//J+
}

43
scm-core/src/main/java/sonia/scm/plugin/PluginInformation.java
View File

@@ -37,24 +37,17 @@ package sonia.scm.plugin;
import com.github.sdorra.ssp.PermissionObject;
import com.github.sdorra.ssp.StaticPermissions;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import sonia.scm.Validateable;
import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------
import javax.xml.bind.annotation.*;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
//~--- JDK imports ------------------------------------------------------------
/**
*
@@ -180,21 +173,21 @@ public class PluginInformation
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("artifactId", artifactId)
.add("author", author)
.add("category", category)
.add("tags", tags)
.add("condition", condition)
.add("description", description)
.add("groupId", groupId)
.add("name", name)
.add("screenshots", screenshots)
.add("state", state)
.add("url", url)
.add("version", version)
.add("wiki", wiki)
.toString();
return MoreObjects.toStringHelper(this)
.add("artifactId", artifactId)
.add("author", author)
.add("category", category)
.add("tags", tags)
.add("condition", condition)
.add("description", description)
.add("groupId", groupId)
.add("name", name)
.add("screenshots", screenshots)
.add("state", state)
.add("url", url)
.add("version", version)
.add("wiki", wiki)
.toString();
//J+
}

11
scm-core/src/main/java/sonia/scm/plugin/PluginRepository.java
View File

@@ -35,12 +35,13 @@ package sonia.scm.plugin;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
import java.io.Serializable;
//~--- JDK imports ------------------------------------------------------------
/**
*
* @author Sebastian Sdorra
@@ -121,8 +122,10 @@ public class PluginRepository implements Serializable
@Override
public String toString()
{
return Objects.toStringHelper(this).add("id", id).add("url",
url).toString();
return MoreObjects.toStringHelper(this)
.add("id", id)
.add("url", url)
.toString();
}
//~--- get methods ----------------------------------------------------------

16
scm-core/src/main/java/sonia/scm/plugin/PluginResources.java
View File

@@ -35,15 +35,15 @@ package sonia.scm.plugin;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
import java.util.Set;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import java.util.Set;
//~--- JDK imports ------------------------------------------------------------
/**
*
@@ -124,10 +124,10 @@ public class PluginResources
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("scriptResources", scriptResources)
.add("stylesheetResources", stylesheetResources)
.toString();
return MoreObjects.toStringHelper(this)
.add("scriptResources", scriptResources)
.add("stylesheetResources", stylesheetResources)
.toString();
//J+
}

11
scm-core/src/main/java/sonia/scm/plugin/SubscriberElement.java
View File

@@ -33,6 +33,7 @@ package sonia.scm.plugin;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
@@ -126,11 +127,11 @@ public final class SubscriberElement
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("eventClass", eventClass)
.add("subscriberClass", subscriberClass)
.add("description", description)
.toString();
return MoreObjects.toStringHelper(this)
.add("eventClass", eventClass)
.add("subscriberClass", subscriberClass)
.add("description", description)
.toString();
//J+
}

17
scm-core/src/main/java/sonia/scm/repository/BlameLine.java
View File

@@ -35,6 +35,7 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
@@ -140,14 +141,14 @@ public class BlameLine implements Serializable
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("lineNumber", lineNumber)
.add("revision", revision)
.add("author", author)
.add("when", when)
.add("code", code)
.add("description", description)
.toString();
return MoreObjects.toStringHelper(this)
.add("lineNumber", lineNumber)
.add("revision", revision)
.add("author", author)
.add("when", when)
.add("code", code)
.add("description", description)
.toString();
//J+
}

19
scm-core/src/main/java/sonia/scm/repository/BlameResult.java
View File

@@ -35,21 +35,16 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
//~--- JDK imports ------------------------------------------------------------
import javax.xml.bind.annotation.*;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
//~--- JDK imports ------------------------------------------------------------
/**
* Changeset information by line for a given file.
@@ -163,10 +158,10 @@ public class BlameResult implements Serializable, Iterable<BlameLine>
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("total", total)
.add("blameLines", blameLines)
.toString();
return MoreObjects.toStringHelper(this)
.add("total", total)
.add("blameLines", blameLines)
.toString();
//J+
}

16
scm-core/src/main/java/sonia/scm/repository/Branch.java
View File

@@ -35,15 +35,15 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
import java.io.Serializable;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
//~--- JDK imports ------------------------------------------------------------
/**
* Represents a branch in a repository.
@@ -132,10 +132,10 @@ public final class Branch implements Serializable
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("name", name)
.add("revision", revision)
.toString();
return MoreObjects.toStringHelper(this)
.add("name", name)
.add("revision", revision)
.toString();
//J+
}

15
scm-core/src/main/java/sonia/scm/repository/Branches.java
View File

@@ -34,17 +34,18 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
//~--- JDK imports ------------------------------------------------------------
import java.util.Iterator;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.Iterator;
import java.util.List;
//~--- JDK imports ------------------------------------------------------------
/**
* Represents all branches of a repository.
@@ -148,9 +149,9 @@ public final class Branches implements Iterable<Branch>
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("branches", branches)
.toString();
return MoreObjects.toStringHelper(this)
.add("branches", branches)
.toString();
//J+
}

23
scm-core/src/main/java/sonia/scm/repository/BrowserResult.java
View File

@@ -35,20 +35,15 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
import javax.xml.bind.annotation.*;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
//~--- JDK imports ------------------------------------------------------------
/**
*
@@ -161,12 +156,12 @@ public class BrowserResult implements Iterable<FileObject>, Serializable
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("revision", revision)
.add("tag", tag)
.add("branch", branch)
.add("files", files)
.toString();
return MoreObjects.toStringHelper(this)
.add("revision", revision)
.add("tag", tag)
.add("branch", branch)
.add("files", files)
.toString();
//J+
}

19
scm-core/src/main/java/sonia/scm/repository/ChangesetPagingResult.java
View File

@@ -35,20 +35,15 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
import javax.xml.bind.annotation.*;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
//~--- JDK imports ------------------------------------------------------------
/**
* The changeset paging result is used to do a paging over the
@@ -156,10 +151,10 @@ public class ChangesetPagingResult implements Iterable<Changeset>, Serializable
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("changesets", changesets)
.add("total", total)
.toString();
return MoreObjects.toStringHelper(this)
.add("changesets", changesets)
.add("total", total)
.toString();
//J+
}

27
scm-core/src/main/java/sonia/scm/repository/FileObject.java
View File

@@ -35,18 +35,17 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import sonia.scm.LastModifiedAware;
//~--- JDK imports ------------------------------------------------------------
import java.io.Serializable;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
//~--- JDK imports ------------------------------------------------------------
/**
* The FileObject represents a file or a directory in a repository.
@@ -110,15 +109,15 @@ public class FileObject implements LastModifiedAware, Serializable
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("name", name)
.add("path", path)
.add("directory", directory)
.add("description", description)
.add("length", length)
.add("subRepository", subRepository)
.add("lastModified", lastModified)
.toString();
return MoreObjects.toStringHelper(this)
.add("name", name)
.add("path", path)
.add("directory", directory)
.add("description", description)
.add("length", length)
.add("subRepository", subRepository)
.add("lastModified", lastModified)
.toString();
//J+
}

13
scm-core/src/main/java/sonia/scm/repository/HealthCheckFailure.java
View File

@@ -33,6 +33,7 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
@@ -132,12 +133,12 @@ public final class HealthCheckFailure
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("id", id)
.add("summary", summary)
.add("url", url)
.add("description", description)
.toString();
return MoreObjects.toStringHelper(this)
.add("id", id)
.add("summary", summary)
.add("url", url)
.add("description", description)
.toString();
//J+
}

3
scm-core/src/main/java/sonia/scm/repository/HealthCheckResult.java
View File

@@ -33,6 +33,7 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@@ -182,7 +183,7 @@ public final class HealthCheckResult
@Override
public String toString()
{
return Objects.toStringHelper(this).add("failures", failures).toString();
return MoreObjects.toStringHelper(this).add("failures", failures).toString();
}
//~--- get methods ----------------------------------------------------------

19
scm-core/src/main/java/sonia/scm/repository/ImportResult.java
View File

@@ -33,18 +33,19 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import static com.google.common.base.Preconditions.*;
//~--- JDK imports ------------------------------------------------------------
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
import static com.google.common.base.Preconditions.checkNotNull;
//~--- JDK imports ------------------------------------------------------------
/**
* Import result of the {@link AdvancedImportHandler}.
@@ -130,10 +131,10 @@ public final class ImportResult
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("importedDirectories", importedDirectories)
.add("failedDirectories", failedDirectories)
.toString();
return MoreObjects.toStringHelper(this)
.add("importedDirectories", importedDirectories)
.add("failedDirectories", failedDirectories)
.toString();
//J+
}

19
scm-core/src/main/java/sonia/scm/repository/Permission.java
View File

@@ -35,17 +35,16 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import sonia.scm.security.PermissionObject;
//~--- JDK imports ------------------------------------------------------------
import java.io.Serializable;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
//~--- JDK imports ------------------------------------------------------------
/**
* Permissions controls the access to {@link Repository}.
@@ -163,11 +162,11 @@ public class Permission implements PermissionObject, Serializable
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("name", name)
.add("type", type)
.add("groupPermission", groupPermission)
.toString();
return MoreObjects.toStringHelper(this)
.add("name", name)
.add("type", type)
.add("groupPermission", groupPermission)
.toString();
//J+
}

39
scm-core/src/main/java/sonia/scm/repository/Repository.java
View File

@@ -37,26 +37,21 @@ package sonia.scm.repository;
import com.github.sdorra.ssp.PermissionObject;
import com.github.sdorra.ssp.StaticPermissions;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
import sonia.scm.BasicPropertiesAware;
import sonia.scm.ModelObject;
import sonia.scm.util.HttpUtil;
import sonia.scm.util.Util;
import sonia.scm.util.ValidationUtil;
//~--- JDK imports ------------------------------------------------------------
import javax.xml.bind.annotation.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
//~--- JDK imports ------------------------------------------------------------
/**
* Source code repository.
@@ -253,20 +248,20 @@ public class Repository extends BasicPropertiesAware implements ModelObject, Per
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("id", id)
.add("name", name)
.add("contact", contact)
.add("description", description)
.add("publicReadable", publicReadable)
.add("archived", archived)
.add("permissions", permissions)
.add("type", type)
.add("lastModified", lastModified)
.add("creationDate", creationDate)
.add("properties", properties)
.add("healthCheckFailures", healthCheckFailures)
.toString();
return MoreObjects.toStringHelper(this)
.add("id", id)
.add("name", name)
.add("contact", contact)
.add("description", description)
.add("publicReadable", publicReadable)
.add("archived", archived)
.add("permissions", permissions)
.add("type", type)
.add("lastModified", lastModified)
.add("creationDate", creationDate)
.add("properties", properties)
.add("healthCheckFailures", healthCheckFailures)
.toString();
//J+
}

18
scm-core/src/main/java/sonia/scm/repository/SubRepository.java
View File

@@ -35,16 +35,16 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
import java.io.Serializable;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
//~--- JDK imports ------------------------------------------------------------
/**
* @since 1.10
@@ -157,11 +157,11 @@ public class SubRepository implements Serializable
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("repositoryUrl", repositoryUrl)
.add("browserUrl", browserUrl)
.add("revision", revision)
.toString();
return MoreObjects.toStringHelper(this)
.add("repositoryUrl", repositoryUrl)
.add("browserUrl", browserUrl)
.add("revision", revision)
.toString();
//J+
}

9
scm-core/src/main/java/sonia/scm/repository/Tag.java
View File

@@ -34,6 +34,7 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
@@ -124,10 +125,10 @@ public final class Tag
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("name", name)
.add("revision", revision)
.toString();
return MoreObjects.toStringHelper(this)
.add("name", name)
.add("revision", revision)
.toString();
//J+
}

16
scm-core/src/main/java/sonia/scm/repository/Tags.java
View File

@@ -34,18 +34,18 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
//~--- JDK imports ------------------------------------------------------------
import java.util.Iterator;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.Iterator;
import java.util.List;
//~--- JDK imports ------------------------------------------------------------
/**
* Represents all tags of a repository.
@@ -138,9 +138,9 @@ public final class Tags implements Iterable<Tag>
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("tags", tags)
.toString();
return MoreObjects.toStringHelper(this)
.add("tags", tags)
.toString();
//J+
}

7
scm-core/src/main/java/sonia/scm/repository/api/AbstractBundleOrUnbundleCommandResponse.java
View File

@@ -33,6 +33,7 @@ package sonia.scm.repository.api;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -95,9 +96,9 @@ public abstract class AbstractBundleOrUnbundleCommandResponse
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("changesetCount", changesetCount)
.toString();
return MoreObjects.toStringHelper(this)
.add("changesetCount", changesetCount)
.toString();
//J+
}

15
scm-core/src/main/java/sonia/scm/repository/spi/BrowseCommandRequest.java
View File

@@ -35,6 +35,7 @@ package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -127,13 +128,13 @@ public final class BrowseCommandRequest extends FileBaseCommandRequest
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("path", getPath())
.add("revision", getRevision())
.add("recursive", recursive)
.add("disableLastCommit", disableLastCommit)
.add("disableSubRepositoryDetection", disableSubRepositoryDetection)
.toString();
return MoreObjects.toStringHelper(this)
.add("path", getPath())
.add("revision", getRevision())
.add("recursive", recursive)
.add("disableLastCommit", disableLastCommit)
.add("disableSubRepositoryDetection", disableSubRepositoryDetection)
.toString();
//J+
}

9
scm-core/src/main/java/sonia/scm/repository/spi/FileBaseCommandRequest.java
View File

@@ -35,6 +35,7 @@ package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
@@ -115,10 +116,10 @@ public abstract class FileBaseCommandRequest
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("path", path)
.add("revision", revision)
.toString();
return MoreObjects.toStringHelper(this)
.add("path", path)
.add("revision", revision)
.toString();
//J+
}

17
scm-core/src/main/java/sonia/scm/repository/spi/LogCommandRequest.java
View File

@@ -35,6 +35,7 @@ package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
@@ -125,14 +126,14 @@ public final class LogCommandRequest implements Serializable, Resetable
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("startChangeset", startChangeset)
.add("endChangeset", endChangeset)
.add("pagingStart", pagingStart)
.add("pagingLimit", pagingLimit)
.add("path", path)
.add("branch", branch)
.toString();
return MoreObjects.toStringHelper(this)
.add("startChangeset", startChangeset)
.add("endChangeset", endChangeset)
.add("pagingStart", pagingStart)
.add("pagingLimit", pagingLimit)
.add("path", path)
.add("branch", branch)
.toString();
//J+
}

11
scm-core/src/main/java/sonia/scm/repository/spi/PagedRemoteCommandRequest.java
View File

@@ -34,6 +34,7 @@ package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -84,11 +85,11 @@ public abstract class PagedRemoteCommandRequest extends RemoteCommandRequest
{
//J-
return Objects.toStringHelper(this)
.add("remoteURL", remoteRepository)
.add("pagingStart", pagingStart)
.add("pagingLimit", pagingLimit)
.toString();
return MoreObjects.toStringHelper(this)
.add("remoteURL", remoteRepository)
.add("pagingStart", pagingStart)
.add("pagingLimit", pagingLimit)
.toString();
//J+
}

9
scm-core/src/main/java/sonia/scm/repository/spi/RemoteCommandRequest.java
View File

@@ -35,6 +35,7 @@ package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import sonia.scm.repository.Repository;
@@ -101,10 +102,10 @@ public abstract class RemoteCommandRequest implements Resetable
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("remoteRepository", remoteRepository)
.add("remoteUrl", remoteUrl)
.toString();
return MoreObjects.toStringHelper(this)
.add("remoteRepository", remoteRepository)
.add("remoteUrl", remoteUrl)
.toString();
//J+
}

18
scm-core/src/main/java/sonia/scm/security/AssignedPermission.java
View File

@@ -34,16 +34,16 @@ package sonia.scm.security;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
import java.io.Serializable;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
//~--- JDK imports ------------------------------------------------------------
/**
* Permission object which is assigned to a specific user or group.
@@ -150,11 +150,11 @@ public class AssignedPermission implements PermissionObject, Serializable
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("name", name)
.add("groupPermisison", groupPermission)
.add("permission", permission)
.toString();
return MoreObjects.toStringHelper(this)
.add("name", name)
.add("groupPermisison", groupPermission)
.add("permission", permission)
.toString();
//J+
}

15
scm-core/src/main/java/sonia/scm/security/DAORealmHelper.java
View File

@@ -33,24 +33,15 @@ package sonia.scm.security;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSet.Builder;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.authc.DisabledAccountException;
import org.apache.shiro.authc.SimpleAuthenticationInfo;
import org.apache.shiro.authc.UnknownAccountException;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.authc.*;
import org.apache.shiro.authc.credential.CredentialsMatcher;
import org.apache.shiro.subject.SimplePrincipalCollection;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.group.Group;
import sonia.scm.group.GroupDAO;
import sonia.scm.group.GroupNames;
@@ -161,7 +152,7 @@ public final class DAORealmHelper
collection.add(principal, realm);
collection.add(user, realm);
collection.add(collectGroups(principal), realm);
collection.add(Objects.firstNonNull(scope, Scope.empty()), realm);
collection.add(MoreObjects.firstNonNull(scope, Scope.empty()), realm);
String creds = credentials;

18
scm-core/src/main/java/sonia/scm/security/PermissionDescriptor.java
View File

@@ -34,16 +34,16 @@ package sonia.scm.security;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
import java.io.Serializable;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
//~--- JDK imports ------------------------------------------------------------
/**
* Descriptor for available permission objects.
@@ -125,11 +125,11 @@ public class PermissionDescriptor implements Serializable
{
//J-
return Objects.toStringHelper(this)
.add("displayName", displayName)
.add("description", description)
.add("value", value)
.toString();
return MoreObjects.toStringHelper(this)
.add("displayName", displayName)
.add("description", description)
.add("value", value)
.toString();
//J+
}

9
scm-core/src/main/java/sonia/scm/security/RepositoryPermission.java
View File

@@ -35,6 +35,7 @@ package sonia.scm.security;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.apache.shiro.authz.Permission;
@@ -174,10 +175,10 @@ public final class RepositoryPermission
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("repositoryId", repositoryId)
.add("permissionType", permissionType)
.toString();
return MoreObjects.toStringHelper(this)
.add("repositoryId", repositoryId)
.add("permissionType", permissionType)
.toString();
//J+
}

16
scm-core/src/main/java/sonia/scm/security/StoredAssignedPermissionEvent.java
View File

@@ -34,14 +34,14 @@ package sonia.scm.security;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import sonia.scm.HandlerEventType;
//~--- JDK imports ------------------------------------------------------------
import sonia.scm.event.Event;
import java.io.Serializable;
import sonia.scm.event.Event;
//~--- JDK imports ------------------------------------------------------------
/**
* Event which is fired after a {@link StoredAssignedPermission} was added,
@@ -114,10 +114,10 @@ public final class StoredAssignedPermissionEvent implements Serializable
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("type", type)
.add("permission", permission)
.toString();
return MoreObjects.toStringHelper(this)
.add("type", type)
.add("permission", permission)
.toString();
//J+
}

33
scm-core/src/main/java/sonia/scm/user/User.java
View File

@@ -37,20 +37,19 @@ package sonia.scm.user;
import com.github.sdorra.ssp.PermissionObject;
import com.github.sdorra.ssp.StaticPermissions;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import sonia.scm.BasicPropertiesAware;
import sonia.scm.ModelObject;
import sonia.scm.util.Util;
import sonia.scm.util.ValidationUtil;
//~--- JDK imports ------------------------------------------------------------
import java.security.Principal;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import java.security.Principal;
//~--- JDK imports ------------------------------------------------------------
/**
*
@@ -259,18 +258,18 @@ public class User extends BasicPropertiesAware implements Principal, ModelObject
: "(not set)";
//J-
return Objects.toStringHelper(this)
.add("name", name)
.add("displayName",displayName)
.add("mail", mail)
.add("password", pwd)
.add("admin", admin)
.add("type", type)
.add("active", active)
.add("creationDate", creationDate)
.add("lastModified", lastModified)
.add("properties", properties)
.toString();
return MoreObjects.toStringHelper(this)
.add("name", name)
.add("displayName",displayName)
.add("mail", mail)
.add("password", pwd)
.add("admin", admin)
.add("type", type)
.add("active", active)
.add("creationDate", creationDate)
.add("lastModified", lastModified)
.add("properties", properties)
.toString();
//J+
}

15
scm-core/src/main/java/sonia/scm/util/HttpUtil.java
View File

@@ -37,29 +37,24 @@ package sonia.scm.util;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.CharMatcher;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects;
import com.google.common.base.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.config.ScmConfiguration;
//~--- JDK imports ------------------------------------------------------------
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
//~--- JDK imports ------------------------------------------------------------
/**
* Util method for the http protocol.
@@ -694,7 +689,7 @@ public final class HttpUtil
{
String value = request.getHeader(header);
return Objects.firstNonNull(value, defaultValue);
return MoreObjects.firstNonNull(value, defaultValue);
}
/**

17
scm-core/src/main/java/sonia/scm/web/UserAgent.java
View File

@@ -36,14 +36,15 @@ package sonia.scm.web;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Charsets;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import static com.google.common.base.Preconditions.*;
import java.nio.charset.Charset;
import static com.google.common.base.Preconditions.checkNotNull;
//~--- JDK imports ------------------------------------------------------------
import java.nio.charset.Charset;
/**
* The software agent that is acting on behalf of a user. The user agent
* represents a browser or one of the repository client (svn, git or hg).
@@ -124,11 +125,11 @@ public final class UserAgent
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("name", name)
.add("browser", browser)
.add("basicAuthenticationCharset", basicAuthenticationCharset)
.toString();
return MoreObjects.toStringHelper(this)
.add("name", name)
.add("browser", browser)
.add("basicAuthenticationCharset", basicAuthenticationCharset)
.toString();
//J+
}

27
scm-core/src/main/java/sonia/scm/web/proxy/ProxyConfiguration.java
View File

@@ -34,20 +34,15 @@ package sonia.scm.web.proxy;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
import javax.xml.bind.annotation.*;
import java.net.URL;
import java.util.Collections;
import java.util.Set;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
//~--- JDK imports ------------------------------------------------------------
/**
*
@@ -144,14 +139,14 @@ public class ProxyConfiguration
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("url", url)
.add("copyRequestHeaders", copyRequestHeaders)
.add("requestHeaderExcludes", requestHeaderExcludes)
.add("copyResponseHeaders", copyResponseHeaders)
.add("responseHeaderExcludes", responseHeaderExcludes)
.add("cacheEnabled", cacheEnabled)
.toString();
return MoreObjects.toStringHelper(this)
.add("url", url)
.add("copyRequestHeaders", copyRequestHeaders)
.add("requestHeaderExcludes", requestHeaderExcludes)
.add("copyResponseHeaders", copyResponseHeaders)
.add("responseHeaderExcludes", responseHeaderExcludes)
.add("cacheEnabled", cacheEnabled)
.toString();
//J+
}

4
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgHookManager.java
View File

@@ -36,7 +36,7 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.github.legman.Subscribe;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects;
import com.google.inject.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -263,7 +263,7 @@ public class HgHookManager
{
//J-
return HttpUtil.getUriWithoutEndSeperator(
Objects.firstNonNull(
MoreObjects.firstNonNull(
configuration.getBaseUrl(),
"http://localhost:8080/scm"
)

9
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgVersion.java
View File

@@ -34,6 +34,7 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
@@ -100,10 +101,10 @@ public class HgVersion
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("mercurial", mercurial)
.add("python", python)
.toString();
return MoreObjects.toStringHelper(this)
.add("mercurial", mercurial)
.add("python", python)
.toString();
//J+
}

9
scm-test/src/main/java/sonia/scm/repository/client/spi/CommitRequest.java
View File

@@ -34,6 +34,7 @@ package sonia.scm.repository.client.spi;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import sonia.scm.repository.Person;
@@ -105,10 +106,10 @@ public final class CommitRequest
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("author", author)
.add("message", message)
.toString();
return MoreObjects.toStringHelper(this)
.add("author", author)
.add("message", message)
.toString();
//J+
}

9
scm-test/src/main/java/sonia/scm/repository/client/spi/TagRequest.java
View File

@@ -34,6 +34,7 @@ package sonia.scm.repository.client.spi;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -103,10 +104,10 @@ public final class TagRequest
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("revision", revision)
.add("name", name)
.toString();
return MoreObjects.toStringHelper(this)
.add("revision", revision)
.add("name", name)
.toString();
//J+
}

9
scm-webapp/src/main/java/sonia/scm/ClassOverride.java
View File

@@ -34,6 +34,7 @@ package sonia.scm;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
@@ -97,10 +98,10 @@ public class ClassOverride implements Validateable
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("bind", bind)
.add("to", to)
.toString();
return MoreObjects.toStringHelper(this)
.add("bind", bind)
.add("to", to)
.toString();
//J+
}

16
scm-webapp/src/main/java/sonia/scm/api/rest/Permission.java
View File

@@ -34,15 +34,15 @@ package sonia.scm.api.rest;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
import java.io.Serializable;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
//~--- JDK imports ------------------------------------------------------------
/**
*
@@ -127,10 +127,10 @@ public class Permission implements Serializable
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("id", id)
.add("value", value)
.toString();
return MoreObjects.toStringHelper(this)
.add("id", id)
.add("value", value)
.toString();
//J+
}

9
scm-webapp/src/main/java/sonia/scm/api/rest/RestExceptionResult.java
View File

@@ -34,6 +34,7 @@ package sonia.scm.api.rest;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Throwables;
@@ -145,10 +146,10 @@ public class RestExceptionResult
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("message", message)
.add("stacktrace", stacktrace)
.toString();
return MoreObjects.toStringHelper(this)
.add("message", message)
.add("stacktrace", stacktrace)
.toString();
//J+
}

9
scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
View File

@@ -35,6 +35,7 @@ package sonia.scm.api.rest.resources;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
@@ -820,10 +821,10 @@ public class RepositoryImportResource
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("name", name)
.add("url", url)
.toString();
return MoreObjects.toStringHelper(this)
.add("name", name)
.add("url", url)
.toString();
//J+
}

3
scm-webapp/src/main/java/sonia/scm/cache/CacheConfigurations.java vendored
View File

@@ -45,6 +45,7 @@ import java.io.IOException;
import java.net.URL;
import java.util.Collections;
import java.util.Enumeration;
import java.util.Iterator;
@@ -109,7 +110,7 @@ public final class CacheConfigurations
if (it == null)
{
it = Iterators.emptyIterator();
it = Collections.emptyIterator();
}
return it;

35
scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheConfiguration.java vendored
View File

@@ -34,17 +34,16 @@ package sonia.scm.cache;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Objects;
//~--- JDK imports ------------------------------------------------------------
import java.io.Serializable;
import com.google.common.base.MoreObjects;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.io.Serializable;
//~--- JDK imports ------------------------------------------------------------
/**
*
@@ -70,19 +69,19 @@ public class GuavaCacheConfiguration implements Serializable
public String toString()
{
//J-
return Objects.toStringHelper(this)
.add("concurrencyLevel", concurrencyLevel)
.add("copyStrategy", copyStrategy)
.add("expireAfterAccess", expireAfterAccess)
.add("expireAfterWrite", expireAfterWrite)
.add("initialCapacity", initialCapacity)
.add("maximumSize", maximumSize)
.add("maximumWeight", maximumWeight)
.add("recordStats", recordStats)
.add("softValues", softValues)
.add("weakKeys", weakKeys)
.add("weakValues", weakValues)
.omitNullValues().toString();
return MoreObjects.toStringHelper(this)
.add("concurrencyLevel", concurrencyLevel)
.add("copyStrategy", copyStrategy)
.add("expireAfterAccess", expireAfterAccess)
.add("expireAfterWrite", expireAfterWrite)
.add("initialCapacity", initialCapacity)
.add("maximumSize", maximumSize)
.add("maximumWeight", maximumWeight)
.add("recordStats", recordStats)
.add("softValues", softValues)
.add("weakKeys", weakKeys)
.add("weakValues", weakValues)
.omitNullValues().toString();
//J+
}

19
scm-webapp/src/main/java/sonia/scm/security/ConfigurableLoginAttemptHandler.java
View File

@@ -30,12 +30,8 @@
*/
package sonia.scm.security;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects;
import com.google.inject.Inject;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
import javax.inject.Singleton;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
import org.apache.shiro.authc.AuthenticationToken;
@@ -44,6 +40,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.config.ScmConfiguration;
import javax.inject.Singleton;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
/**
* Configurable implementation of {@link LoginAttemptHandler}.
*
@@ -175,10 +176,10 @@ public class ConfigurableLoginAttemptHandler implements LoginAttemptHandler {
@Override
public String toString() {
return Objects.toStringHelper(this)
.add("counter", counter)
.add("lastAttempt", lastAttempt)
.toString();
return MoreObjects.toStringHelper(this)
.add("counter", counter)
.add("lastAttempt", lastAttempt)
.toString();
}
}

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);
}
}