Skip to content

Commit f22a07c

Browse files
Ivan-VeselovIvan-Veselov
committed
Adapt validator to new log format.
1 parent c251852 commit f22a07c

File tree

9 files changed

+13
-11
lines changed

9 files changed

+13
-11
lines changed

‎validator/src/main/java/org/jetbrains/research/groups/ml_methods/refactoring/validation/InputSessionValidator.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ private enum LogEntryFields {
2323
}
2424

2525
private final String OUR_RECORDER_ID = "architecture-reloaded-plugin";
26-
private final String ACCEPTED_TAG = "acceptedRefactoringsFeatures";
26+
private final String UNCHECKED_TAG = "uncheckedRefactoringsFeatures";
2727
private final String REJECTED_TAG = "rejectedRefactoringsFeatures";
28+
private final String APPLIED_TAG = "appliedRefactoringsFeatures";
2829

2930

3031
/** Takes empty @link{SessionValidationResult} which will be populated in @link{#validate} */
@@ -91,9 +92,10 @@ private boolean isCorrectPayload(String payload) {
9192
Gson gson = new Gson();
9293
LinkedTreeMap json = gson.fromJson(payload, LinkedTreeMap.class);
9394
if (json.isEmpty()
94-
|| !json.containsKey(ACCEPTED_TAG)
95+
|| !json.containsKey(UNCHECKED_TAG)
9596
|| !json.containsKey(REJECTED_TAG)
96-
|| ((ArrayList) json.get(ACCEPTED_TAG)).isEmpty()) {
97+
|| !json.containsKey(APPLIED_TAG)
98+
|| ((ArrayList) json.get(APPLIED_TAG)).isEmpty()) {
9799
return false;
98100
}
99101
} catch (JsonSyntaxException ignored) {

‎validator/src/test/resources/logs/correctTest1.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1533549775051 architecture-reloaded-plugin 1 078ae3d4-10fd-40fb-988b-dc8387d6b07a 60b9fa5d-8004-4aea-9ca4-36b35862cb17 -1 action {"acceptedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":2.0},{"metricId":"NumExceptionsThrown","metricValue":0.0},{"metricId":"NumLoops","metricValue":1.0},{"metricId":"LinesOfCodeMethod","metricValue":43.0},{"metricId":"NumLocalVars","metricValue":4.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]},{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":0.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":1.0},{"metricId":"NumExceptionsThrown","metricValue":1.0},{"metricId":"NumLoops","metricValue":0.0},{"metricId":"LinesOfCodeMethod","metricValue":34.0},{"metricId":"NumLocalVars","metricValue":3.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":15.0}]}],"rejectedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":1.0},{"metricId":"NumExceptionsThrown","metricValue":1.0},{"metricId":"NumLoops","metricValue":0.0},{"metricId":"LinesOfCodeMethod","metricValue":21.0},{"metricId":"NumLocalVars","metricValue":0.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]}]}
1+
1533549775051 architecture-reloaded-plugin 1 078ae3d4-10fd-40fb-988b-dc8387d6b07a 60b9fa5d-8004-4aea-9ca4-36b35862cb17 -1 action {"uncheckedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":1.0},{"metricId":"NumExceptionsThrown","metricValue":1.0},{"metricId":"NumLoops","metricValue":0.0},{"metricId":"LinesOfCodeMethod","metricValue":21.0},{"metricId":"NumLocalVars","metricValue":0.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]}],"rejectedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":1.0},{"metricId":"NumExceptionsThrown","metricValue":1.0},{"metricId":"NumLoops","metricValue":0.0},{"metricId":"LinesOfCodeMethod","metricValue":21.0},{"metricId":"NumLocalVars","metricValue":0.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]}],"appliedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":2.0},{"metricId":"NumExceptionsThrown","metricValue":0.0},{"metricId":"NumLoops","metricValue":1.0},{"metricId":"LinesOfCodeMethod","metricValue":43.0},{"metricId":"NumLocalVars","metricValue":4.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]},{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":0.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":1.0},{"metricId":"NumExceptionsThrown","metricValue":1.0},{"metricId":"NumLoops","metricValue":0.0},{"metricId":"LinesOfCodeMethod","metricValue":34.0},{"metricId":"NumLocalVars","metricValue":3.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":15.0}]}]}

‎validator/src/test/resources/logs/correctTest2.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1533549775051 architecture-reloaded-plugin 1 078ae3d4-10fd-40fb-988b-dc8387d6b07a 60b9fa5d-8004-4aea-9ca4-36b35862cb17 -1 action {"acceptedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":2.0},{"metricId":"NumExceptionsThrown","metricValue":0.0},{"metricId":"NumLoops","metricValue":1.0},{"metricId":"LinesOfCodeMethod","metricValue":43.0},{"metricId":"NumLocalVars","metricValue":4.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]}],"rejectedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":1.0},{"metricId":"NumExceptionsThrown","metricValue":1.0},{"metricId":"NumLoops","metricValue":0.0},{"metricId":"LinesOfCodeMethod","metricValue":21.0},{"metricId":"NumLocalVars","metricValue":0.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]}]}
1+
1533549775051 architecture-reloaded-plugin 1 078ae3d4-10fd-40fb-988b-dc8387d6b07a 60b9fa5d-8004-4aea-9ca4-36b35862cb17 -1 action {"uncheckedRefactoringsFeatures":[],"rejectedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":1.0},{"metricId":"NumExceptionsThrown","metricValue":1.0},{"metricId":"NumLoops","metricValue":0.0},{"metricId":"LinesOfCodeMethod","metricValue":21.0},{"metricId":"NumLocalVars","metricValue":0.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]}],"appliedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":2.0},{"metricId":"NumExceptionsThrown","metricValue":0.0},{"metricId":"NumLoops","metricValue":1.0},{"metricId":"LinesOfCodeMethod","metricValue":43.0},{"metricId":"NumLocalVars","metricValue":4.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]}]}

