Skip to content

Commit

Permalink
Merge branch 'main' into DEVX-460_use_double_for_metrics
Browse files Browse the repository at this point in the history
  • Loading branch information
lojzatran authored Dec 10, 2024
2 parents 35ceead + de78e1b commit 903d93b
Show file tree
Hide file tree
Showing 30 changed files with 96 additions and 638 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
name: Benchmark

# Declare default permissions as read only.
permissions: read-all
permissions: { }

jobs:
benchmark:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
name: CI

# Declare default permissions as read only.
permissions: read-all
permissions: {}

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down Expand Up @@ -71,7 +71,9 @@ jobs:

- name: "Run if style changes have been detected"
if: steps.commit_style_fix.outputs.changes_detected == 'true'
run: echo "${{steps.commit_style_fix.outputs.commit_hash}}" >> .git-blame-ignore-revs
run: echo "$HASH" >> .git-blame-ignore-revs
env:
HASH: ${{steps.commit_style_fix.outputs.commit_hash}}

- uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
id: commit_rev_ignore
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,10 @@ jobs:
- name: Setup Graphviz
uses: ts-graphviz/setup-graphviz@b1de5da23ed0a6d14e0aeee8ed52fdd87af2363c # v2.0.2

- run: ./gradlew -Pversion=${{ github.event.inputs.version }} alljavadoc
- run: ./gradlew -Pversion=$VERSION alljavadoc
working-directory: sdk
env:
VERSION: ${{ github.event.inputs.version }}

- run: rsync -r sdk/build/docs/javadoc/ doc/javadoc

Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ jobs:
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
PASSPHRASE: ${{ secrets.PASSPHRASE }}

