Diktat rule configs #1686

nulls · 2023-06-07T14:20:07Z

What's done:

introduced DiktatRuleConfigReader

It closes #1695

### What's done: - main runner It closes #1685

diktat-cli/src/main/kotlin/org/cqfn/diktat/DiktatMainRunner.kt

github-actions · 2023-06-07T14:29:00Z

JUnit Tests (macOS, EnricoMi/publish-unit-test-result-action@v2)

  162 files ±0   162 suites ±0 10m 23s ⏱️ - 1m 35s
1 371 tests ±0 1 335 ✔️ ±0 36 💤 ±0 0 ❌ ±0
2 750 runs ±0 2 714 ✔️ ±0 36 💤 ±0 0 ❌ ±0

Results for commit 04294d8. ± Comparison against base commit d7d39f0.

This pull request removes 1 and adds 1 tests. Note that renamed tests count towards both.

com.saveourtool.diktat.util.DiktatRuleSetProviderTest ‑ check DiktatRuleSetProviderTest contain all rules()

com.saveourtool.diktat.util.DiktatRuleSetFactoryImplTest ‑ check DiktatRuleSetFactoryImpl contain all rules()

♻️ This comment has been updated with latest results.

github-actions · 2023-06-07T14:30:30Z

JUnit Tests (Windows, EnricoMi/publish-unit-test-result-action@v2)

  162 files ±0   162 suites ±0 9m 40s ⏱️ - 2m 2s
1 371 tests ±0 1 354 ✔️ ±0 17 💤 ±0 0 ❌ ±0
2 750 runs ±0 2 733 ✔️ ±0 17 💤 ±0 0 ❌ ±0

Results for commit 04294d8. ± Comparison against base commit d7d39f0.

This pull request removes 1 and adds 1 tests. Note that renamed tests count towards both.

com.saveourtool.diktat.util.DiktatRuleSetProviderTest ‑ check DiktatRuleSetProviderTest contain all rules()

com.saveourtool.diktat.util.DiktatRuleSetFactoryImplTest ‑ check DiktatRuleSetFactoryImpl contain all rules()

♻️ This comment has been updated with latest results.

codecov · 2023-06-07T14:31:19Z

Codecov Report

Merging #1686 (ec0c24c) into master (4f23c71) will decrease coverage by 0.37%.
The diff coverage is 62.25%.

@@             Coverage Diff              @@
##             master    #1686      +/-   ##
============================================
- Coverage     78.72%   78.35%   -0.37%     
+ Complexity     2317     2312       -5     
============================================
  Files           124      124              
  Lines          8151     8142       -9     
  Branches       2062     2060       -2     
============================================
- Hits           6417     6380      -37     
- Misses          826      858      +32     
+ Partials        908      904       -4

Impacted Files	Coverage Δ
...c/main/kotlin/com/saveourtool/diktat/DiktatMain.kt	`0.00% <0.00%> (ø)`
...lin/com/saveourtool/diktat/cli/DiktatProperties.kt	`0.00% <0.00%> (ø)`
.../saveourtool/diktat/plugin/maven/DiktatBaseMojo.kt	`0.00% <0.00%> (ø)`
.../com/saveourtool/diktat/plugin/maven/DiktatMojo.kt	`0.00% <ø> (ø)`
...diktat/ruleset/rules/chapter2/kdoc/KdocComments.kt	`89.95% <ø> (ø)`
.../ruleset/rules/chapter3/files/FileStructureRule.kt	`85.35% <ø> (ø)`
...diktat/ruleset/rules/DiktatRuleSetProviderV3Spi.kt	`0.00% <0.00%> (ø)`
...diktat/ruleset/rules/DiktatRuleConfigReaderImpl.kt	`60.00% <60.00%> (ø)`
...iktat/common/config/reader/AbstractConfigReader.kt	`75.00% <75.00%> (ø)`
...ol/diktat/common/config/rules/RulesConfigReader.kt	`34.14% <100.00%> (-5.14%)`	⬇️
... and 2 more

diktat-api/src/main/kotlin/org/cqfn/diktat/DiktatRunnerFactory.kt

diktat-common/src/main/kotlin/org/cqfn/diktat/common/config/rules/RulesConfigReader.kt

...-common/src/main/kotlin/org/cqfn/diktat/common/config/reader/AbstractResourceConfigReader.kt

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/DiktatRuleConfigReaderImpl.kt

