Changing rule format in PyLint to CODE(codeName)

Author: tomasbjerre

build.gradle

@@ -63,7 +63,7 @@ repositories {
 }
 
 dependencies {
- compile 'se.bjurr.violations:violation-comments-lib:1.14'
+ compile 'se.bjurr.violations:violation-comments-lib:1.15'
  compile 'com.jayway.jsonpath:json-path:2.0.0'
 
  testCompile 'junit:junit:4.12'

src/main/java/se/bjurr/violations/comments/bitbucketserver/lib/client/BitbucketServerClient.java

@@ -17,6 +17,7 @@ public static void setBitbucketServerInvoker(BitbucketServerInvoker bitbucketSer
  }
 
  private final String bitbucketServerBaseUrl;
+
  private final String bitbucketServerPassword;
  private final String bitbucketServerProject;
  private final Integer bitbucketServerPullRequestId;
@@ -37,14 +38,29 @@ public BitbucketServerClient(String bitbucketServerBaseUrl, String bitbucketServ
   this.bitbucketServerUser = bitbucketServerUser;
  }
 
+ private String getBitbucketServerPulLRequestBase() {
+  return bitbucketServerBaseUrl + "/rest/api/1.0/projects/" + bitbucketServerProject + "/repos/" + bitbucketServerRepo
+    + "/pull-requests/" + bitbucketServerPullRequestId;
+ }
+
+ private <T> T invokeAndParse(String url, String jsonPath) {
+  String json = bitbucketServerInvoker.invokeUrl(url, BitbucketServerInvoker.Method.GET, null, bitbucketServerUser,
+    bitbucketServerPassword);
+  try {
+   return JsonPath.read(json, jsonPath);
+  } catch (Exception e) {
+   throw e;
+  }
+ }
+
  public List<String> pullRequestChanges() {
   return invokeAndParse(getBitbucketServerPulLRequestBase() + "/changes?limit=999999", "$..path.toString");
  }
 
  public void pullRequestComment(String message) {
   String postContent = "{ \"text\": \"" + safeJson(message) + "\"}";
   bitbucketServerInvoker.invokeUrl(getBitbucketServerPulLRequestBase() + "/comments",
-    BitbucketServerInvoker.Method.POST, postContent, this.bitbucketServerUser, this.bitbucketServerPassword);
+    BitbucketServerInvoker.Method.POST, postContent, bitbucketServerUser, bitbucketServerPassword);
  }
 
  public void pullRequestComment(String changedFile, int line, String message) {
@@ -54,38 +70,24 @@ public void pullRequestComment(String changedFile, int line, String message) {
   String postContent = "{ \"text\": \"" + safeJson(message) + "\", \"anchor\": { \"line\": " + line
     + ", \"lineType\": \"ADDED\", \"fileType\": \"TO\", \"path\": \"" + changedFile + "\" }}";
   bitbucketServerInvoker.invokeUrl(getBitbucketServerPulLRequestBase() + "/comments",
-    BitbucketServerInvoker.Method.POST, postContent, this.bitbucketServerUser, this.bitbucketServerPassword);
+    BitbucketServerInvoker.Method.POST, postContent, bitbucketServerUser, bitbucketServerPassword);
  }
 
  public List<BitbucketServerComment> pullRequestComments(String changedFile) {
-  List<LinkedHashMap<?, ?>> parsed = invokeAndParse(getBitbucketServerPulLRequestBase() + "/comments?path="
-    + changedFile + "&limit=999999", "$.values[*]");
+  List<LinkedHashMap<?, ?>> parsed = invokeAndParse(
+    getBitbucketServerPulLRequestBase() + "/comments?path=" + changedFile + "&limit=999999", "$.values[*]");
   return toBitbucketServerComments(parsed);
  }
 
  public void pullRequestRemoveComment(Integer commentId, Integer commentVersion) {
-  bitbucketServerInvoker.invokeUrl(getBitbucketServerPulLRequestBase() + "/comments/" + commentId + "?version="
-    + commentVersion, BitbucketServerInvoker.Method.DELETE, null, this.bitbucketServerUser,
-    this.bitbucketServerPassword);
+  bitbucketServerInvoker.invokeUrl(
+    getBitbucketServerPulLRequestBase() + "/comments/" + commentId + "?version=" + commentVersion,
+    BitbucketServerInvoker.Method.DELETE, null, bitbucketServerUser, bitbucketServerPassword);
  }
 
