From 280c64ba357440ea13eb4ccefc62984f4567e49f Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Mon, 14 Aug 2017 18:55:39 +0300 Subject: [PATCH] Polish --- .../springframework/web/util/pattern/PathPattern.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java index c442696945..3e54c740f1 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java @@ -706,8 +706,13 @@ public class PathPattern implements Comparable { Comparator.nullsLast( Comparator. comparingInt(p -> p.isCatchAll() ? 1 : 0) - .thenComparingInt(p -> p.isCatchAll() ? -1 * p.getNormalizedLength() : 0) - .thenComparing(PathPattern::getScore) - .thenComparingInt(p -> -1 * p.getNormalizedLength()) + .thenComparingInt(p -> p.isCatchAll() ? scoreByNormalizedLength(p) : 0) + .thenComparingInt(PathPattern::getScore) + .thenComparingInt(PathPattern::scoreByNormalizedLength) ); + + private static int scoreByNormalizedLength(PathPattern pattern) { + return -pattern.getNormalizedLength(); + } + }