diktat-ruleset/src/main/kotlin/org/cqfn/diktat/ruleset/rules/DiktatRuleSetProviderV3Spi.kt

...-common/src/main/kotlin/org/cqfn/diktat/common/config/reader/AbstractResourceConfigReader.kt

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/DiktatRuleConfigReaderImpl.kt

diktat-common/src/main/kotlin/org/cqfn/diktat/common/config/rules/RulesConfigReader.kt

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/DiktatRuleConfigReaderImpl.kt

orchestr7 · 2023-06-09T06:20:29Z

Unfortunately you will need to wait until I will finish all the work related to the renaming of packages.

But my real question is the following: is it possible to create a small runner of diktat without this huge change with existing code? You told me “everything is already done” in CliRunner and you can call API directly, but the only problem is that there is no chance to provide external configuration of diktat-analysis directly to runner (only possible with a file).

diktat-api/src/main/kotlin/org/cqfn/diktat/api/DiktatRuleConfig.kt

diktat-api/src/main/kotlin/org/cqfn/diktat/api/DiktatRuleSetFactory.kt

diktat-api/src/main/kotlin/org/cqfn/diktat/api/DiktatRuleConfigReader.kt

diktat-maven-plugin/src/main/kotlin/org/cqfn/diktat/plugin/maven/DiktatBaseMojo.kt

diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/RulesConfigValidationTest.kt

nulls · 2023-06-09T10:49:19Z

But my real question is the following: is it possible to create a small runner of diktat without this huge change with existing code?

I thought I've showed to you. Restored this main class: #1689

orchestr7 · 2023-06-12T16:38:22Z

But my real question is the following: is it possible to create a small runner of diktat without this huge change with existing code?

I thought I've showed to you. Restored this main class: #1689

I missed this comment and actually got pissed because of this a little bit. If you show that to me - how external people should know about our API and how to call our methods? 👿 Anyway - I have sent #1689 to our friends, thank you 😄

nulls · 2023-06-13T08:06:08Z

If you show that to me - how external people should know about our API and how to call our methods?

I've showed you that it doesn't work in the way that we wanted (configuration now supported only via a file), that why I continue with this PR

…#1685

Diktat runner

a8cb51e

### What's done: - main runner It closes #1685

nulls added this to the 2.0.0 milestone Jun 7, 2023

nulls self-assigned this Jun 7, 2023

github-advanced-security bot found potential problems Jun 7, 2023

View reviewed changes

WIP

493c83e

github-advanced-security bot found potential problems Jun 7, 2023

View reviewed changes

diktat-api/src/main/kotlin/org/cqfn/diktat/DiktatRunnerFactory.kt Fixed Show fixed Hide fixed

github-advanced-security bot found potential problems Jun 7, 2023

View reviewed changes

nulls added 2 commits June 8, 2023 13:40

introduced DiktatRuleConfigReader

fe8da75

removed DiktatMainRunner

4d7f211

github-advanced-security bot found potential problems Jun 8, 2023

View reviewed changes

nulls changed the title ~~Diktat runner~~ Diktat rule configs Jun 8, 2023

nulls added 2 commits June 8, 2023 14:07

fixed test failures

72435e7

fixing a test

d9acdce

github-advanced-security bot found potential problems Jun 8, 2023

View reviewed changes

...-common/src/main/kotlin/org/cqfn/diktat/common/config/reader/AbstractResourceConfigReader.kt Fixed Show fixed Hide fixed

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/DiktatRuleConfigReaderImpl.kt Fixed Show fixed Hide fixed

fixed test failures

eba7945

github-advanced-security bot found potential problems Jun 8, 2023

View reviewed changes

diktat-common/src/main/kotlin/org/cqfn/diktat/common/config/rules/RulesConfigReader.kt Fixed Show fixed Hide fixed

fixed test failures

5ae7124

github-advanced-security bot found potential problems Jun 8, 2023

View reviewed changes

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/DiktatRuleConfigReaderImpl.kt Fixed Show fixed Hide fixed

nulls added 7 commits June 8, 2023 16:27

removed AbstractResourceConfigReader

a8cb7fb

fixed diktatCheck too

9f75bf0

a small fixes

0fd3005

moved logic with loading config from different location to SPI

4fac411

fixed compilation error

ddea069