- private String getBitbucketServerPulLRequestBase() {
-  return this.bitbucketServerBaseUrl + "/rest/api/1.0/projects/" + this.bitbucketServerProject + "/repos/"
-    + this.bitbucketServerRepo + "/pull-requests/" + this.bitbucketServerPullRequestId;
- }
-
- private <T> T invokeAndParse(String url, String jsonPath) {
-  String json = bitbucketServerInvoker.invokeUrl(url, BitbucketServerInvoker.Method.GET, null,
-    this.bitbucketServerUser, this.bitbucketServerPassword);
-  try {
-   return JsonPath.read(json, jsonPath);
-  } catch (Exception e) {
-   throw e;
-  }
- }
-
- private String safeJson(String message) {
-  return message.replaceAll("\"", "").replaceAll("\n", "\\\\n");
+ @VisibleForTesting
+ String safeJson(String message) {
+  return message.replaceAll("\\\\", "\\\\\\\\").replaceAll("\"", "").replaceAll("\n", "\\\\n");
  }
 
  private List<BitbucketServerComment> toBitbucketServerComments(List<LinkedHashMap<?, ?>> parsed) {

src/test/java/se/bjurr/violations/comments/bitbucketserver/lib/client/BitbucketServerClientTest.java

@@ -13,44 +13,50 @@
 
 public class BitbucketServerClientTest {
  private String mockedJson = null;
- private final BitbucketServerClient sut = new BitbucketServerClient("bitbucketServerBaseUrl",
-   "bitbucketServerProject", "bitbucketServerRepo", 1, "bitbucketServerUser", "bitbucketServerPassword");
+ private final BitbucketServerClient sut = new BitbucketServerClient("bitbucketServerBaseUrl", "bitbucketServerProject",
+   "bitbucketServerRepo", 1, "bitbucketServerUser", "bitbucketServerPassword");
 
  @Before
  public void before() {
   BitbucketServerClient.setBitbucketServerInvoker(new BitbucketServerInvoker() {
    @Override
    public String invokeUrl(String url, Method method, String postContent, String bitbucketServerUser,
      String bitbucketServerPassword) {
-    return BitbucketServerClientTest.this.mockedJson;
+    return mockedJson;
    }
   });
  }
 
+ private void mockJson(String resourceName) {
+  try {
+   mockedJson = Resources.toString(Resources.getResource(resourceName), Charsets.UTF_8);
+  } catch (IOException e) {
+   e.printStackTrace();
+  }
+ }
+
  @Test
  public void testPullRequestChanges() {
   mockJson("pull-request-changes.json");
-  List<String> actual = this.sut.pullRequestChanges();
+  List<String> actual = sut.pullRequestChanges();
   assertThat(actual).isNotEmpty();
   assertThat(actual.get(0)).isEqualTo("basic_branching/file.txt");
  }
 
  @Test
  public void testPullRequestCommentsOnFile() {
   mockJson("pull-request-comments.json");
-  List<BitbucketServerComment> actual = this.sut.pullRequestComments("any/file.txt");
+  List<BitbucketServerComment> actual = sut.pullRequestComments("any/file.txt");
   assertThat(actual).isNotEmpty();
   assertThat(actual.get(0).getId()).isEqualTo(2);
   assertThat(actual.get(0).getText()).isEqualTo("in diff comment");
   assertThat(actual.get(0).getVersion()).isEqualTo(0);
  }
 
- private void mockJson(String resourceName) {
-  try {
-   this.mockedJson = Resources.toString(Resources.getResource(resourceName), Charsets.UTF_8);
-  } catch (IOException e) {
-   e.printStackTrace();
-  }
+ @Test
+ public void testSaveJson() {
+  assertThat(sut.safeJson("...ring: '\\s'. \nStr\"i\"ng ..."))//
+    .isEqualTo("...ring: '\\\\s'. \\nString ...");
  }
 
 }