From 31ca22fe47cfd914b7a277011da5ad054760c8d6 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Fri, 13 Jul 2018 11:49:37 +0200
Subject: [PATCH] removed X suffix

---
 .../repository/xml/XmlRepositoryDatabase.java | 20 +++++-----
 .../xml/XmlRepositoryMapAdapter.java          | 40 +++----------------
 2 files changed, 16 insertions(+), 44 deletions(-)

diff --git a/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java b/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java
index 1c82b07f50..93be611213 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java
@@ -63,25 +63,25 @@ public class XmlRepositoryDatabase implements XmlDatabase<Repository>
     lastModified = c;
   }
 
-  static String createKeyX(NamespaceAndName namespaceAndName)
+  static String createKey(NamespaceAndName namespaceAndName)
   {
     return namespaceAndName.getNamespace() + ":" + namespaceAndName.getName();
   }
 
-  static String createKeyX(Repository repository)
+  static String createKey(Repository repository)
   {
-    return createKeyX(repository.getNamespaceAndName());
+    return createKey(repository.getNamespaceAndName());
   }
 
   @Override
   public void add(Repository repository)
   {
-    repositoryMap.put(createKeyX(repository), repository);
+    repositoryMap.put(createKey(repository), repository);
   }
 
   public boolean contains(NamespaceAndName namespaceAndName)
   {
-    return repositoryMap.containsKey(createKeyX(namespaceAndName));
+    return repositoryMap.containsKey(createKey(namespaceAndName));
   }
 
   @Override
@@ -92,12 +92,12 @@ public class XmlRepositoryDatabase implements XmlDatabase<Repository>
 
   public boolean contains(Repository repository)
   {
-    return repositoryMap.containsKey(createKeyX(repository));
+    return repositoryMap.containsKey(createKey(repository));
   }
 
-  public void removeX(Repository repository)
+  public void remove(Repository repository)
   {
-    repositoryMap.remove(createKeyX(repository));
+    repositoryMap.remove(createKey(repository));
   }
 
   @Override
@@ -105,7 +105,7 @@ public class XmlRepositoryDatabase implements XmlDatabase<Repository>
   {
     Repository r = get(id);
 
-    removeX(r);
+    remove(r);
 
     return r;
   }
@@ -120,7 +120,7 @@ public class XmlRepositoryDatabase implements XmlDatabase<Repository>
 
   public Repository get(NamespaceAndName namespaceAndName)
   {
-    return repositoryMap.get(createKeyX(namespaceAndName));
+    return repositoryMap.get(createKey(namespaceAndName));
   }
 
   /**
diff --git a/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryMapAdapter.java b/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryMapAdapter.java
index 4706c64f62..4d6686dfb2 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryMapAdapter.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryMapAdapter.java
@@ -47,47 +47,19 @@ import java.util.Map;
  *
  * @author Sebastian Sdorra
  */
-public class XmlRepositoryMapAdapter
-        extends XmlAdapter<XmlRepositoryList, Map<String, Repository>>
-{
+public class XmlRepositoryMapAdapter extends XmlAdapter<XmlRepositoryList, Map<String, Repository>> {
 
-  /**
-   * Method description
-   *
-   *
-   * @param repositoryMap
-   *
-   * @return
-   *
-   * @throws Exception
-   */
   @Override
-  public XmlRepositoryList marshal(Map<String, Repository> repositoryMap)
-          throws Exception
-  {
+  public XmlRepositoryList marshal(Map<String, Repository> repositoryMap) {
     return new XmlRepositoryList(repositoryMap);
   }
 
-  /**
-   * Method description
-   *
-   *
-   * @param repositories
-   *
-   * @return
-   *
-   * @throws Exception
-   */
   @Override
-  public Map<String, Repository> unmarshal(XmlRepositoryList repositories)
-          throws Exception
-  {
-    Map<String, Repository> repositoryMap = new LinkedHashMap<String,
-                                              Repository>();
+  public Map<String, Repository> unmarshal(XmlRepositoryList repositories) {
+    Map<String, Repository> repositoryMap = new LinkedHashMap<>();
 
-    for (Repository repository : repositories)
-    {
-      repositoryMap.put(XmlRepositoryDatabase.createKeyX(repository),
+    for (Repository repository : repositories) {
+      repositoryMap.put(XmlRepositoryDatabase.createKey(repository),
                         repository);
     }