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

Commits on Jul 10, 2024

  1. feat: base

    @illfixit @richardtreier
    illfixit authored and richardtreier committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    b4d648a View commit details
    Browse the repository at this point in the history

  2. chore: apply new indentation on common-mappers and common-api

    @richardtreier
    richardtreier committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    4e17b03 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. feat: clean up policy model and test

    @richardtreier
    richardtreier committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    6e27fc6 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into mds-2.2-combine-policies 

    # Conflicts:
#	CHANGELOG.md
    @richardtreier
    richardtreier committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    a91c94c View commit details
    Browse the repository at this point in the history

  3. chore: fix build

    @richardtreier
    richardtreier committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    9df37c4 View commit details
    Browse the repository at this point in the history

  4. fix: tests

    @richardtreier
    richardtreier committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    4637535 View commit details
    Browse the repository at this point in the history

  5. chore: try fix ci

    @richardtreier
    richardtreier committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    9f6c7ed View commit details
    Browse the repository at this point in the history

  6. fix: tests (2)

    @richardtreier
    richardtreier committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    4e1ac0e View commit details
    Browse the repository at this point in the history

  7. chore: try fix ci (3)

    @richardtreier
    richardtreier committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    f1015fc View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. feat: preserve old policy create endpoint

    @richardtreier
    richardtreier committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    b14157c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into mds-2.2-combine-policies 

    # 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
    richardtreier committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    415cef0 View commit details
    Browse the repository at this point in the history

  3. chore: post-merge fixes

    @richardtreier
    richardtreier committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    c4d4efb View commit details
    Browse the repository at this point in the history

  4. chore: idk

    @richardtreier
    richardtreier committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    e75e6d3 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/main' into mds-2.2-combine-policies

    @richardtreier
    richardtreier committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    f475f86 View commit details
    Browse the repository at this point in the history

  6. chore: changelog

    @richardtreier
    richardtreier committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    c9eafa2 View commit details
    Browse the repository at this point in the history

  7. chore: changelog

    @richardtreier
    richardtreier committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    fb52dbd View commit details
    Browse the repository at this point in the history

  8. chore: rename field from policy to expression

    @richardtreier
    richardtreier committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    1077971 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. chore: review remarks

    @richardtreier
    richardtreier committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    2026669 View commit details
    Browse the repository at this point in the history

  2. chore: review remarks

    @richardtreier
    richardtreier committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    8dfacfb View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/main' into mds-2.2-combine-policies 

    # Conflicts:
#	tests/src/test/java/de/sovity/edc/e2e/UiApiWrapperTest.java
    @richardtreier
    richardtreier committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    219fa10 View commit details
    Browse the repository at this point in the history

  4. chore: fix build

    @richardtreier
    richardtreier committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    b7d5cb8 View commit details
    Browse the repository at this point in the history

  5. chore: fix build

    @richardtreier
    richardtreier committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    04f92c0 View commit details
    Browse the repository at this point in the history