Start entity types with a capital char

scm-core/src/main/java/sonia/scm/repository/spi/HookEventFacade.java

@@ -77,7 +77,7 @@ public final class HookEventFacade
     Repository repository = repositoryManagerProvider.get().get(id);
     if (repository == null)
     {
-      throw notFound(entity("repository", id));
+      throw notFound(entity("Repository", id));
     }
     return handle(repository);
   }

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java

@@ -205,7 +205,7 @@ public final class GitUtil
     }
     catch (GitAPIException ex)
     {
-      throw new InternalRepositoryException(ContextEntry.ContextBuilder.entity("remote", directory.toString()).in(remoteRepository), "could not fetch", ex);
+      throw new InternalRepositoryException(ContextEntry.ContextBuilder.entity("Remote", directory.toString()).in(remoteRepository), "could not fetch", ex);
     }
   }
 

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBlameCommand.java

@@ -110,7 +110,7 @@ public class GitBlameCommand extends AbstractGitCommand implements BlameCommand
 
       if (gitBlameResult == null)
       {
-        throw new InternalRepositoryException(entity("path", request.getPath()).in(repository),
+        throw new InternalRepositoryException(entity("Path", request.getPath()).in(repository),
             "could not create blame result for path");
       }
 

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java

@@ -358,7 +358,7 @@ public class GitBrowseCommand extends AbstractGitCommand
       }
     }
 
-    throw new NotFoundException("file", request.getPath());
+    throw notFound(entity("File", request.getPath()).in("Revision", revId.getName()).in(this.repository));
   }
 
   @SuppressWarnings("unchecked")

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java

@@ -74,7 +74,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
   private ObjectId resolveRevisionOrThrowNotFound(Repository repository, String revision) throws IOException {
     ObjectId resolved = repository.resolve(revision);
     if (resolved == null) {
-      throw notFound(entity("revision", revision).in(context.getRepository()));
+      throw notFound(entity("Revision", revision).in(context.getRepository()));
     } else {
       return resolved;
     }
@@ -125,7 +125,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
         clone.checkout().setStartPoint(targetRevision.getName()).setName(target).setCreateBranch(true).call();
       } catch (RefNotFoundException e) {
         logger.debug("could not checkout target branch {} for merge as local branch", target, e);
-        throw notFound(entity("revision", target).in(context.getRepository()));
+        throw notFound(entity("Revision", target).in(context.getRepository()));
       } catch (GitAPIException e) {
         throw new InternalRepositoryException(context.getRepository(), "could not checkout target branch for merge as local branch: " + target, e);
       }

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java

@@ -349,7 +349,7 @@ public class HgRepositoryHandler
     try {
       return new INIConfigurationReader().read(new File(directory, PATH_HGRC)).getSection(CONFIG_SECTION_SCMM).getParameter(CONFIG_KEY_REPOSITORY_ID);
     } catch (IOException e) {
-      throw new InternalRepositoryException(ContextEntry.ContextBuilder.entity("directory", directory.toString()), "could not read scm configuration file", e);
+      throw new InternalRepositoryException(ContextEntry.ContextBuilder.entity("Directory", directory.toString()), "could not read scm configuration file", e);
     }
   }
 

scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java

@@ -234,7 +234,7 @@ public class SvnRepositoryHandler
     try {
       return new INIConfigurationReader().read(new File(directory, CONFIG_FILE_NAME)).getSection(CONFIG_SECTION_SCMM).getParameter(CONFIG_KEY_REPOSITORY_ID);
     } catch (IOException e) {
-      throw new InternalRepositoryException(ContextEntry.ContextBuilder.entity("directory", directory.toString()), "could not read scm configuration file", e);
+      throw new InternalRepositoryException(ContextEntry.ContextBuilder.entity("Directory", directory.toString()), "could not read scm configuration file", e);
     }
   }
 }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileHistoryRootResource.java

@@ -85,7 +85,7 @@ public class FileHistoryRootResource {
       } else {
         String message = String.format("for the revision %s and the file %s there are no changesets", revision, path);
         log.error(message);
-        throw notFound(entity("path", path).in("revision", revision).in(namespaceAndName));
+        throw notFound(entity("Path", path).in("revision", revision).in(namespaceAndName));
       }
     }
   }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryPermissionRootResource.java

@@ -258,7 +258,7 @@ public class RepositoryPermissionRootResource {
    */
   private void checkPermissionAlreadyExists(RepositoryPermissionDto permission, Repository repository) {
     if (isPermissionExist(permission, repository)) {
-      throw alreadyExists(entity("permission", permission.getName()).in(repository));
+      throw alreadyExists(entity("Permission", permission.getName()).in(repository));
     }
   }
 

scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java

@@ -65,7 +65,7 @@ public class SourceRootResource {
       if (browserResult != null) {
         return Response.ok(browserResultToFileObjectDtoMapper.map(browserResult, namespaceAndName)).build();
       } else {
-        throw notFound(entity("sources", path).in(namespaceAndName));
+        throw notFound(entity("Source", path).in(namespaceAndName));
       }
     }
   }

scm-webapp/src/main/java/sonia/scm/security/PermissionAssigner.java

@@ -77,7 +77,7 @@ public class PermissionAssigner {
   private Predicate<PermissionDescriptor> permissionExists(Collection<PermissionDescriptor> availablePermissions, Collection<AssignedPermission> existingPermissions) {
     return p -> {
       if (!availablePermissions.contains(p) && existingPermissions.stream().map(AssignedPermission::getPermission).noneMatch(e -> e.equals(p))) {
-        throw NotFoundException.notFound(ContextEntry.ContextBuilder.entity("permission", p.getValue()));
+        throw NotFoundException.notFound(ContextEntry.ContextBuilder.entity("Permission", p.getValue()));
       }
       return true;
     };

scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java

@@ -403,7 +403,7 @@ public class DefaultUserManager extends AbstractUserManager
     User user = get((String) SecurityUtils.getSubject().getPrincipals().getPrimaryPrincipal());
 
     if (!user.getPassword().equals(oldPassword)) {
-      throw new InvalidPasswordException(ContextEntry.ContextBuilder.entity("passwordChange", "-").in(User.class, user.getName()));
+      throw new InvalidPasswordException(ContextEntry.ContextBuilder.entity("PasswordChange", "-").in(User.class, user.getName()));
     }
 
     user.setPassword(newPassword);
@@ -422,7 +422,7 @@ public class DefaultUserManager extends AbstractUserManager
       throw new NotFoundException(User.class, userId);
     }
     if (!isTypeDefault(user)) {
-      throw new ChangePasswordNotAllowedException(ContextEntry.ContextBuilder.entity("passwordChange", "-").in(User.class, user.getName()), user.getType());
+      throw new ChangePasswordNotAllowedException(ContextEntry.ContextBuilder.entity("PasswordChange", "-").in(User.class, user.getName()), user.getType());
     }
     user.setPassword(newPassword);
     this.modify(user);