no need to create log lazy

8388723

diktatFix + fixed test

56279cd

nulls requested a review from kgevorkyan June 8, 2023 15:05

nulls requested review from icemachined, sanyavertolet, Cheshiriks, orchestr7 and 0x6675636b796f75676974687562 June 8, 2023 15:05

nulls marked this pull request as ready for review June 8, 2023 15:05

orchestr7 reviewed Jun 9, 2023

View reviewed changes

diktat-api/src/main/kotlin/org/cqfn/diktat/api/DiktatRuleConfig.kt Outdated Show resolved Hide resolved

orchestr7 reviewed Jun 9, 2023

View reviewed changes

diktat-api/src/main/kotlin/org/cqfn/diktat/api/DiktatRuleConfig.kt Outdated Show resolved Hide resolved

0x6675636b796f75676974687562 approved these changes Jun 9, 2023

View reviewed changes

sanyavertolet approved these changes Jun 9, 2023

View reviewed changes

0x6675636b796f75676974687562 reviewed Jun 9, 2023

View reviewed changes

diktat-api/src/main/kotlin/org/cqfn/diktat/api/DiktatRuleSetFactory.kt Outdated Show resolved Hide resolved

0x6675636b796f75676974687562 reviewed Jun 9, 2023

View reviewed changes

diktat-api/src/main/kotlin/org/cqfn/diktat/api/DiktatRuleConfigReader.kt Outdated Show resolved Hide resolved

0x6675636b796f75676974687562 reviewed Jun 9, 2023

View reviewed changes

diktat-maven-plugin/src/main/kotlin/org/cqfn/diktat/plugin/maven/DiktatBaseMojo.kt Outdated Show resolved Hide resolved

0x6675636b796f75676974687562 reviewed Jun 9, 2023

View reviewed changes

diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/RulesConfigValidationTest.kt Outdated Show resolved Hide resolved

0x6675636b796f75676974687562 approved these changes Jun 9, 2023

View reviewed changes

fixed review notes

16352bc

orchestr7 approved these changes Jun 12, 2023

View reviewed changes

nulls mentioned this pull request Jun 13, 2023

Typed configuration #1694

Open

4 tasks

nulls added 4 commits June 13, 2023 12:46

Merge remote-tracking branch 'origin/master' into feature/rule-config…

a115b30

…#1685

fixed packages after merging the master

0b599ac

diktatFix

2bb0f19

avoid ().invoke()

04294d8

nulls enabled auto-merge (squash) June 13, 2023 11:06

Merge branch 'master' into feature/rule-config#1685

ec0c24c

nulls merged commit 4c90d15 into master Jun 13, 2023

nulls deleted the feature/rule-config#1685 branch June 13, 2023 11:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Diktat rule configs #1686

Diktat rule configs #1686

nulls commented Jun 7, 2023 •

edited

Loading

github-actions bot commented Jun 7, 2023 •

edited

Loading

github-actions bot commented Jun 7, 2023 •

edited

Loading

codecov bot commented Jun 7, 2023 •

edited

Loading

orchestr7 commented Jun 9, 2023

nulls commented Jun 9, 2023 •

edited

Loading

orchestr7 commented Jun 12, 2023

nulls commented Jun 13, 2023 •

edited

Loading

Diktat rule configs #1686

Diktat rule configs #1686

Conversation

nulls commented Jun 7, 2023 • edited Loading

What's done:

github-actions bot commented Jun 7, 2023 • edited Loading

JUnit Tests (macOS, EnricoMi/publish-unit-test-result-action@v2)

github-actions bot commented Jun 7, 2023 • edited Loading

JUnit Tests (Windows, EnricoMi/publish-unit-test-result-action@v2)

codecov bot commented Jun 7, 2023 • edited Loading

Codecov Report

orchestr7 commented Jun 9, 2023

nulls commented Jun 9, 2023 • edited Loading

orchestr7 commented Jun 12, 2023

nulls commented Jun 13, 2023 • edited Loading

nulls commented Jun 7, 2023 •

edited

Loading

github-actions bot commented Jun 7, 2023 •

edited

Loading

github-actions bot commented Jun 7, 2023 •

edited

Loading

codecov bot commented Jun 7, 2023 •

edited

Loading

nulls commented Jun 9, 2023 •

edited

Loading

nulls commented Jun 13, 2023 •

edited

Loading