From 97beb3a2f823812b8a496c44c936c8c257f33dab Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Wed, 8 Jun 2022 17:11:05 +0500 Subject: [PATCH 01/21] test --- core-api/src/main/java/com/optimizely/ab/Optimizely.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core-api/src/main/java/com/optimizely/ab/Optimizely.java b/core-api/src/main/java/com/optimizely/ab/Optimizely.java index 51335ec4f..f631caefb 100644 --- a/core-api/src/main/java/com/optimizely/ab/Optimizely.java +++ b/core-api/src/main/java/com/optimizely/ab/Optimizely.java @@ -15,6 +15,7 @@ ***************************************************************************/ package com.optimizely.ab; + import com.optimizely.ab.annotations.VisibleForTesting; import com.optimizely.ab.bucketing.Bucketer; import com.optimizely.ab.bucketing.DecisionService; From c3d00046df4e86f925de62915126808972fc4111 Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Wed, 8 Jun 2022 17:19:58 +0500 Subject: [PATCH 02/21] test --- .github/workflows/java.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index a7c2eafe9..9ccba2791 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -65,14 +65,6 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Gradle cache - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/buildSrc/**/*.kt') }} - - name: run tests id: unit_tests env: From 38be57a34871ef3f5cc6a32194ffe5e9dd786e33 Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Wed, 8 Jun 2022 17:33:43 +0500 Subject: [PATCH 03/21] test --- .github/workflows/java.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 9ccba2791..f5243c094 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -50,18 +50,18 @@ jobs: strategy: fail-fast: false matrix: - jdk: [8, 9] + jdk: [8, 11] optimizely_default_parser: [GSON_CONFIG_PARSER, JACKSON_CONFIG_PARSER, JSON_CONFIG_PARSER, JSON_SIMPLE_CONFIG_PARSER] steps: - name: checkout uses: actions/checkout@v2 - name: set up JDK ${{ matrix.jdk }} - uses: AdoptOpenJDK/install-jdk@v1 + uses: actions/setup-java@v3 with: - version: ${{ matrix.jdk }} - architecture: x64 - + distribution: 'temurin' + java-version: ${{ matrix.jdk }} + - name: Grant execute permission for gradlew run: chmod +x gradlew From c48fa8a77dd7e93a3478d8d291f86439e061ddd3 Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Wed, 8 Jun 2022 18:04:36 +0500 Subject: [PATCH 04/21] adding travis yml to make sure everytest is working --- .travis.yml | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..dcd12d58d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,92 @@ +language: java +dist: trusty +jdk: + - openjdk8 + - oraclejdk8 + - oraclejdk9 +install: true +env: + - optimizely_default_parser=GSON_CONFIG_PARSER + - optimizely_default_parser=JACKSON_CONFIG_PARSER + - optimizely_default_parser=JSON_CONFIG_PARSER + - optimizely_default_parser=JSON_SIMPLE_CONFIG_PARSER +script: + - "./gradlew clean" + - "./gradlew exhaustiveTest" + - "./gradlew build" + +cache: + gradle: true + directories: + - "$HOME/.gradle/caches" + - "$HOME/.gradle/wrapper" +branches: + only: + - master + - /^\d+\.\d+\.(\d|[x])+(-SNAPSHOT|-alpha|-beta)?\d*$/ # trigger builds on tags which are semantically versioned to ship the SDK. +after_success: + - ./gradlew coveralls uploadArchives --console plain +after_failure: + - cat /home/travis/build/optimizely/java-sdk/core-api/build/reports/findbugs/main.html + - cat /home/travis/build/optimizely/java-sdk/core-api/build/reports/findbugs/test.html + +# Integration tests need to run first to reset the PR build status to pending +stages: + - 'Source Clear' + - 'Lint markdown files' + - 'Integration tests' + - 'Full stack production tests' + - 'Test' + - 'Publish' + - 'Snapshot' + +jobs: + include: + - stage: 'Lint markdown files' + os: linux + language: generic + install: gem install awesome_bot + script: + - find . -type f -name '*.md' -exec awesome_bot {} \; + notifications: + email: false + + - &integrationtest + stage: 'Integration tests' + merge_mode: replace + env: SDK=java SDK_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH + cache: false + language: minimal + before_install: skip + install: skip + before_script: + - mkdir $HOME/travisci-tools && pushd $HOME/travisci-tools && git init && git pull https://$CI_USER_TOKEN@github.com/optimizely/travisci-tools.git && popd + script: + - $HOME/travisci-tools/trigger-script-with-status-update.sh + after_success: travis_terminate 0 + + - <<: *integrationtest + stage: 'Full stack production tests' + env: + SDK=java + SDK_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH + FULLSTACK_TEST_REPO=ProdTesting + + - stage: 'Source Clear' + if: type = cron + install: skip + before_script: skip + script: skip + after_success: skip + + - stage: 'Publish' + if: tag IS present + script: + - ./gradlew ship + after_success: skip + + - stage: 'Snapshot' + if: env(SNAPSHOT) = true and type = api + script: + - TRAVIS_TAG=BB-SNAPSHOT ./gradlew ship + after_success: skip From 1099c562b61c1719d44672aac332a18e141c6c9d Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Wed, 8 Jun 2022 18:28:35 +0500 Subject: [PATCH 05/21] test --- .github/workflows/java.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index f5243c094..3af0c8e40 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -50,17 +50,16 @@ jobs: strategy: fail-fast: false matrix: - jdk: [8, 11] + jdk: [8, 11, 17] optimizely_default_parser: [GSON_CONFIG_PARSER, JACKSON_CONFIG_PARSER, JSON_CONFIG_PARSER, JSON_SIMPLE_CONFIG_PARSER] steps: - name: checkout uses: actions/checkout@v2 - - name: set up JDK ${{ matrix.jdk }} - uses: actions/setup-java@v3 + uses: oracle-actions/setup-java@v1 with: - distribution: 'temurin' - java-version: ${{ matrix.jdk }} + website: jdk.java.net + release: ${{ matrix.jdk }} - name: Grant execute permission for gradlew run: chmod +x gradlew From 6aac5dffdc070a0c7b8745641b06e266ed470a23 Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Wed, 8 Jun 2022 18:38:36 +0500 Subject: [PATCH 06/21] test --- .github/workflows/java.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 3af0c8e40..bd03fa2c4 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -55,22 +55,20 @@ jobs: steps: - name: checkout uses: actions/checkout@v2 - - name: set up JDK ${{ matrix.jdk }} - uses: oracle-actions/setup-java@v1 + - uses: actions/setup-java@v3 with: - website: jdk.java.net - release: ${{ matrix.jdk }} - + distribution: 'temurin' + java-version: '11' + cache: 'gradle' - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: run tests id: unit_tests env: optimizely_default_parser: ${{ matrix.optimizely_default_parser }} run: | ./gradlew clean - ./gradlew exhaustiveTest + ./gradlew test ./gradlew build - name: Check on failures if: steps.unit_tests.outcome != 'success' From 04368f09ff687d8ed5e75b9954b6a7749b027277 Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Wed, 8 Jun 2022 19:47:12 +0500 Subject: [PATCH 07/21] commenting out gitaction build for now until github action resolves there issue --- .github/workflows/java.yml | 194 ++++++++++++++++++------------------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index bd03fa2c4..45786eef2 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -1,105 +1,105 @@ -name: Java CI with Gradle +# name: Java CI with Gradle -on: - push: - branches: [ master ] - tags: - - '*' - pull_request: - branches: [ master ] - workflow_dispatch: - inputs: - SNAPSHOT: - type: boolean - description: Set SNAPSHOT true to publish +# on: +# push: +# branches: [ master ] +# tags: +# - '*' +# pull_request: +# branches: [ master ] +# workflow_dispatch: +# inputs: +# SNAPSHOT: +# type: boolean +# description: Set SNAPSHOT true to publish -jobs: - lint_markdown_files: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: '2.6' - bundler-cache: true # runs 'bundle install' and caches installed gems automatically - - name: Install gem - run: | - gem install awesome_bot - - name: Run tests - run: find . -type f -name '*.md' -exec awesome_bot {} \; +# jobs: +# lint_markdown_files: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2 +# - name: Set up Ruby +# uses: ruby/setup-ruby@v1 +# with: +# ruby-version: '2.6' +# bundler-cache: true # runs 'bundle install' and caches installed gems automatically +# - name: Install gem +# run: | +# gem install awesome_bot +# - name: Run tests +# run: find . -type f -name '*.md' -exec awesome_bot {} \; - integration_tests: - uses: optimizely/java-sdk/.github/workflows/integration_test.yml@master - secrets: - CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} - TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} +# integration_tests: +# uses: optimizely/java-sdk/.github/workflows/integration_test.yml@master +# secrets: +# CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} +# TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} - fullstack_production_suite: - uses: optimizely/java-sdk/.github/workflows/integration_test.yml@master - with: - FULLSTACK_TEST_REPO: ProdTesting - secrets: - CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} - TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} +# fullstack_production_suite: +# uses: optimizely/java-sdk/.github/workflows/integration_test.yml@master +# with: +# FULLSTACK_TEST_REPO: ProdTesting +# secrets: +# CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} +# TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} - test: - if: startsWith(github.ref, 'refs/tags/') != true - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - jdk: [8, 11, 17] - optimizely_default_parser: [GSON_CONFIG_PARSER, JACKSON_CONFIG_PARSER, JSON_CONFIG_PARSER, JSON_SIMPLE_CONFIG_PARSER] - steps: - - name: checkout - uses: actions/checkout@v2 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '11' - cache: 'gradle' - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: run tests - id: unit_tests - env: - optimizely_default_parser: ${{ matrix.optimizely_default_parser }} - run: | - ./gradlew clean - ./gradlew test - ./gradlew build - - name: Check on failures - if: steps.unit_tests.outcome != 'success' - run: | - cat /home/runner/java-sdk/core-api/build/reports/findbugs/main.html - cat /home/runner/java-sdk/core-api/build/reports/findbugs/test.html - - name: Check on success - if: steps.unit_tests.outcome == 'success' - run: | - ./gradlew coveralls uploadArchives --console plain +# test: +# if: startsWith(github.ref, 'refs/tags/') != true +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# jdk: [8, 11, 17] +# optimizely_default_parser: [GSON_CONFIG_PARSER, JACKSON_CONFIG_PARSER, JSON_CONFIG_PARSER, JSON_SIMPLE_CONFIG_PARSER] +# steps: +# - name: checkout +# uses: actions/checkout@v2 +# - uses: actions/setup-java@v3 +# with: +# distribution: 'temurin' +# java-version: '11' +# cache: 'gradle' +# - name: Grant execute permission for gradlew +# run: chmod +x gradlew +# - name: run tests +# id: unit_tests +# env: +# optimizely_default_parser: ${{ matrix.optimizely_default_parser }} +# run: | +# ./gradlew clean +# ./gradlew test +# ./gradlew build +# - name: Check on failures +# if: steps.unit_tests.outcome != 'success' +# run: | +# cat /home/runner/java-sdk/core-api/build/reports/findbugs/main.html +# cat /home/runner/java-sdk/core-api/build/reports/findbugs/test.html +# - name: Check on success +# if: steps.unit_tests.outcome == 'success' +# run: | +# ./gradlew coveralls uploadArchives --console plain - publish: - if: startsWith(github.ref, 'refs/tags/') - uses: optimizely/java-sdk/.github/workflows/build.yml@master - with: - action: ship - travis_tag: ${GITHUB_REF#refs/*/} - secrets: - MAVEN_SIGNING_KEY_BASE64: ${{ secrets.MAVEN_SIGNING_KEY_BASE64 }} - MAVEN_SIGNING_PASSPHRASE: ${{ secrets.MAVEN_SIGNING_PASSPHRASE }} - MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} - MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} +# publish: +# if: startsWith(github.ref, 'refs/tags/') +# uses: optimizely/java-sdk/.github/workflows/build.yml@master +# with: +# action: ship +# travis_tag: ${GITHUB_REF#refs/*/} +# secrets: +# MAVEN_SIGNING_KEY_BASE64: ${{ secrets.MAVEN_SIGNING_KEY_BASE64 }} +# MAVEN_SIGNING_PASSPHRASE: ${{ secrets.MAVEN_SIGNING_PASSPHRASE }} +# MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} +# MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} - snapshot: - if: ${{ github.event.inputs.SNAPSHOT == 'true' && github.event_name == 'workflow_dispatch' }} - uses: optimizely/java-sdk/.github/workflows/build.yml@master - with: - action: ship - travis_tag: BB-SNAPSHOT - secrets: - MAVEN_SIGNING_KEY_BASE64: ${{ secrets.MAVEN_SIGNING_KEY_BASE64 }} - MAVEN_SIGNING_PASSPHRASE: ${{ secrets.MAVEN_SIGNING_PASSPHRASE }} - MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} - MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} +# snapshot: +# if: ${{ github.event.inputs.SNAPSHOT == 'true' && github.event_name == 'workflow_dispatch' }} +# uses: optimizely/java-sdk/.github/workflows/build.yml@master +# with: +# action: ship +# travis_tag: BB-SNAPSHOT +# secrets: +# MAVEN_SIGNING_KEY_BASE64: ${{ secrets.MAVEN_SIGNING_KEY_BASE64 }} +# MAVEN_SIGNING_PASSPHRASE: ${{ secrets.MAVEN_SIGNING_PASSPHRASE }} +# MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} +# MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} From b0015359ca764e3bd6e381d630b265d04468d814 Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Wed, 22 Jun 2022 20:09:22 +0500 Subject: [PATCH 08/21] enabling only unit test for testing --- .github/workflows/java.yml | 194 ++++++++++++++++++------------------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 45786eef2..2e9ed106f 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -1,105 +1,105 @@ -# name: Java CI with Gradle +name: Java CI with Gradle -# on: -# push: -# branches: [ master ] -# tags: -# - '*' -# pull_request: -# branches: [ master ] -# workflow_dispatch: -# inputs: -# SNAPSHOT: -# type: boolean -# description: Set SNAPSHOT true to publish +on: + push: + branches: [ master ] + tags: + - '*' + pull_request: + branches: [ master ] + workflow_dispatch: + inputs: + SNAPSHOT: + type: boolean + description: Set SNAPSHOT true to publish -# jobs: -# lint_markdown_files: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2 -# - name: Set up Ruby -# uses: ruby/setup-ruby@v1 -# with: -# ruby-version: '2.6' -# bundler-cache: true # runs 'bundle install' and caches installed gems automatically -# - name: Install gem -# run: | -# gem install awesome_bot -# - name: Run tests -# run: find . -type f -name '*.md' -exec awesome_bot {} \; +jobs: + # lint_markdown_files: + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v2 + # - name: Set up Ruby + # uses: ruby/setup-ruby@v1 + # with: + # ruby-version: '2.6' + # bundler-cache: true # runs 'bundle install' and caches installed gems automatically + # - name: Install gem + # run: | + # gem install awesome_bot + # - name: Run tests + # run: find . -type f -name '*.md' -exec awesome_bot {} \; -# integration_tests: -# uses: optimizely/java-sdk/.github/workflows/integration_test.yml@master -# secrets: -# CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} -# TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} + # integration_tests: + # uses: optimizely/java-sdk/.github/workflows/integration_test.yml@master + # secrets: + # CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} + # TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} -# fullstack_production_suite: -# uses: optimizely/java-sdk/.github/workflows/integration_test.yml@master -# with: -# FULLSTACK_TEST_REPO: ProdTesting -# secrets: -# CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} -# TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} + # fullstack_production_suite: + # uses: optimizely/java-sdk/.github/workflows/integration_test.yml@master + # with: + # FULLSTACK_TEST_REPO: ProdTesting + # secrets: + # CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} + # TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} -# test: -# if: startsWith(github.ref, 'refs/tags/') != true -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# jdk: [8, 11, 17] -# optimizely_default_parser: [GSON_CONFIG_PARSER, JACKSON_CONFIG_PARSER, JSON_CONFIG_PARSER, JSON_SIMPLE_CONFIG_PARSER] -# steps: -# - name: checkout -# uses: actions/checkout@v2 -# - uses: actions/setup-java@v3 -# with: -# distribution: 'temurin' -# java-version: '11' -# cache: 'gradle' -# - name: Grant execute permission for gradlew -# run: chmod +x gradlew -# - name: run tests -# id: unit_tests -# env: -# optimizely_default_parser: ${{ matrix.optimizely_default_parser }} -# run: | -# ./gradlew clean -# ./gradlew test -# ./gradlew build -# - name: Check on failures -# if: steps.unit_tests.outcome != 'success' -# run: | -# cat /home/runner/java-sdk/core-api/build/reports/findbugs/main.html -# cat /home/runner/java-sdk/core-api/build/reports/findbugs/test.html -# - name: Check on success -# if: steps.unit_tests.outcome == 'success' -# run: | -# ./gradlew coveralls uploadArchives --console plain + test: + if: startsWith(github.ref, 'refs/tags/') != true + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + jdk: [8, 11, 17] + optimizely_default_parser: [GSON_CONFIG_PARSER, JACKSON_CONFIG_PARSER, JSON_CONFIG_PARSER, JSON_SIMPLE_CONFIG_PARSER] + steps: + - name: checkout + uses: actions/checkout@v2 + - uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '11' + cache: 'gradle' + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: run tests + id: unit_tests + env: + optimizely_default_parser: ${{ matrix.optimizely_default_parser }} + run: | + ./gradlew clean + ./gradlew test + ./gradlew build + - name: Check on failures + if: steps.unit_tests.outcome != 'success' + run: | + cat /home/runner/java-sdk/core-api/build/reports/findbugs/main.html + cat /home/runner/java-sdk/core-api/build/reports/findbugs/test.html + - name: Check on success + if: steps.unit_tests.outcome == 'success' + run: | + ./gradlew coveralls uploadArchives --console plain -# publish: -# if: startsWith(github.ref, 'refs/tags/') -# uses: optimizely/java-sdk/.github/workflows/build.yml@master -# with: -# action: ship -# travis_tag: ${GITHUB_REF#refs/*/} -# secrets: -# MAVEN_SIGNING_KEY_BASE64: ${{ secrets.MAVEN_SIGNING_KEY_BASE64 }} -# MAVEN_SIGNING_PASSPHRASE: ${{ secrets.MAVEN_SIGNING_PASSPHRASE }} -# MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} -# MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + # publish: + # if: startsWith(github.ref, 'refs/tags/') + # uses: optimizely/java-sdk/.github/workflows/build.yml@master + # with: + # action: ship + # travis_tag: ${GITHUB_REF#refs/*/} + # secrets: + # MAVEN_SIGNING_KEY_BASE64: ${{ secrets.MAVEN_SIGNING_KEY_BASE64 }} + # MAVEN_SIGNING_PASSPHRASE: ${{ secrets.MAVEN_SIGNING_PASSPHRASE }} + # MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + # MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} -# snapshot: -# if: ${{ github.event.inputs.SNAPSHOT == 'true' && github.event_name == 'workflow_dispatch' }} -# uses: optimizely/java-sdk/.github/workflows/build.yml@master -# with: -# action: ship -# travis_tag: BB-SNAPSHOT -# secrets: -# MAVEN_SIGNING_KEY_BASE64: ${{ secrets.MAVEN_SIGNING_KEY_BASE64 }} -# MAVEN_SIGNING_PASSPHRASE: ${{ secrets.MAVEN_SIGNING_PASSPHRASE }} -# MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} -# MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + # snapshot: + # if: ${{ github.event.inputs.SNAPSHOT == 'true' && github.event_name == 'workflow_dispatch' }} + # uses: optimizely/java-sdk/.github/workflows/build.yml@master + # with: + # action: ship + # travis_tag: BB-SNAPSHOT + # secrets: + # MAVEN_SIGNING_KEY_BASE64: ${{ secrets.MAVEN_SIGNING_KEY_BASE64 }} + # MAVEN_SIGNING_PASSPHRASE: ${{ secrets.MAVEN_SIGNING_PASSPHRASE }} + # MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + # MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} From c4fc1aef036faab08e0a750db4839f69b50781d3 Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Thu, 23 Jun 2022 19:43:08 +0500 Subject: [PATCH 09/21] test --- .../ab/config/parser/JacksonConfigParserTest.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java b/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java index e4e009e10..88d8228a6 100644 --- a/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java +++ b/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java @@ -70,12 +70,16 @@ public void parseProjectConfigV3() throws Exception { } @Test - public void parseProjectConfigV4() throws Exception { + public void parseProjectConfigV4() { JacksonConfigParser parser = new JacksonConfigParser(); ProjectConfig actual = parser.parseProjectConfig(validConfigJsonV4()); ProjectConfig expected = validProjectConfigV4(); - - verifyProjectConfig(actual, expected); + try { + verifyProjectConfig(actual, expected); + } catch (Exception ex) { + System.out.println(ex.getMessage()); + verifyProjectConfig(actual, expected); + } } @Test From c182bab8ffc3577a1e6ca07db1820bb2c189a466 Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Thu, 23 Jun 2022 19:46:13 +0500 Subject: [PATCH 10/21] test --- .../ab/config/parser/JacksonConfigParserTest.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java b/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java index 88d8228a6..d06b08661 100644 --- a/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java +++ b/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java @@ -71,11 +71,16 @@ public void parseProjectConfigV3() throws Exception { @Test public void parseProjectConfigV4() { - JacksonConfigParser parser = new JacksonConfigParser(); - ProjectConfig actual = parser.parseProjectConfig(validConfigJsonV4()); - ProjectConfig expected = validProjectConfigV4(); + ProjectConfig actual = null; + ProjectConfig expected= null; try { + + JacksonConfigParser parser = new JacksonConfigParser(); + actual = parser.parseProjectConfig(validConfigJsonV4()); + expected = validProjectConfigV4(); + verifyProjectConfig(actual, expected); + } catch (Exception ex) { System.out.println(ex.getMessage()); verifyProjectConfig(actual, expected); From 76ef6441adeee6131114ae74fd83b10fa1ac6a73 Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Thu, 23 Jun 2022 20:12:51 +0500 Subject: [PATCH 11/21] test --- .github/workflows/java.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 2e9ed106f..ae7380876 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -54,7 +54,7 @@ jobs: optimizely_default_parser: [GSON_CONFIG_PARSER, JACKSON_CONFIG_PARSER, JSON_CONFIG_PARSER, JSON_SIMPLE_CONFIG_PARSER] steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: distribution: 'temurin' @@ -62,6 +62,8 @@ jobs: cache: 'gradle' - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 - name: run tests id: unit_tests env: From fc967a574844a7a3af2614e09599dabf212ca030 Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Thu, 23 Jun 2022 21:46:00 +0500 Subject: [PATCH 12/21] test --- .github/workflows/java.yml | 2 -- .../optimizely/ab/config/DatafileProjectConfigTestUtils.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index ae7380876..62e6b3961 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -62,8 +62,6 @@ jobs: cache: 'gradle' - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - name: run tests id: unit_tests env: diff --git a/core-api/src/test/java/com/optimizely/ab/config/DatafileProjectConfigTestUtils.java b/core-api/src/test/java/com/optimizely/ab/config/DatafileProjectConfigTestUtils.java index b96815a39..49eaac733 100644 --- a/core-api/src/test/java/com/optimizely/ab/config/DatafileProjectConfigTestUtils.java +++ b/core-api/src/test/java/com/optimizely/ab/config/DatafileProjectConfigTestUtils.java @@ -491,7 +491,7 @@ private static void verifyExperiments(List actual, List assertThat(actualExperiment.getGroupId(), is(expectedExperiment.getGroupId())); assertThat(actualExperiment.getStatus(), is(expectedExperiment.getStatus())); assertThat(actualExperiment.getAudienceIds(), is(expectedExperiment.getAudienceIds())); - assertThat(actualExperiment.getAudienceConditions(), is(expectedExperiment.getAudienceConditions())); + assertEquals(actualExperiment.getAudienceConditions(), expectedExperiment.getAudienceConditions()); assertThat(actualExperiment.getUserIdToVariationKeyMap(), is(expectedExperiment.getUserIdToVariationKeyMap())); From 44b005b4feb59b83a2a5e190e6396b30d1998616 Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Thu, 23 Jun 2022 21:55:24 +0500 Subject: [PATCH 13/21] test again --- .github/workflows/java.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 62e6b3961..ae7380876 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -62,6 +62,8 @@ jobs: cache: 'gradle' - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 - name: run tests id: unit_tests env: From de01fad5ab8770ff6f1d216f441347c325647604 Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Thu, 23 Jun 2022 22:13:51 +0500 Subject: [PATCH 14/21] test --- .github/workflows/java.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index ae7380876..d1b7fdbf0 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -62,14 +62,11 @@ jobs: cache: 'gradle' - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - name: run tests id: unit_tests env: optimizely_default_parser: ${{ matrix.optimizely_default_parser }} run: | - ./gradlew clean ./gradlew test ./gradlew build - name: Check on failures From 12247908690942d6cec42d9ef871f2acfe95308b Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Thu, 23 Jun 2022 22:19:58 +0500 Subject: [PATCH 15/21] test --- .github/workflows/java.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index d1b7fdbf0..d95dd9add 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -63,19 +63,26 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: run tests - id: unit_tests + env: + optimizely_default_parser: ${{ matrix.optimizely_default_parser }} + run: | + ./gradlew clean + ./gradlew test + ./gradlew build + - name: run tests again due to some bug of gitAction + if: always() env: optimizely_default_parser: ${{ matrix.optimizely_default_parser }} run: | ./gradlew test ./gradlew build - name: Check on failures - if: steps.unit_tests.outcome != 'success' + if: always() && steps.unit_tests.outcome != 'success' run: | cat /home/runner/java-sdk/core-api/build/reports/findbugs/main.html cat /home/runner/java-sdk/core-api/build/reports/findbugs/test.html - name: Check on success - if: steps.unit_tests.outcome == 'success' + if: always() && steps.unit_tests.outcome == 'success' run: | ./gradlew coveralls uploadArchives --console plain From 8a131e4aa1a80139c8d48e9359835b2160a68b30 Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Thu, 23 Jun 2022 22:40:47 +0500 Subject: [PATCH 16/21] test --- .github/workflows/java.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index d95dd9add..6b93b82b7 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -46,7 +46,7 @@ jobs: test: if: startsWith(github.ref, 'refs/tags/') != true - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 strategy: fail-fast: false matrix: @@ -63,19 +63,13 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: run tests + id: unit_tests env: optimizely_default_parser: ${{ matrix.optimizely_default_parser }} run: | ./gradlew clean ./gradlew test ./gradlew build - - name: run tests again due to some bug of gitAction - if: always() - env: - optimizely_default_parser: ${{ matrix.optimizely_default_parser }} - run: | - ./gradlew test - ./gradlew build - name: Check on failures if: always() && steps.unit_tests.outcome != 'success' run: | From f8cd561ef9e467fbc3008c2ba93ffbc1520b712c Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Thu, 23 Jun 2022 22:50:45 +0500 Subject: [PATCH 17/21] test --- .../config/parser/JacksonConfigParserTest.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java b/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java index d06b08661..d9e3f5532 100644 --- a/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java +++ b/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java @@ -69,22 +69,16 @@ public void parseProjectConfigV3() throws Exception { verifyProjectConfig(actual, expected); } + @SuppressFBWarnings("NP_NULL_PARAM_DEREF") @Test - public void parseProjectConfigV4() { + public void parseProjectConfigV4() throws Exception { ProjectConfig actual = null; ProjectConfig expected= null; - try { - - JacksonConfigParser parser = new JacksonConfigParser(); - actual = parser.parseProjectConfig(validConfigJsonV4()); - expected = validProjectConfigV4(); - - verifyProjectConfig(actual, expected); + JacksonConfigParser parser = new JacksonConfigParser(); + actual = parser.parseProjectConfig(validConfigJsonV4()); + expected = validProjectConfigV4(); - } catch (Exception ex) { - System.out.println(ex.getMessage()); - verifyProjectConfig(actual, expected); - } + verifyProjectConfig(actual, expected); } @Test From 3d0a01d8d109da18a1a93c152e8655c07bc7833b Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Thu, 23 Jun 2022 22:55:27 +0500 Subject: [PATCH 18/21] changed ubuntu version to 18.04 from latest --- .github/workflows/build.yml | 2 +- .github/workflows/java.yml | 96 ++++++++++++++++++------------------- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7ba7782e..0cd965aad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ on: required: true jobs: run_build: - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - name: set up JDK 8 diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 6b93b82b7..f1b086d70 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -15,34 +15,34 @@ on: description: Set SNAPSHOT true to publish jobs: - # lint_markdown_files: - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v2 - # - name: Set up Ruby - # uses: ruby/setup-ruby@v1 - # with: - # ruby-version: '2.6' - # bundler-cache: true # runs 'bundle install' and caches installed gems automatically - # - name: Install gem - # run: | - # gem install awesome_bot - # - name: Run tests - # run: find . -type f -name '*.md' -exec awesome_bot {} \; + lint_markdown_files: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '2.6' + bundler-cache: true # runs 'bundle install' and caches installed gems automatically + - name: Install gem + run: | + gem install awesome_bot + - name: Run tests + run: find . -type f -name '*.md' -exec awesome_bot {} \; - # integration_tests: - # uses: optimizely/java-sdk/.github/workflows/integration_test.yml@master - # secrets: - # CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} - # TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} + integration_tests: + uses: optimizely/java-sdk/.github/workflows/integration_test.yml@master + secrets: + CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} + TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} - # fullstack_production_suite: - # uses: optimizely/java-sdk/.github/workflows/integration_test.yml@master - # with: - # FULLSTACK_TEST_REPO: ProdTesting - # secrets: - # CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} - # TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} + fullstack_production_suite: + uses: optimizely/java-sdk/.github/workflows/integration_test.yml@master + with: + FULLSTACK_TEST_REPO: ProdTesting + secrets: + CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} + TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} test: if: startsWith(github.ref, 'refs/tags/') != true @@ -80,26 +80,26 @@ jobs: run: | ./gradlew coveralls uploadArchives --console plain - # publish: - # if: startsWith(github.ref, 'refs/tags/') - # uses: optimizely/java-sdk/.github/workflows/build.yml@master - # with: - # action: ship - # travis_tag: ${GITHUB_REF#refs/*/} - # secrets: - # MAVEN_SIGNING_KEY_BASE64: ${{ secrets.MAVEN_SIGNING_KEY_BASE64 }} - # MAVEN_SIGNING_PASSPHRASE: ${{ secrets.MAVEN_SIGNING_PASSPHRASE }} - # MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} - # MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + publish: + if: startsWith(github.ref, 'refs/tags/') + uses: optimizely/java-sdk/.github/workflows/build.yml@master + with: + action: ship + travis_tag: ${GITHUB_REF#refs/*/} + secrets: + MAVEN_SIGNING_KEY_BASE64: ${{ secrets.MAVEN_SIGNING_KEY_BASE64 }} + MAVEN_SIGNING_PASSPHRASE: ${{ secrets.MAVEN_SIGNING_PASSPHRASE }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} - # snapshot: - # if: ${{ github.event.inputs.SNAPSHOT == 'true' && github.event_name == 'workflow_dispatch' }} - # uses: optimizely/java-sdk/.github/workflows/build.yml@master - # with: - # action: ship - # travis_tag: BB-SNAPSHOT - # secrets: - # MAVEN_SIGNING_KEY_BASE64: ${{ secrets.MAVEN_SIGNING_KEY_BASE64 }} - # MAVEN_SIGNING_PASSPHRASE: ${{ secrets.MAVEN_SIGNING_PASSPHRASE }} - # MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} - # MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + snapshot: + if: ${{ github.event.inputs.SNAPSHOT == 'true' && github.event_name == 'workflow_dispatch' }} + uses: optimizely/java-sdk/.github/workflows/build.yml@master + with: + action: ship + travis_tag: BB-SNAPSHOT + secrets: + MAVEN_SIGNING_KEY_BASE64: ${{ secrets.MAVEN_SIGNING_KEY_BASE64 }} + MAVEN_SIGNING_PASSPHRASE: ${{ secrets.MAVEN_SIGNING_PASSPHRASE }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} From d39d529896e1edebc1987d46ace11bcf4289bc16 Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Thu, 23 Jun 2022 22:57:47 +0500 Subject: [PATCH 19/21] removing travis yml --- .travis.yml | 92 ------------------- .../parser/JacksonConfigParserTest.java | 6 +- 2 files changed, 2 insertions(+), 96 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index dcd12d58d..000000000 --- a/.travis.yml +++ /dev/null @@ -1,92 +0,0 @@ -language: java -dist: trusty -jdk: - - openjdk8 - - oraclejdk8 - - oraclejdk9 -install: true -env: - - optimizely_default_parser=GSON_CONFIG_PARSER - - optimizely_default_parser=JACKSON_CONFIG_PARSER - - optimizely_default_parser=JSON_CONFIG_PARSER - - optimizely_default_parser=JSON_SIMPLE_CONFIG_PARSER -script: - - "./gradlew clean" - - "./gradlew exhaustiveTest" - - "./gradlew build" - -cache: - gradle: true - directories: - - "$HOME/.gradle/caches" - - "$HOME/.gradle/wrapper" -branches: - only: - - master - - /^\d+\.\d+\.(\d|[x])+(-SNAPSHOT|-alpha|-beta)?\d*$/ # trigger builds on tags which are semantically versioned to ship the SDK. -after_success: - - ./gradlew coveralls uploadArchives --console plain -after_failure: - - cat /home/travis/build/optimizely/java-sdk/core-api/build/reports/findbugs/main.html - - cat /home/travis/build/optimizely/java-sdk/core-api/build/reports/findbugs/test.html - -# Integration tests need to run first to reset the PR build status to pending -stages: - - 'Source Clear' - - 'Lint markdown files' - - 'Integration tests' - - 'Full stack production tests' - - 'Test' - - 'Publish' - - 'Snapshot' - -jobs: - include: - - stage: 'Lint markdown files' - os: linux - language: generic - install: gem install awesome_bot - script: - - find . -type f -name '*.md' -exec awesome_bot {} \; - notifications: - email: false - - - &integrationtest - stage: 'Integration tests' - merge_mode: replace - env: SDK=java SDK_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH - cache: false - language: minimal - before_install: skip - install: skip - before_script: - - mkdir $HOME/travisci-tools && pushd $HOME/travisci-tools && git init && git pull https://$CI_USER_TOKEN@github.com/optimizely/travisci-tools.git && popd - script: - - $HOME/travisci-tools/trigger-script-with-status-update.sh - after_success: travis_terminate 0 - - - <<: *integrationtest - stage: 'Full stack production tests' - env: - SDK=java - SDK_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH - FULLSTACK_TEST_REPO=ProdTesting - - - stage: 'Source Clear' - if: type = cron - install: skip - before_script: skip - script: skip - after_success: skip - - - stage: 'Publish' - if: tag IS present - script: - - ./gradlew ship - after_success: skip - - - stage: 'Snapshot' - if: env(SNAPSHOT) = true and type = api - script: - - TRAVIS_TAG=BB-SNAPSHOT ./gradlew ship - after_success: skip diff --git a/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java b/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java index d9e3f5532..2e5dcb672 100644 --- a/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java +++ b/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java @@ -72,11 +72,9 @@ public void parseProjectConfigV3() throws Exception { @SuppressFBWarnings("NP_NULL_PARAM_DEREF") @Test public void parseProjectConfigV4() throws Exception { - ProjectConfig actual = null; - ProjectConfig expected= null; JacksonConfigParser parser = new JacksonConfigParser(); - actual = parser.parseProjectConfig(validConfigJsonV4()); - expected = validProjectConfigV4(); + ProjectConfig actual = parser.parseProjectConfig(validConfigJsonV4()); + ProjectConfig expected = validProjectConfigV4(); verifyProjectConfig(actual, expected); } From 4626cf7c17740ee1979a25016940857389a9439c Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Thu, 23 Jun 2022 23:05:07 +0500 Subject: [PATCH 20/21] reverted the changes --- .github/workflows/java.yml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index f1b086d70..bc866f898 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -1,4 +1,3 @@ - name: Java CI with Gradle on: @@ -50,25 +49,36 @@ jobs: strategy: fail-fast: false matrix: - jdk: [8, 11, 17] + jdk: [8, 9] optimizely_default_parser: [GSON_CONFIG_PARSER, JACKSON_CONFIG_PARSER, JSON_CONFIG_PARSER, JSON_SIMPLE_CONFIG_PARSER] steps: - name: checkout - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + uses: actions/checkout@v2 + + - name: set up JDK ${{ matrix.jdk }} + uses: AdoptOpenJDK/install-jdk@v1 with: - distribution: 'temurin' - java-version: '11' - cache: 'gradle' + version: ${{ matrix.jdk }} + architecture: x64 + - name: Grant execute permission for gradlew run: chmod +x gradlew + + - name: Gradle cache + uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/buildSrc/**/*.kt') }} + - name: run tests id: unit_tests env: optimizely_default_parser: ${{ matrix.optimizely_default_parser }} run: | ./gradlew clean - ./gradlew test + ./gradlew exhaustiveTest ./gradlew build - name: Check on failures if: always() && steps.unit_tests.outcome != 'success' From 8c5dec91323672260425929e029ae38b4611ae69 Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Thu, 23 Jun 2022 23:09:09 +0500 Subject: [PATCH 21/21] revert --- core-api/src/main/java/com/optimizely/ab/Optimizely.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core-api/src/main/java/com/optimizely/ab/Optimizely.java b/core-api/src/main/java/com/optimizely/ab/Optimizely.java index f631caefb..51335ec4f 100644 --- a/core-api/src/main/java/com/optimizely/ab/Optimizely.java +++ b/core-api/src/main/java/com/optimizely/ab/Optimizely.java @@ -15,7 +15,6 @@ ***************************************************************************/ package com.optimizely.ab; - import com.optimizely.ab.annotations.VisibleForTesting; import com.optimizely.ab.bucketing.Bucketer; import com.optimizely.ab.bucketing.DecisionService;