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.

Sign up for GitHub

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

Jump to bottom

feat: combine policies #988

Merged
merged 22 commits into from
Jul 19, 2024
Merged

feat: combine policies #988

merged 22 commits into from
Jul 19, 2024

Conversation

illfixit
Copy link
Collaborator

@illfixit illfixit commented Jul 3, 2024 •
edited by richardtreier
Loading

No description provided.

@illfixit
Copy link
Collaborator Author

illfixit commented Jul 8, 2024 •
edited
Loading

Suggestions:

  • "expression types", not constraint types
  • we want to re-word to "Expression + Literal" in both API Model names and API docs
    (Constraint + Atomic whatever is just the EDC internal talk)
  • in the sum type you can make docs explicit:
    "Only for types AND, OR, XOR"
    "Only for type CONSTRAINT"

Option A:
UiPolicyExpression.type=CONSTRAINT wird umbenannt zu LITERAL
UiPolicyLiteral bleibt unverändert
Option B:
UiPolicyExpression.type=CONSTRAINT bleibt unverändert
UiPolicyLiteral wird umbenant zu UiPolicyConstraint

@richardtreier richardtreier mentioned this pull request Jul 10, 2024
Closed
@richardtreier richardtreier marked this pull request as draft July 10, 2024 11:31
@richardtreier richardtreier changed the title feat: combine policies feat: combine policies (Ilia's second draft) Jul 10, 2024
@SebastianOpriel SebastianOpriel changed the title feat: combine policies (Ilia's second draft) feat: combine policies Jul 16, 2024
@richardtreier richardtreier marked this pull request as ready for review July 16, 2024 12:14
@richardtreier richardtreier enabled auto-merge (squash) July 16, 2024 13:15
@richardtreier
feat: preserve old policy create endpoint
b14157c
@richardtreier
Merge remote-tracking branch 'origin/main' into mds-2.2-combine-policies
415cef0 
# Conflicts:
#	extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/ui/model/PolicyDefinitionCreateDto.java
#	extensions/wrapper/wrapper-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/AtomicConstraintDto.java
#	extensions/wrapper/wrapper-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/OperatorDto.java
#	extensions/wrapper/wrapper-common-mappers/src/main/java/de/sovity/edc/ext/wrapper/api/common/mappers/PolicyMapper.java
#	extensions/wrapper/wrapper-common-mappers/src/main/java/de/sovity/edc/ext/wrapper/api/common/mappers/policy/ConstraintExtractor.java
#	extensions/wrapper/wrapper-common-mappers/src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/policy/ConstraintExtractorTest.java
#	extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/WrapperExtensionContextBuilder.java
#	extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/policy/PolicyDefinitionApiService.java
#	extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/UseCaseResourceImpl.java
#	extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/catalog/CatalogApiTest.java
#	extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/contract_agreement/ContractAgreementPageTest.java
#	extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/policy/PolicyDefinitionApiServiceTest.java
#	extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/usecase/PolicyDefinitionApiServiceTest.java
#	extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/usecase/UseCaseApiWrapperTest.java
#	tests/src/test/java/de/sovity/edc/e2e/ApiWrapperDemoTest.java
#	tests/src/test/java/de/sovity/edc/e2e/DataSourceParameterizationTest.java
#	tests/src/test/java/de/sovity/edc/e2e/DataSourceQueryParamsTest.java
#	tests/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java
#	tests/src/test/java/de/sovity/edc/e2e/UiApiWrapperTest.java
#	tests/src/test/java/de/sovity/edc/e2e/UseCaseApiWrapperTest.java
@richardtreier
chore: post-merge fixes
c4d4efb
@richardtreier
chore: idk
e75e6d3
@richardtreier
Merge remote-tracking branch 'origin/main' into mds-2.2-combine-policies
f475f86
@richardtreier
chore: changelog
c9eafa2
@richardtreier
chore: changelog
fb52dbd
@richardtreier
chore: rename field from policy to expression
1077971
ununhexium
ununhexium requested changes Jul 19, 2024
View reviewed changes
Copy link
Collaborator

@ununhexium ununhexium left a comment

Choose a reason for hiding this comment

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

Only nit picks

extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/ui/UiResource.java Outdated Show resolved Hide resolved
...-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiPolicyExpression.java Show resolved Hide resolved
...-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiPolicyExpression.java Outdated Show resolved Hide resolved
docs/api/sovity-edc-api-wrapper.yaml Outdated Show resolved Hide resolved
CHANGELOG.md Show resolved Hide resolved
...-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiPolicyExpression.java Show resolved Hide resolved
...-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiPolicyExpression.java Show resolved Hide resolved
...mon-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiPolicyExpressionType.java Outdated Show resolved Hide resolved
...n-mappers/src/main/java/de/sovity/edc/ext/wrapper/api/common/mappers/LegacyPolicyMapper.java Show resolved Hide resolved
...ppers/src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/LegacyPolicyMapperTest.java Outdated Show resolved Hide resolved
ununhexium
ununhexium approved these changes Jul 19, 2024
View reviewed changes
Copy link
Collaborator

@ununhexium ununhexium left a comment

Choose a reason for hiding this comment

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

LGTM.

@richardtreier richardtreier dismissed kulgg’s stale review July 19, 2024 09:18

already re-reviewed

@richardtreier richardtreier merged commit f62d976 into main Jul 19, 2024
18 checks passed
@richardtreier richardtreier deleted the mds-2.2-combine-policies branch July 19, 2024 09:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richardtreier richardtreier richardtreier left review comments

@ununhexium ununhexium ununhexium approved these changes

@kulgg kulgg kulgg left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@illfixit @ununhexium @richardtreier @kulgg