svn commit: r1882015 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java

[an...@apache.org]

Author: angela
Date: Fri Sep 25 13:15:07 2020
New Revision: 1882015

URL: http://svn.apache.org/viewvc?rev=1882015&view=rev
Log:
OAK-9235 : GlobPattern: fix sonar findings

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java?rev=1882015&r1=1882014&r2=1882015&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java Fri Sep 25 13:15:07 2020
@@ -175,14 +175,14 @@ final class GlobPattern implements Restr
     /**
      * Base for PathPattern and WildcardPattern
      */
-    private abstract class Pattern {
-        abstract boolean matches(@NotNull String toMatch);
+    private interface Pattern {
+        boolean matches(@NotNull String toMatch);
     }
 
     /**
      * Path pattern: The restriction is missing or doesn't contain any wildcard character.
      */
-    private final class PathPattern extends Pattern {
+    private final class PathPattern implements Pattern {
 
         private final String patternStr;
 
@@ -191,7 +191,7 @@ final class GlobPattern implements Restr
         }
 
         @Override
-        boolean matches(@NotNull String toMatch) {
+        public boolean matches(@NotNull String toMatch) {
             if (patternStr.isEmpty()) {
                 return path.equals(toMatch);
             } else {
@@ -205,7 +205,7 @@ final class GlobPattern implements Restr
     /**
      * Wildcard pattern: The specified restriction contains one or more wildcard character(s).
      */
-    private final class WildcardPattern extends Pattern {
+    private final class WildcardPattern implements Pattern {
 
         private final String patternEnd;
         private final char[] patternChars;
@@ -216,7 +216,7 @@ final class GlobPattern implements Restr
         }
 
         @Override
-        boolean matches(@NotNull String toMatch) {
+        public boolean matches(@NotNull String toMatch) {
             if (patternEnd != null && !toMatch.endsWith(patternEnd)) {
                 // shortcut: verify if end of pattern matches end of toMatch
                 return false;
@@ -276,10 +276,10 @@ final class GlobPattern implements Restr
                     }
                 }
 
-                // not yet reached end of patter nor string and not wildcard character.
+                // not yet reached end string and not wildcard character.
                 // the 2 strings don't match in case the characters at the current
                 // position are not the same.
-                if (pOff < pLength && sOff < sLength) {
+                if (sOff < sLength) {
                     if (pattern[pOff] != s[sOff]) {
                         return false;
                     }