‎validator/src/test/resources/logs/correctTest3.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1533549775051 architecture-reloaded-plugin 1 078ae3d4-10fd-40fb-988b-dc8387d6b07a 60b9fa5d-8004-4aea-9ca4-36b35862cb17 -1 action {"acceptedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":2.0},{"metricId":"NumExceptionsThrown","metricValue":0.0},{"metricId":"NumLoops","metricValue":1.0},{"metricId":"LinesOfCodeMethod","metricValue":43.0},{"metricId":"NumLocalVars","metricValue":4.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]}],"rejectedRefactoringsFeatures":[]}
1+
1533549775051 architecture-reloaded-plugin 1 078ae3d4-10fd-40fb-988b-dc8387d6b07a 60b9fa5d-8004-4aea-9ca4-36b35862cb17 -1 action {"uncheckedRefactoringsFeatures":[],"rejectedRefactoringsFeatures":[],"appliedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":2.0},{"metricId":"NumExceptionsThrown","metricValue":0.0},{"metricId":"NumLoops","metricValue":1.0},{"metricId":"LinesOfCodeMethod","metricValue":43.0},{"metricId":"NumLocalVars","metricValue":4.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]}]}

‎validator/src/test/resources/logs/incorrectTest1.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1533549775051.12 architecture-reloaded-plugin 1 078ae3d4-10fd-40fb-988b-dc8387d6b07a 60b9fa5d-8004-4aea-9ca4-36b35862cb17 -1 action {"acceptedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":2.0},{"metricId":"NumExceptionsThrown","metricValue":0.0},{"metricId":"NumLoops","metricValue":1.0},{"metricId":"LinesOfCodeMethod","metricValue":43.0},{"metricId":"NumLocalVars","metricValue":4.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]}],"rejectedRefactoringsFeatures":[]}
1+
1533549775051.12 architecture-reloaded-plugin 1 078ae3d4-10fd-40fb-988b-dc8387d6b07a 60b9fa5d-8004-4aea-9ca4-36b35862cb17 -1 action {"uncheckedRefactoringsFeatures":[],"rejectedRefactoringsFeatures":[],"appliedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":2.0},{"metricId":"NumExceptionsThrown","metricValue":0.0},{"metricId":"NumLoops","metricValue":1.0},{"metricId":"LinesOfCodeMethod","metricValue":43.0},{"metricId":"NumLocalVars","metricValue":4.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]}]}

