Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: restructure sql moudule folders #1154

Merged
merged 2 commits into from
Apr 20, 2022
Merged

bugfix: restructure sql moudule folders #1154

merged 2 commits into from
Apr 20, 2022

Conversation

ndr-brt
Copy link
Member

@ndr-brt ndr-brt commented Apr 14, 2022

What this PR changes/adds

Restructure sql modules to follow a unique convention and to avoid the problem mentioned by #1135
New structure will be:

sql
│── asset-index-sql
│   ├── build.gradle.kts
│   ├── docs
│   ├── README.md
│   └── src
├── build.gradle.kts
├── common-sql
│   ├── build.gradle.kts
│   ├── README.md
│   └── src
├── contract-definition-store-sql
│   ├── build.gradle.kts
│   ├── docs
│   └── src
├── contract-negotiation-store-sql
│   ├── build.gradle.kts
│   ├── docs
│   └── src
├── lease-sql
│   ├── build.gradle.kts
│   └── src
├── policy-store-sql
│   ├── build.gradle.kts
│   ├── docs
│   └── src
├── pool
│   └── apache-commons-pool-sql
└── transfer-process-store-sql
    ├── build.gradle.kts
    ├── doc
    └── src

Why it does that

Seems like gradle cannot handle modules with the same folder name in the project: gradle/gradle#847
Currently there are two store module folder, and this PR avoids this.

Further notes

  • make sure that every "leaf" folder into the extensions/sql ends with -sql so that will avoid every kind of conflict.
  • include docs folder into the module itself
  • rename artifactId to be equal the folder name (this convention should be followed in all the modules)

Linked Issue(s)

Closes #1135

Checklist

  • added appropriate tests?
  • performed checkstyle check locally?
  • added/updated copyright headers?
  • documented public classes/methods?
  • added/updated relevant documentation?
  • added relevant details to the changelog? (skip with label no-changelog)
  • formatted title correctly? (take a look at the CONTRIBUTING and styleguide for details)

@codecov-commenter
Copy link

codecov-commenter commented Apr 14, 2022

Codecov Report

Merging #1154 (5a265bc) into main (24956ec) will increase coverage by 0.02%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #1154      +/-   ##
============================================
+ Coverage     62.63%   62.65%   +0.02%     
- Complexity     2973     2981       +8     
============================================
  Files           694      694              
  Lines         15420    15428       +8     
  Branches       1043     1048       +5     
============================================
+ Hits           9658     9667       +9     
+ Misses         5332     5331       -1     
  Partials        430      430              
Impacted Files Coverage Δ
...ector/sql/asset/index/PostgresSqlAssetQueries.java 100.00% <ø> (ø)
...aspaceconnector/sql/asset/index/SqlAssetIndex.java 81.74% <ø> (ø)
...sql/asset/index/SqlAssetIndexServiceExtension.java 0.00% <ø> (ø)
...spaceconnector/sql/asset/index/SqlAssetTables.java 100.00% <ø> (ø)
...nector/sql/asset/index/SqlConditionExpression.java 100.00% <ø> (ø)
...lipse/dataspaceconnector/sql/ArgumentHandlers.java 100.00% <ø> (ø)
...lipse/dataspaceconnector/sql/SqlQueryExecutor.java 94.44% <ø> (ø)
...or/sql/datasource/ConnectionFactoryDataSource.java 100.00% <ø> (ø)
...ector/sql/datasource/ConnectionPoolDataSource.java 100.00% <ø> (ø)
...tor/sql/datasource/PooledDataSourceConnection.java 8.00% <ø> (ø)
... and 27 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 24956ec...5a265bc. Read the comment docs.

Copy link
Member

@paullatzelsperger paullatzelsperger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should put the "do not create duplicate folder names" convention in some documentation

@florianrusch-zf
Copy link
Contributor

florianrusch-zf commented Apr 19, 2022

@ndr-brt Any reason why the transfer-process-store-sql/doc folder is written in singular and the others in plural (docs)?

@ndr-brt
Copy link
Member Author

ndr-brt commented Apr 20, 2022

@paullatzelsperger opened an issue about: #1174
@florianrusch-zf just a typo, fixed

@stefan-ettl stefan-ettl merged commit d056af2 into eclipse-edc:main Apr 20, 2022
@ndr-brt ndr-brt deleted the bugfix/1135-restructure-sql-folder branch April 20, 2022 11:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

EdcRuntimeExtension: Can't load injected implementations when working with SQL Policy Store
5 participants