From 4d8d39c4106158cd46d1f5200673fd8d75babde6 Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Tue, 1 Sep 2020 10:01:00 +0200 Subject: [PATCH 1/2] remove obsolete revision decoding to utf 8 --- CHANGELOG.md | 1 + .../java/sonia/scm/api/v2/resources/SourceRootResource.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5dec347ce..794efe3b8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - JWT token timeout is now handled properly ([#1297](https://github.com/scm-manager/scm-manager/pull/1297)) - Fix text-overflow in danger zone ([#1298](https://github.com/scm-manager/scm-manager/pull/1298)) - Fix plugin installation error if previously a plugin was installed with the same dependency which is still pending. ([#1300](https://github.com/scm-manager/scm-manager/pull/1300)) +- Remove obsolete revision encoding on sources ([#1315](https://github.com/scm-manager/scm-manager/pull/1315)) ## [2.4.0] - 2020-08-14 ### Added diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java index ddb88527a1..e8ef3c1bd9 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java @@ -88,7 +88,7 @@ public class SourceRootResource { browseCommand.setPath(path); browseCommand.setOffset(offset); if (revision != null && !revision.isEmpty()) { - browseCommand.setRevision(URLDecoder.decode(revision, "UTF-8")); + browseCommand.setRevision(revision); } BrowserResult browserResult = browseCommand.getBrowserResult(); From 543f6da382b5d9d1454b7933aaca34eeaac6336a Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 1 Sep 2020 10:46:08 +0200 Subject: [PATCH 2/2] Remove unused import --- .../java/sonia/scm/api/v2/resources/SourceRootResource.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java index e8ef3c1bd9..1256742804 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm.api.v2.resources; import io.swagger.v3.oas.annotations.Operation; @@ -40,7 +40,6 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import java.io.IOException; -import java.net.URLDecoder; import static sonia.scm.ContextEntry.ContextBuilder.entity; import static sonia.scm.NotFoundException.notFound;