- run: ./gradlew -Pversion=${{ github.ref_name }} clean test javadoc publishToSonatype closeAndReleaseSonatypeStagingRepository
- run: ./gradlew -Pversion=$REF_NAME clean test javadoc publishToSonatype closeAndReleaseSonatypeStagingRepository
env:
REF_NAME: ${{ github.ref_name }}
CTP_OSS_USER: ${{ secrets.OSS_USER }}
CTP_OSS_SECRET: ${{ secrets.OSS_SECRET }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -76,7 +77,9 @@ jobs:

- uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2

- run: ./gradlew -Pversion=${{ github.ref_name }} writeVersionToExamples writeVersionToReadme setVersion nextMinorVersion snapshotVersion
- run: ./gradlew -Pversion=$REF_NAME writeVersionToExamples writeVersionToReadme setVersion nextMinorVersion snapshotVersion
env:
REF_NAME: ${{ github.ref_name }}

- name: "Switch SDK to after release branch"
run: |
Expand Down Expand Up @@ -150,8 +153,11 @@ jobs:
- name: Setup Graphviz
uses: ts-graphviz/setup-graphviz@b1de5da23ed0a6d14e0aeee8ed52fdd87af2363c # v2.0.2

- run: ./gradlew -Pversion=${{ github.ref_name }} alljavadoc
- run: ./gradlew -Pversion=$REF_NAME alljavadoc
working-directory: sdk
env:
REF_NAME: ${{ github.ref_name }}


- run: rsync -r sdk/build/docs/javadoc/ doc/javadoc

Expand Down
7 changes: 3 additions & 4 deletions changes.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
**Api changes**
**Import changes**

<details>
<summary>Changed Property(s)</summary>
<summary>Removed Type(s)</summary>

- :warning: changed property `totalPrice` of type `StagedOrder` from type `TypedMoney` to `CentPrecisionMoney`
- :warning: changed property `totalPrice` of type `Order` from type `TypedMoney` to `CentPrecisionMoney`
- :warning: removed type `ReferencedResourceNotFound`
</details>

Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public interface DiscountedPriceDraft extends io.vrap.rmf.base.client.Draft<Disc

/**
* <p>Sets the money value for the discounted price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @return value
*/
@NotNull
Expand All @@ -54,6 +55,7 @@ public interface DiscountedPriceDraft extends io.vrap.rmf.base.client.Draft<Disc

/**
* <p>Sets the money value for the discounted price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @param value value to be set
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public class DiscountedPriceDraftBuilder implements Builder<DiscountedPriceDraft

/**
* <p>Sets the money value for the discounted price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @param builder function to build the value value
* @return Builder
*/
Expand All @@ -41,6 +42,7 @@ public DiscountedPriceDraftBuilder value(

/**
* <p>Sets the money value for the discounted price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @param builder function to build the value value
* @return Builder
*/
Expand All @@ -53,6 +55,7 @@ public DiscountedPriceDraftBuilder withValue(

/**
* <p>Sets the money value for the discounted price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @param value value to be set
* @return Builder
*/
Expand Down Expand Up @@ -103,6 +106,7 @@ public DiscountedPriceDraftBuilder discount(

/**
* <p>Sets the money value for the discounted price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @return value
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public DiscountedPriceDraftImpl() {

/**
* <p>Sets the money value for the discounted price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
*/

public com.commercetools.api.models.common.Money getValue() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public interface PriceDraft extends com.commercetools.api.models.CustomizableDra

/**
* <p>Money value of this Price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @return value
*/
@NotNull
Expand Down Expand Up @@ -135,6 +136,7 @@ public interface PriceDraft extends com.commercetools.api.models.CustomizableDra

/**
* <p>Money value of this Price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @param value value to be set
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public PriceDraftBuilder key(@Nullable final String key) {

/**
* <p>Money value of this Price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @param builder function to build the value value
* @return Builder
*/
Expand All @@ -78,6 +79,7 @@ public PriceDraftBuilder value(

/**
* <p>Money value of this Price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @param builder function to build the value value
* @return Builder
*/
Expand All @@ -90,6 +92,7 @@ public PriceDraftBuilder withValue(

/**
* <p>Money value of this Price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @param value value to be set
* @return Builder
*/
Expand Down Expand Up @@ -403,6 +406,7 @@ public String getKey() {

/**
* <p>Money value of this Price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @return value
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ public String getKey() {

/**
* <p>Money value of this Price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
*/

public com.commercetools.api.models.common.Money getValue() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public interface PriceTierDraft extends io.vrap.rmf.base.client.Draft<PriceTierD
public Long getMinimumQuantity();

/**
* <p>Money value that applies when the <code>minimumQuantity</code> is greater than or equal to the LineItem <code>quantity</code>.</p>
* <p>Money value that applies when the <code>minimumQuantity</code> is greater than or equal to the LineItem <code>quantity</code>. To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* <p>The <code>currencyCode</code> of a Price tier must be the same as the <code>currencyCode</code> in the <code>value</code> of the related Price.</p>
* @return value
*/
Expand All @@ -61,7 +61,7 @@ public interface PriceTierDraft extends io.vrap.rmf.base.client.Draft<PriceTierD
public void setMinimumQuantity(final Long minimumQuantity);

/**
* <p>Money value that applies when the <code>minimumQuantity</code> is greater than or equal to the LineItem <code>quantity</code>.</p>
* <p>Money value that applies when the <code>minimumQuantity</code> is greater than or equal to the LineItem <code>quantity</code>. To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* <p>The <code>currencyCode</code> of a Price tier must be the same as the <code>currencyCode</code> in the <code>value</code> of the related Price.</p>
* @param value value to be set
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public PriceTierDraftBuilder minimumQuantity(final Long minimumQuantity) {
}

/**
* <p>Money value that applies when the <code>minimumQuantity</code> is greater than or equal to the LineItem <code>quantity</code>.</p>
* <p>Money value that applies when the <code>minimumQuantity</code> is greater than or equal to the LineItem <code>quantity</code>. To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* <p>The <code>currencyCode</code> of a Price tier must be the same as the <code>currencyCode</code> in the <code>value</code> of the related Price.</p>
* @param builder function to build the value value
* @return Builder
Expand All @@ -53,7 +53,7 @@ public PriceTierDraftBuilder value(
}

/**
* <p>Money value that applies when the <code>minimumQuantity</code> is greater than or equal to the LineItem <code>quantity</code>.</p>
* <p>Money value that applies when the <code>minimumQuantity</code> is greater than or equal to the LineItem <code>quantity</code>. To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* <p>The <code>currencyCode</code> of a Price tier must be the same as the <code>currencyCode</code> in the <code>value</code> of the related Price.</p>
* @param builder function to build the value value
* @return Builder
Expand All @@ -66,7 +66,7 @@ public PriceTierDraftBuilder withValue(
}

/**
* <p>Money value that applies when the <code>minimumQuantity</code> is greater than or equal to the LineItem <code>quantity</code>.</p>
* <p>Money value that applies when the <code>minimumQuantity</code> is greater than or equal to the LineItem <code>quantity</code>. To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* <p>The <code>currencyCode</code> of a Price tier must be the same as the <code>currencyCode</code> in the <code>value</code> of the related Price.</p>
* @param value value to be set
* @return Builder
Expand All @@ -88,7 +88,7 @@ public Long getMinimumQuantity() {
}

/**
* <p>Money value that applies when the <code>minimumQuantity</code> is greater than or equal to the LineItem <code>quantity</code>.</p>
* <p>Money value that applies when the <code>minimumQuantity</code> is greater than or equal to the LineItem <code>quantity</code>. To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* <p>The <code>currencyCode</code> of a Price tier must be the same as the <code>currencyCode</code> in the <code>value</code> of the related Price.</p>
* @return value
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public Long getMinimumQuantity() {
}

/**
* <p>Money value that applies when the <code>minimumQuantity</code> is greater than or equal to the LineItem <code>quantity</code>.</p>
* <p>Money value that applies when the <code>minimumQuantity</code> is greater than or equal to the LineItem <code>quantity</code>. To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* <p>The <code>currencyCode</code> of a Price tier must be the same as the <code>currencyCode</code> in the <code>value</code> of the related Price.</p>
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public interface StandalonePriceChangeValueAction extends StandalonePriceUpdateA

/**
* <p>New value to set. Must not be empty.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @return value
*/
@NotNull
Expand All @@ -57,6 +58,7 @@ public interface StandalonePriceChangeValueAction extends StandalonePriceUpdateA

/**
* <p>New value to set. Must not be empty.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @param value value to be set
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public class StandalonePriceChangeValueActionBuilder implements Builder<Standalo

/**
* <p>New value to set. Must not be empty.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @param builder function to build the value value
* @return Builder
*/
Expand All @@ -43,6 +44,7 @@ public StandalonePriceChangeValueActionBuilder value(

/**
* <p>New value to set. Must not be empty.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @param builder function to build the value value
* @return Builder
*/
Expand All @@ -55,6 +57,7 @@ public StandalonePriceChangeValueActionBuilder withValue(

/**
* <p>New value to set. Must not be empty.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @param value value to be set
* @return Builder
*/
Expand All @@ -77,6 +80,7 @@ public StandalonePriceChangeValueActionBuilder staged(@Nullable final Boolean st

/**
* <p>New value to set. Must not be empty.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @return value
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public String getAction() {

/**
* <p>New value to set. Must not be empty.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
*/

public com.commercetools.api.models.common.Money getValue() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public interface StandalonePriceDraft extends com.commercetools.api.models.Custo

/**
* <p>Sets the money value of this Price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @return value
*/
@NotNull
Expand Down Expand Up @@ -164,6 +165,7 @@ public interface StandalonePriceDraft extends com.commercetools.api.models.Custo

/**
* <p>Sets the money value of this Price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @param value value to be set
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ public StandalonePriceDraftBuilder sku(final String sku) {

/**
* <p>Sets the money value of this Price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @param builder function to build the value value
* @return Builder
*/
Expand All @@ -98,6 +99,7 @@ public StandalonePriceDraftBuilder value(

/**
* <p>Sets the money value of this Price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @param builder function to build the value value
* @return Builder
*/
Expand All @@ -110,6 +112,7 @@ public StandalonePriceDraftBuilder withValue(

/**
* <p>Sets the money value of this Price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @param value value to be set
* @return Builder
*/
Expand Down Expand Up @@ -464,6 +467,7 @@ public String getSku() {

/**
* <p>Sets the money value of this Price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
* @return value
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ public String getSku() {

/**
* <p>Sets the money value of this Price.</p>
* <p>To set the money value in high precision, use HighPrecisionMoneyDraft.</p>
*/

public com.commercetools.api.models.common.Money getValue() {
Expand Down
Loading

0 comments on commit 903d93b

Please sign in to comment.