‎validator/src/test/resources/logs/incorrectTest2.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1533549775051 architecture-reloaded-plugin 1 078ae3d4-10fd-988b-dc8387d6b07a 60b9fa5d-8004-4aea-9ca4-36b35862cb17 -1 action {"acceptedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":2.0},{"metricId":"NumExceptionsThrown","metricValue":0.0},{"metricId":"NumLoops","metricValue":1.0},{"metricId":"LinesOfCodeMethod","metricValue":43.0},{"metricId":"NumLocalVars","metricValue":4.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]}],"rejectedRefactoringsFeatures":[]}
1+
1533549775051 architecture-reloaded-plugin 1 078ae3d4-10fd-988b-dc8387d6b07a 60b9fa5d-8004-4aea-9ca4-36b35862cb17 -1 action {"uncheckedRefactoringsFeatures":[],"rejectedRefactoringsFeatures":[],"appliedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":2.0},{"metricId":"NumExceptionsThrown","metricValue":0.0},{"metricId":"NumLoops","metricValue":1.0},{"metricId":"LinesOfCodeMethod","metricValue":43.0},{"metricId":"NumLocalVars","metricValue":4.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]}]}

‎validator/src/test/resources/logs/incorrectTest3.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1533549775051 architecture-reloaded-plugin 1 078ae3d4-10fd-40fb-988b-dc8387d6b07a 60b9fa5d-8004-9ca4-36b35862cb17 -1 action {"acceptedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":2.0},{"metricId":"NumExceptionsThrown","metricValue":0.0},{"metricId":"NumLoops","metricValue":1.0},{"metricId":"LinesOfCodeMethod","metricValue":43.0},{"metricId":"NumLocalVars","metricValue":4.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]}],"rejectedRefactoringsFeatures":[]}
1+
1533549775051 architecture-reloaded-plugin 1 078ae3d4-10fd-40fb-988b-dc8387d6b07a 60b9fa5d-8004-9ca4-36b35862cb17 -1 action {"uncheckedRefactoringsFeatures":[],"rejectedRefactoringsFeatures":[],"appliedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":2.0},{"metricId":"NumExceptionsThrown","metricValue":0.0},{"metricId":"NumLoops","metricValue":1.0},{"metricId":"LinesOfCodeMethod","metricValue":43.0},{"metricId":"NumLocalVars","metricValue":4.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]}]}

‎validator/src/test/resources/logs/incorrectTest4.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1533549775051 architecture-reloaded-plugin 1 078ae3d4-10fd-40fb-988b-dc8387d6b07a 60b9fa5d-8004-4aea-9ca4-36b35862cb17 -1 action {"acceptedRefactoringsFeatures":[],"rejectedRefactoringsFeatures":[]}
1+
1533549775051 architecture-reloaded-plugin 1 078ae3d4-10fd-40fb-988b-dc8387d6b07a 60b9fa5d-8004-4aea-9ca4-36b35862cb17 -1 action {"uncheckedRefactoringsFeatures":[],"rejectedRefactoringsFeatures":[],"appliedRefactoringsFeatures":[]}

‎validator/src/test/resources/logs/incorrectTest5.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1533549775051 architecture-reloaded-plugin 1 078ae3d4-10fd-40fb-988b-dc8387d6b07a 60b9fa5d-8004-4aea-9ca4-36b35862cb17 -1 action {"acceptedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":2.0},{"metricId":"NumExceptionsThrown","metricValue":0.0},{"metricId":"NumLoops","metricValue":1.0},{"metricId":"LinesOfCodeMethod","metricValue":43.0},{"metricId":"NumLocalVars","metricValue":4.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]}]}
1+
1533549775051 architecture-reloaded-plugin 1 078ae3d4-10fd-40fb-988b-dc8387d6b07a 60b9fa5d-8004-4aea-9ca4-36b35862cb17 -1 action {"appliedRefactoringsFeatures":[{"targetClassMetricsValues":[],"sourceClassMetricsValues":[],"methodMetricsValues":[{"metricId":"IsStaticMethod","metricValue":1.0},{"metricId":"IsPrivateMethod","metricValue":0.0},{"metricId":"FormalParametersCountMethod","metricValue":2.0},{"metricId":"NumExceptionsThrown","metricValue":0.0},{"metricId":"NumLoops","metricValue":1.0},{"metricId":"LinesOfCodeMethod","metricValue":43.0},{"metricId":"NumLocalVars","metricValue":4.0},{"metricId":"NumAsserts","metricValue":0.0},{"metricId":"NameLenMethod","metricValue":7.0}]}]}

0 commit comments

Comments
 (0)