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

Bug 572650 - [Passage] upgrade licenses domain model #784

Merged
merged 10 commits into from
May 23, 2021
Merged

Conversation

eparovyshnaya
Copy link
Contributor

  • LicensePlan.licensePlanFeature -> LicensePlan.features
  • LicensePlan.licensePlanFeature cardinality [0, -1] -> [1, -1]
  • LicensePlanFeature.licensePlan -> LicensePlanFeature.plan
  • FeatureRef.version -> FeatureRef.version.version
  • FeatureRef.matchingRule ->FeatureRef.version.rule
  • FeatureGrant.feature -> FeatureGrant.feature.identifier
  • FeatureGrant.version -> FeatureGrant.feature.version

LicensePlan.licensePlanFeature -> LicensePlan.features
LicensePlan.licensePlanFeature cardinality [0, -1] -> [1, -1]
LicensePlanFeature.licensePlan ->  LicensePlanFeature.plan
FeatureRef.version -> FeatureRef.version.version
FeatureRef.matchingRule ->FeatureRef.version.rule
FeatureGrant.feature ->  FeatureGrant.feature.identifier
FeatureGrant.version ->  FeatureGrant.feature.version

Signed-off-by: eparovyshnaya <[email protected]>
Changes to descriptors

LicensePlan.licensePlanFeature -> LicensePlan.features
LicensePlan.licensePlanFeature cardinality [0, -1] -> [1, -1]
LicensePlanFeature.licensePlan ->  LicensePlanFeature.plan
FeatureRef.version -> FeatureRef.version.version
FeatureRef.matchingRule ->FeatureRef.version.rule
FeatureGrant.feature ->  FeatureGrant.feature.identifier
FeatureGrant.version ->  FeatureGrant.feature.version

Signed-off-by: eparovyshnaya <[email protected]>
@eparovyshnaya eparovyshnaya added the pr::wip PR is not ready for review, work is still in progress label May 21, 2021
- generate model/edit code
- fix usages

Signed-off-by: eparovyshnaya <[email protected]>
LicenseGrant.licensePack -> LicenseGrant.pack
FeatureRef.version -> FeatureRef.versionMatch.version
FeatureRef.matchingRule ->FeatureRef.versionMatch.rule

LicensePlan.licensePlanFeature -> LicensePlan.features
LicensePlan.licensePlanFeature cardinality [0, -1] -> [1, -1]
LicensePlanFeature.licensePlan ->  LicensePlanFeature.plan

FeatureGrant.feature ->  FeatureGrant.feature.identifier
FeatureGrant.version ->  FeatureGrant.feature.version


Signed-off-by: eparovyshnaya <[email protected]>
ruspl-afed and others added 6 commits May 22, 2021 14:59
Reimplement migration facilities

Signed-off-by: Alexander Fedorov <[email protected]>
Remove EnsureStructure

Signed-off-by: Alexander Fedorov <[email protected]>
- migrate 'LicensePlan' root element as well
- test migration

Signed-off-by: eparovyshnaya <[email protected]>
reissue LBC test floating license

Signed-off-by: eparovyshnaya <[email protected]>
evolve floating license issuing codebase

Signed-off-by: eparovyshnaya <[email protected]>
evolve floating license grant acquisition according to model api change

Signed-off-by: eparovyshnaya <[email protected]>
@codecov
Copy link

codecov bot commented May 23, 2021

Codecov Report

Merging #784 (fb33f49) into master (4ec6a1b) will increase coverage by 0.18%.
The diff coverage is 59.32%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #784      +/-   ##
============================================
+ Coverage     33.93%   34.11%   +0.18%     
  Complexity      346      346              
============================================
  Files          1027     1027              
  Lines         21522    21554      +32     
  Branches       1281     1284       +3     
============================================
+ Hits           7304     7354      +50     
+ Misses        13787    13753      -34     
- Partials        431      447      +16     
Impacted Files Coverage Δ Complexity Δ
.../passage/lic/emf/migration/MigrationException.java 0.00% <0.00%> (ø) 0.00 <0.00> (?)
...tures/model/migration/FeaturesResourceHandler.java 94.11% <0.00%> (+5.22%) 0.00 <0.00> (ø)
...enses/edit/providers/FeatureGrantItemProvider.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...icenses/edit/providers/FeatureRefItemProvider.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...enses/edit/providers/LicenseGrantItemProvider.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...edit/providers/LicensePlanFeatureItemProvider.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...censes/edit/providers/LicensePlanItemProvider.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...ic/licenses/model/impl/LicensePlanFeatureImpl.java 21.42% <0.00%> (+21.42%) 0.00 <0.00> (ø)
...ssage/lic/licenses/model/meta/LicensesPackage.java 100.00% <ø> (ø) 0.00 <0.00> (ø)
...lic/internal/licenses/model/EmptyFeatureGrant.java 0.00% <0.00%> (ø) 0.00 <0.00> (?)
... and 40 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 4ec6a1b...fb33f49. Read the comment docs.

@eparovyshnaya eparovyshnaya merged commit 5dabdbb into master May 23, 2021
@ruspl-afed ruspl-afed deleted the 572560-8 branch May 26, 2021 09:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr::wip PR is not ready for review, work is still in progress
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants