Skip to content

feature: add OptimizelyJSON #371

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

Merged
merged 26 commits into from
May 5, 2020
Merged

feature: add OptimizelyJSON #371

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
032c270
add OptimizelyJSON
jaeopt Apr 20, 2020
99014d2
clean up
jaeopt Apr 21, 2020
9de2535
add doc comments
jaeopt Apr 22, 2020
641d215
Merge branch 'master' into jae/optimizely-json
jaeopt Apr 22, 2020
69144a0
add more tests
jaeopt Apr 24, 2020
f319fdc
fix test
jaeopt Apr 24, 2020
096bcb9
(wip) add multiple parser support to OptimizelyJSON
jaeopt Apr 28, 2020
5be5f3f
split getvalue tests
jaeopt Apr 29, 2020
01970f5
disable getValue for legacy parsers
jaeopt Apr 29, 2020
2401784
add legacy parser tests
jaeopt Apr 29, 2020
afdb8be
fix tests for all parsers
jaeopt Apr 30, 2020
2952834
Merge branch 'master' into jae/optimizely-json
jaeopt Apr 30, 2020
24ed0d6
cleanup
jaeopt Apr 30, 2020
5d45085
fix findbugs issues
jaeopt Apr 30, 2020
2af6f14
cleanup
jaeopt Apr 30, 2020
b5db429
fix test per review
jaeopt May 1, 2020
b6fc66c
fix JsonSimple parser
jaeopt May 4, 2020
ef7963b
add unit tests for all parsers
jaeopt May 4, 2020
880111b
add unit tests for JsonHelpers
jaeopt May 5, 2020
14ace05
fix test types
jaeopt May 5, 2020
f0df4e2
refact json parser tests
jaeopt May 5, 2020
ceddf49
cleanup parser tests
jaeopt May 5, 2020
37efc58
cleanup
jaeopt May 5, 2020
8cd3b55
change to parameterized tests
jaeopt May 5, 2020
c92459f
fix merge conflict
jaeopt May 5, 2020
e5d792a
fix getValue destroy test
jaeopt May 5, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix merge conflict
  • Loading branch information
@jaeopt
jaeopt committed May 5, 2020
commit c92459fda91bb48a0ebe7b7f9b3a27d3227ee522
9 changes: 8 additions & 1 deletion core-api/src/test/java/com/optimizely/ab/config/parser/JsonConfigParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,14 @@
import java.util.List;
import java.util.Map;

import static com.optimizely.ab.config.DatafileProjectConfigTestUtils.*;
import static com.optimizely.ab.config.DatafileProjectConfigTestUtils.nullFeatureEnabledConfigJsonV4;
import static com.optimizely.ab.config.DatafileProjectConfigTestUtils.validConfigJsonV2;
import static com.optimizely.ab.config.DatafileProjectConfigTestUtils.validConfigJsonV4;
import static com.optimizely.ab.config.DatafileProjectConfigTestUtils.validProjectConfigV2;
import static com.optimizely.ab.config.DatafileProjectConfigTestUtils.validConfigJsonV3;
import static com.optimizely.ab.config.DatafileProjectConfigTestUtils.validProjectConfigV3;
import static com.optimizely.ab.config.DatafileProjectConfigTestUtils.validProjectConfigV4;
import static com.optimizely.ab.config.DatafileProjectConfigTestUtils.verifyProjectConfig;
import static org.junit.Assert.*;

/**
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.