From bbb1af1c622535c4c15ddb2a5629a9f6273c6378 Mon Sep 17 00:00:00 2001 From: Khashayar Etemadi Date: Fri, 23 Jul 2021 21:13:06 +0200 Subject: [PATCH] kafka 2142 fixes added to prs.json --- experimentation/prs.json | 178 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 177 insertions(+), 1 deletion(-) diff --git a/experimentation/prs.json b/experimentation/prs.json index 1f7c9889a..5072becee 100644 --- a/experimentation/prs.json +++ b/experimentation/prs.json @@ -1977,5 +1977,181 @@ "lastModified": "2021-07-23 20:33:33.931388", "isLegacyRecord": false } + }, + "kafka-ops/julie#206": { + "repoSlug": "kafka-ops/julie", + "prMetadata": { + "url": "https://github.com/kafka-ops/julie/pull/206", + "createdAt": "2021-02-11 17:36:13", + "closedAt": "2021-02-26 15:20:43", + "mergedAt": "None", + "state": "closed", + "isMerged": false, + "number": 206 + }, + "soraldStatistics": { + "repairs": [ + { + "nbPerformedRepairs": 14, + "ruleName": "InterruptedException", + "crashedRepairsLocations": [], + "nbCrashedRepairs": 0, + "ruleKey": "2142", + "performedRepairsLocations": [ + { + "endLine": 50, + "endColumn": 56, + "startColumn": 13, + "startLine": 50, + "filePath": "src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java", + "violationSpecifier": "2142:src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java:50:13:50:56" + }, + { + "endLine": 79, + "endColumn": 57, + "startColumn": 13, + "startLine": 79, + "filePath": "src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java", + "violationSpecifier": "2142:src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java:79:13:79:57" + }, + { + "endLine": 90, + "endColumn": 56, + "startColumn": 13, + "startLine": 90, + "filePath": "src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java", + "violationSpecifier": "2142:src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java:90:13:90:56" + }, + { + "endLine": 101, + "endColumn": 56, + "startColumn": 13, + "startLine": 101, + "filePath": "src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java", + "violationSpecifier": "2142:src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java:101:13:101:56" + }, + { + "endLine": 138, + "endColumn": 56, + "startColumn": 13, + "startLine": 138, + "filePath": "src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java", + "violationSpecifier": "2142:src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java:138:13:138:56" + }, + { + "endLine": 194, + "endColumn": 56, + "startColumn": 13, + "startLine": 194, + "filePath": "src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java", + "violationSpecifier": "2142:src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java:194:13:194:56" + }, + { + "endLine": 208, + "endColumn": 56, + "startColumn": 13, + "startLine": 208, + "filePath": "src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java", + "violationSpecifier": "2142:src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java:208:13:208:56" + }, + { + "endLine": 241, + "endColumn": 56, + "startColumn": 13, + "startLine": 241, + "filePath": "src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java", + "violationSpecifier": "2142:src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java:241:13:241:56" + }, + { + "endLine": 31, + "endColumn": 49, + "startColumn": 13, + "startLine": 31, + "filePath": "src/main/java/com/purbon/kafka/topology/api/ccloud/CCloudCLI.java", + "violationSpecifier": "2142:src/main/java/com/purbon/kafka/topology/api/ccloud/CCloudCLI.java:31:13:31:49" + }, + { + "endLine": 42, + "endColumn": 49, + "startColumn": 13, + "startLine": 42, + "filePath": "src/main/java/com/purbon/kafka/topology/api/ccloud/CCloudCLI.java", + "violationSpecifier": "2142:src/main/java/com/purbon/kafka/topology/api/ccloud/CCloudCLI.java:42:13:42:49" + }, + { + "endLine": 63, + "endColumn": 49, + "startColumn": 13, + "startLine": 63, + "filePath": "src/main/java/com/purbon/kafka/topology/api/ccloud/CCloudCLI.java", + "violationSpecifier": "2142:src/main/java/com/purbon/kafka/topology/api/ccloud/CCloudCLI.java:63:13:63:49" + }, + { + "endLine": 74, + "endColumn": 49, + "startColumn": 13, + "startLine": 74, + "filePath": "src/main/java/com/purbon/kafka/topology/api/ccloud/CCloudCLI.java", + "violationSpecifier": "2142:src/main/java/com/purbon/kafka/topology/api/ccloud/CCloudCLI.java:74:13:74:49" + }, + { + "endLine": 165, + "endColumn": 41, + "startColumn": 13, + "startLine": 165, + "filePath": "src/test/java/com/purbon/kafka/topology/integration/containerutils/AlternativeKafkaContainer.java", + "violationSpecifier": "2142:src/test/java/com/purbon/kafka/topology/integration/containerutils/AlternativeKafkaContainer.java:165:13:165:41" + }, + { + "endLine": 60, + "endColumn": 62, + "startColumn": 13, + "startLine": 60, + "filePath": "src/test/java/com/purbon/kafka/topology/integration/containerutils/TestProducer.java", + "violationSpecifier": "2142:src/test/java/com/purbon/kafka/topology/integration/containerutils/TestProducer.java:60:13:60:62" + } + ], + "nbViolationsBefore": 14, + "nbViolationsAfter": 0 + } + ], + "executionInfo": { + "soraldVersion": "commit: b42fe921", + "javaVersion": "11.0.11", + "originalArgs": [ + "repair", + "--original-files-path", + "kafka-original/", + "--file-output-strategy", + "IN_PLACE", + "--stats-output-file", + "stats.json", + "--rule-keys", + "2142" + ] + }, + "totalTimeMs": 11434, + "repairTimeMs": 498, + "startTimeMs": 1627066384328, + "crashes": [], + "endTimeMs": 1627066395762, + "parseTimeMs": 4980 + }, + "diffs": { + "initial": "diff --git a/src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java b/src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java\nindex 41c2dfb..b23d807 100644\n--- a/src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java\n+++ b/src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java\n@@ -47,9 +47,10 @@ public class TopologyBuilderAdminClient {\n Set listOfTopics;\n try {\n listOfTopics = adminClient.listTopics(options).names().get();\n- } catch (InterruptedException | ExecutionException e) {\n+ } catch (java.lang.InterruptedException | java.util.concurrent.ExecutionException e) {\n LOGGER.error(e);\n throw new IOException(e);\n+ Thread.currentThread().interrupt();\n }\n return listOfTopics;\n }\n@@ -76,9 +77,10 @@ public class TopologyBuilderAdminClient {\n public void updateTopicConfig(Topic topic, String fullTopicName) throws IOException {\n try {\n updateTopicConfigPostAK23(topic, fullTopicName);\n- } catch (InterruptedException | ExecutionException ex) {\n+ } catch (java.lang.InterruptedException | java.util.concurrent.ExecutionException ex) {\n LOGGER.error(ex);\n throw new IOException(ex);\n+ Thread.currentThread().interrupt();\n }\n }\n \n@@ -87,9 +89,10 @@ public class TopologyBuilderAdminClient {\n Map results =\n adminClient.describeTopics(Collections.singletonList(topic)).all().get();\n return results.get(topic).partitions().size();\n- } catch (InterruptedException | ExecutionException e) {\n+ } catch (java.lang.InterruptedException | java.util.concurrent.ExecutionException e) {\n LOGGER.error(e);\n throw new IOException(e);\n+ Thread.currentThread().interrupt();\n }\n }\n \n@@ -98,9 +101,10 @@ public class TopologyBuilderAdminClient {\n map.put(topicName, NewPartitions.increaseTo(topic.partitionsCount()));\n try {\n adminClient.createPartitions(map).all().get();\n- } catch (InterruptedException | ExecutionException e) {\n+ } catch (java.lang.InterruptedException | java.util.concurrent.ExecutionException e) {\n LOGGER.error(e);\n throw new IOException(e);\n+ Thread.currentThread().interrupt();\n }\n }\n \n@@ -135,9 +139,10 @@ public class TopologyBuilderAdminClient {\n private void clearAcls(Collection filters) throws IOException {\n try {\n adminClient.deleteAcls(filters).all().get();\n- } catch (ExecutionException | InterruptedException e) {\n+ } catch (java.util.concurrent.ExecutionException | java.lang.InterruptedException e) {\n LOGGER.error(e);\n throw new IOException(e);\n+ Thread.currentThread().interrupt();\n }\n }\n \n@@ -191,9 +196,10 @@ public class TopologyBuilderAdminClient {\n createAllTopics(newTopics);\n } catch (TopicExistsException ex) {\n LOGGER.info(ex);\n- } catch (ExecutionException | InterruptedException e) {\n+ } catch (java.util.concurrent.ExecutionException | java.lang.InterruptedException e) {\n LOGGER.error(e);\n throw new IOException(e);\n+ Thread.currentThread().interrupt();\n }\n }\n \n@@ -205,9 +211,10 @@ public class TopologyBuilderAdminClient {\n public void deleteTopics(Collection topics) throws IOException {\n try {\n adminClient.deleteTopics(topics).all().get();\n- } catch (ExecutionException | InterruptedException e) {\n+ } catch (java.util.concurrent.ExecutionException | java.lang.InterruptedException e) {\n LOGGER.error(e);\n throw new IOException(e);\n+ Thread.currentThread().interrupt();\n }\n }\n \n@@ -238,8 +245,9 @@ public class TopologyBuilderAdminClient {\n } catch (InvalidConfigurationException ex) {\n LOGGER.error(ex);\n throw ex;\n- } catch (ExecutionException | InterruptedException e) {\n+ } catch (java.util.concurrent.ExecutionException | java.lang.InterruptedException e) {\n LOGGER.error(e);\n+ Thread.currentThread().interrupt();\n }\n }\n \ndiff --git a/src/main/java/com/purbon/kafka/topology/api/ccloud/CCloudCLI.java b/src/main/java/com/purbon/kafka/topology/api/ccloud/CCloudCLI.java\nindex 1c0dd47..af90dd5 100644\n--- a/src/main/java/com/purbon/kafka/topology/api/ccloud/CCloudCLI.java\n+++ b/src/main/java/com/purbon/kafka/topology/api/ccloud/CCloudCLI.java\n@@ -28,9 +28,10 @@ public class CCloudCLI {\n stdout = run(cmd);\n ServiceAccount[] items = mapper.readValue(stdout, ServiceAccount[].class);\n return Arrays.stream(items).collect(Collectors.toMap(ServiceAccount::getName, i -> i));\n- } catch (IOException | InterruptedException e) {\n+ } catch (java.io.IOException | java.lang.InterruptedException e) {\n handleError(stdout, e);\n return null;\n+ Thread.currentThread().interrupt();\n }\n }\n \n@@ -39,8 +40,9 @@ public class CCloudCLI {\n String stdout = \"\";\n try {\n stdout = run(cmd);\n- } catch (IOException | InterruptedException e) {\n+ } catch (java.io.IOException | java.lang.InterruptedException e) {\n handleError(stdout, e);\n+ Thread.currentThread().interrupt();\n }\n }\n \n@@ -60,8 +62,9 @@ public class CCloudCLI {\n try {\n stdout = run(cmd);\n sa = mapper.readValue(stdout, ServiceAccount.class);\n- } catch (IOException | InterruptedException e) {\n+ } catch (java.io.IOException | java.lang.InterruptedException e) {\n handleError(stdout, e);\n+ Thread.currentThread().interrupt();\n }\n return sa;\n }\n@@ -71,8 +74,9 @@ public class CCloudCLI {\n String stdout = \"\";\n try {\n stdout = run(cmd);\n- } catch (IOException | InterruptedException e) {\n+ } catch (java.io.IOException | java.lang.InterruptedException e) {\n handleError(stdout, e);\n+ Thread.currentThread().interrupt();\n }\n }\n \ndiff --git a/src/test/java/com/purbon/kafka/topology/integration/containerutils/AlternativeKafkaContainer.java b/src/test/java/com/purbon/kafka/topology/integration/containerutils/AlternativeKafkaContainer.java\nindex bfcdd1d..2def8ba 100644\n--- a/src/test/java/com/purbon/kafka/topology/integration/containerutils/AlternativeKafkaContainer.java\n+++ b/src/test/java/com/purbon/kafka/topology/integration/containerutils/AlternativeKafkaContainer.java\n@@ -164,6 +164,7 @@ public class AlternativeKafkaContainer extends GenericContainer i));\n- } catch (IOException | InterruptedException e) {\n+ } catch (IOException e) {\n handleError(stdout, e);\n return null;\n+ } catch (InterruptedException e) {\n+ handleError(stdout, e);\n+ Thread.currentThread().interrupt();\n+ return null;\n }\n }\n \n@@ -39,29 +43,35 @@ public void setEnvironment(String environment) throws IOException {\n String stdout = \"\";\n try {\n stdout = run(cmd);\n- } catch (IOException | InterruptedException e) {\n+ } catch (IOException e) {\n+ handleError(stdout, e);\n+ } catch (InterruptedException e) {\n handleError(stdout, e);\n+ Thread.currentThread().interrupt();\n }\n }\n \n public ServiceAccount newServiceAccount(String name, String description) throws IOException {\n List cmd =\n- Arrays.asList(\n- \"ccloud\",\n- \"service-account\",\n- \"create\",\n- name,\n- \"--description\",\n- description,\n- \"--output\",\n- \"json\");\n+ Arrays.asList(\n+\t \"ccloud\",\n+\t \"service-account\",\n+\t \"create\",\n+\t name,\n+\t \"--description\",\n+\t description,\n+\t \"--output\",\n+\t \"json\");\n String stdout = \"\";\n ServiceAccount sa = null;\n try {\n stdout = run(cmd);\n sa = mapper.readValue(stdout, ServiceAccount.class);\n- } catch (IOException | InterruptedException e) {\n+ } catch (IOException e) {\n handleError(stdout, e);\n+ } catch (InterruptedException e) {\n+ handleError(stdout, e);\n+ Thread.currentThread().interrupt();\n }\n return sa;\n }\n@@ -71,8 +81,11 @@ public void deleteServiceAccount(int id) throws IOException {\n String stdout = \"\";\n try {\n stdout = run(cmd);\n- } catch (IOException | InterruptedException e) {\n+ } catch (IOException e) {\n+ handleError(stdout, e);\n+ } catch (InterruptedException e) {\n handleError(stdout, e);\n+ Thread.currentThread().interrupt();\n }\n }\n \n" + }, + "manualEdits": [ + { + "type": "afterOpenPr", + "reason": "removing fixes in unchanged files and adding indentation", + "diff": "diff --git a/src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java b/src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java\nindex b23d807..41c2dfb 100644\n--- a/src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java\n+++ b/src/main/java/com/purbon/kafka/topology/api/adminclient/TopologyBuilderAdminClient.java\n@@ -47,10 +47,9 @@ public class TopologyBuilderAdminClient {\n Set listOfTopics;\n try {\n listOfTopics = adminClient.listTopics(options).names().get();\n- } catch (java.lang.InterruptedException | java.util.concurrent.ExecutionException e) {\n+ } catch (InterruptedException | ExecutionException e) {\n LOGGER.error(e);\n throw new IOException(e);\n- Thread.currentThread().interrupt();\n }\n return listOfTopics;\n }\n@@ -77,10 +76,9 @@ public class TopologyBuilderAdminClient {\n public void updateTopicConfig(Topic topic, String fullTopicName) throws IOException {\n try {\n updateTopicConfigPostAK23(topic, fullTopicName);\n- } catch (java.lang.InterruptedException | java.util.concurrent.ExecutionException ex) {\n+ } catch (InterruptedException | ExecutionException ex) {\n LOGGER.error(ex);\n throw new IOException(ex);\n- Thread.currentThread().interrupt();\n }\n }\n \n@@ -89,10 +87,9 @@ public class TopologyBuilderAdminClient {\n Map results =\n adminClient.describeTopics(Collections.singletonList(topic)).all().get();\n return results.get(topic).partitions().size();\n- } catch (java.lang.InterruptedException | java.util.concurrent.ExecutionException e) {\n+ } catch (InterruptedException | ExecutionException e) {\n LOGGER.error(e);\n throw new IOException(e);\n- Thread.currentThread().interrupt();\n }\n }\n \n@@ -101,10 +98,9 @@ public class TopologyBuilderAdminClient {\n map.put(topicName, NewPartitions.increaseTo(topic.partitionsCount()));\n try {\n adminClient.createPartitions(map).all().get();\n- } catch (java.lang.InterruptedException | java.util.concurrent.ExecutionException e) {\n+ } catch (InterruptedException | ExecutionException e) {\n LOGGER.error(e);\n throw new IOException(e);\n- Thread.currentThread().interrupt();\n }\n }\n \n@@ -139,10 +135,9 @@ public class TopologyBuilderAdminClient {\n private void clearAcls(Collection filters) throws IOException {\n try {\n adminClient.deleteAcls(filters).all().get();\n- } catch (java.util.concurrent.ExecutionException | java.lang.InterruptedException e) {\n+ } catch (ExecutionException | InterruptedException e) {\n LOGGER.error(e);\n throw new IOException(e);\n- Thread.currentThread().interrupt();\n }\n }\n \n@@ -196,10 +191,9 @@ public class TopologyBuilderAdminClient {\n createAllTopics(newTopics);\n } catch (TopicExistsException ex) {\n LOGGER.info(ex);\n- } catch (java.util.concurrent.ExecutionException | java.lang.InterruptedException e) {\n+ } catch (ExecutionException | InterruptedException e) {\n LOGGER.error(e);\n throw new IOException(e);\n- Thread.currentThread().interrupt();\n }\n }\n \n@@ -211,10 +205,9 @@ public class TopologyBuilderAdminClient {\n public void deleteTopics(Collection topics) throws IOException {\n try {\n adminClient.deleteTopics(topics).all().get();\n- } catch (java.util.concurrent.ExecutionException | java.lang.InterruptedException e) {\n+ } catch (ExecutionException | InterruptedException e) {\n LOGGER.error(e);\n throw new IOException(e);\n- Thread.currentThread().interrupt();\n }\n }\n \n@@ -245,9 +238,8 @@ public class TopologyBuilderAdminClient {\n } catch (InvalidConfigurationException ex) {\n LOGGER.error(ex);\n throw ex;\n- } catch (java.util.concurrent.ExecutionException | java.lang.InterruptedException e) {\n+ } catch (ExecutionException | InterruptedException e) {\n LOGGER.error(e);\n- Thread.currentThread().interrupt();\n }\n }\n \ndiff --git a/src/main/java/com/purbon/kafka/topology/api/ccloud/CCloudCLI.java b/src/main/java/com/purbon/kafka/topology/api/ccloud/CCloudCLI.java\nindex af90dd5..f2b8176 100644\n--- a/src/main/java/com/purbon/kafka/topology/api/ccloud/CCloudCLI.java\n+++ b/src/main/java/com/purbon/kafka/topology/api/ccloud/CCloudCLI.java\n@@ -28,10 +28,13 @@ public class CCloudCLI {\n stdout = run(cmd);\n ServiceAccount[] items = mapper.readValue(stdout, ServiceAccount[].class);\n return Arrays.stream(items).collect(Collectors.toMap(ServiceAccount::getName, i -> i));\n- } catch (java.io.IOException | java.lang.InterruptedException e) {\n+ } catch (IOException e) {\n handleError(stdout, e);\n return null;\n+ } catch (InterruptedException e) {\n+ handleError(stdout, e);\n Thread.currentThread().interrupt();\n+ return null;\n }\n }\n \n@@ -40,7 +43,9 @@ public class CCloudCLI {\n String stdout = \"\";\n try {\n stdout = run(cmd);\n- } catch (java.io.IOException | java.lang.InterruptedException e) {\n+ } catch (IOException e) {\n+ handleError(stdout, e);\n+ } catch (InterruptedException e) {\n handleError(stdout, e);\n Thread.currentThread().interrupt();\n }\n@@ -48,21 +53,23 @@ public class CCloudCLI {\n \n public ServiceAccount newServiceAccount(String name, String description) throws IOException {\n List cmd =\n- Arrays.asList(\n- \"ccloud\",\n- \"service-account\",\n- \"create\",\n- name,\n- \"--description\",\n- description,\n- \"--output\",\n- \"json\");\n+ Arrays.asList(\n+\t \"ccloud\",\n+\t \"service-account\",\n+\t \"create\",\n+\t name,\n+\t \"--description\",\n+\t description,\n+\t \"--output\",\n+\t \"json\");\n String stdout = \"\";\n ServiceAccount sa = null;\n try {\n stdout = run(cmd);\n sa = mapper.readValue(stdout, ServiceAccount.class);\n- } catch (java.io.IOException | java.lang.InterruptedException e) {\n+ } catch (IOException e) {\n+ handleError(stdout, e);\n+ } catch (InterruptedException e) {\n handleError(stdout, e);\n Thread.currentThread().interrupt();\n }\n@@ -74,7 +81,9 @@ public class CCloudCLI {\n String stdout = \"\";\n try {\n stdout = run(cmd);\n- } catch (java.io.IOException | java.lang.InterruptedException e) {\n+ } catch (IOException e) {\n+ handleError(stdout, e);\n+ } catch (InterruptedException e) {\n handleError(stdout, e);\n Thread.currentThread().interrupt();\n }\ndiff --git a/src/test/java/com/purbon/kafka/topology/integration/containerutils/AlternativeKafkaContainer.java b/src/test/java/com/purbon/kafka/topology/integration/containerutils/AlternativeKafkaContainer.java\nindex 2def8ba..bfcdd1d 100644\n--- a/src/test/java/com/purbon/kafka/topology/integration/containerutils/AlternativeKafkaContainer.java\n+++ b/src/test/java/com/purbon/kafka/topology/integration/containerutils/AlternativeKafkaContainer.java\n@@ -164,7 +164,6 @@ public class AlternativeKafkaContainer extends GenericContainer