Simplify detokenisation logic by removing long-disused project dir marker

Author: jshiell

src/main/java/org/infernus/idea/checkstyle/util/ProjectFilePaths.java

@@ -9,14 +9,11 @@
 import java.io.File;
 import java.util.function.Function;
 
-import static java.util.Arrays.asList;
-
 public class ProjectFilePaths {
 
     private static final Logger LOG = Logger.getInstance(ProjectFilePaths.class);
 
     private static final String IDEA_PROJECT_DIR = "$PROJECT_DIR$";
-    private static final String LEGACY_PROJECT_DIR = "$PRJ_DIR$";
 
     private final ProjectPaths projectPaths;
     private final Project project;
@@ -114,18 +111,16 @@ public String detokenise(@Nullable final String tokenisedPath) {
     }
 
     private String replaceProjectToken(final String path) {
-        for (String projectDirToken : asList(IDEA_PROJECT_DIR, LEGACY_PROJECT_DIR)) {
-            int prefixLocation = path.indexOf(projectDirToken);
-            if (prefixLocation >= 0) {
-                final File projectPath = projectPath();
-                if (projectPath != null) {
-                    final String projectRelativePath = toSystemPath(path.substring(prefixLocation + projectDirToken.length()));
-                    final String completePath = projectPath + File.separator + projectRelativePath;
-                    return absolutePathOf.apply(new File(completePath));
-
-                } else {
-                    LOG.warn("Could not detokenise path as project dir is unset: " + path);
-                }
+        int prefixLocation = path.indexOf(IDEA_PROJECT_DIR);
+        if (prefixLocation >= 0) {
+            final File projectPath = projectPath();
+            if (projectPath != null) {
+                final String projectRelativePath = toSystemPath(path.substring(prefixLocation + IDEA_PROJECT_DIR.length()));
+                final String completePath = projectPath + File.separator + projectRelativePath;
+                return absolutePathOf.apply(new File(completePath));
+
+            } else {
+                LOG.warn("Could not detokenise path as project dir is unset: " + path);
             }
         }
         return null;

src/test/java/org/infernus/idea/checkstyle/util/ProjectFilePathsTest.java

@@ -61,12 +61,6 @@ public void aUnixLocationContainingTheProjectPathTokenShouldBeDetokenisedCorrect
                 is(equalTo(UNIX_PROJECT_BASE_PATH + "/a-path/to/checkstyle.xml")));
     }
 
-    @Test
-    public void aUnixLocationContainingTheLegacyProjectPathTokenShouldBeDetokenisedCorrectly() {
-        assertThat(underTest.detokenise("$PRJ_DIR$/a-path/to/checkstyle.xml"),
-                is(equalTo(UNIX_PROJECT_BASE_PATH + "/a-path/to/checkstyle.xml")));
-    }
-
     @Test
     public void directoryTraversalsInARelativePathShouldNotBeAlteredByDetokenisation() {
         assertThat(underTest.detokenise(UNIX_PROJECT_BASE_PATH + "/../a-path/to/checkstyle.xml"),