From 5f94e4430800f6e1352733a3ff684e959341984d Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 7 Dec 2017 10:18:21 +0900 Subject: [PATCH] LfsServerText: Fix formatting of invalidPathInfo message The message is formatted as: Invalid pathInfo '/abc' does not match '/{SHA-256}' but should be: Invalid pathInfo: '/abc' does not match '/{SHA-256}' (i.e. including a colon) to be consistent with other messages. Change-Id: Ic38aa7d33dd02d7954b95c331a73919a90c69991 Signed-off-by: David Pursehouse --- .../tst/org/eclipse/jgit/lfs/server/fs/DownloadTest.java | 2 +- .../eclipse/jgit/lfs/server/internal/LfsServerText.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/DownloadTest.java b/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/DownloadTest.java index 33ba2de803..a38bf6a808 100644 --- a/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/DownloadTest.java +++ b/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/DownloadTest.java @@ -81,7 +81,7 @@ public class DownloadTest extends LfsServerTest { String id = putContent(TEXT).name().substring(0, 60); Path f = Paths.get(getTempDirectory().toString(), "download"); String error = String.format( - "Invalid pathInfo '/%s' does not match '/{SHA-256}'", id); + "Invalid pathInfo: '/%s' does not match '/{SHA-256}'", id); exception.expect(RuntimeException.class); exception.expectMessage( formatErrorMessage(SC_UNPROCESSABLE_ENTITY, error)); diff --git a/org.eclipse.jgit.lfs.server/resources/org/eclipse/jgit/lfs/server/internal/LfsServerText.properties b/org.eclipse.jgit.lfs.server/resources/org/eclipse/jgit/lfs/server/internal/LfsServerText.properties index b2b487eefc..659714528c 100644 --- a/org.eclipse.jgit.lfs.server/resources/org/eclipse/jgit/lfs/server/internal/LfsServerText.properties +++ b/org.eclipse.jgit.lfs.server/resources/org/eclipse/jgit/lfs/server/internal/LfsServerText.properties @@ -1,5 +1,5 @@ failedToCalcSignature=Failed to calculate a request signature: {0} -invalidPathInfo=Invalid pathInfo ''{0}'' does not match ''/'{'SHA-256'}''' +invalidPathInfo=Invalid pathInfo: ''{0}'' does not match ''/'{'SHA-256'}''' objectNotFound=Object ''{0}'' not found undefinedS3AccessKey=S3 configuration: 'accessKey' is undefined undefinedS3Bucket=S3 configuration: 'bucket' is undefined -- 2.39.5