Skip to content
This repository has been archived by the owner on May 30, 2024. It is now read-only.

prepare 7.3.0 release #323

Merged
merged 1,420 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1420 commits
Select commit Hold shift + click to select a range
1cc6775
update comment to clarify that level() doesn't apply to SLF4J
eli-darkly Jul 28, 2022
caf0e10
update readme to mention different logging examples in hello-java
eli-darkly Jul 28, 2022
7617814
switch to use snapshot build of java-logging, pending next release
eli-darkly Jul 28, 2022
bc926fa
level setting does not apply to SLF4J and JUL
eli-darkly Jul 28, 2022
21cb4d3
Merge branch 'logging' into eb/sc-138971/logging
eli-darkly Jul 28, 2022
a02e8cb
Merge branch 'main' into 6.0
eli-darkly Jul 28, 2022
b65dc18
Merge branch '6.0' into eb/sc-157086/component-configurer
eli-darkly Jul 28, 2022
4a8af92
Merge branch 'eb/sc-157086/component-configurer' into eb/sc-157087/co…
eli-darkly Jul 28, 2022
6016bd6
Merge branch '6.0' into 6.0-logging
eli-darkly Jul 28, 2022
91cdbf5
Merge branch 'eb/sc-138971/logging' into 6.0-logging
eli-darkly Jul 28, 2022
3a4d018
use java-logging 1.1.0 release
eli-darkly Jul 28, 2022
d5c7fdc
make sure META-INF files are never mistaken for classes and relocated
eli-darkly Jul 28, 2022
d99a841
Merge pull request #361 from launchdarkly/eb/sc-161764/okhttp-version
eli-darkly Jul 28, 2022
b3b2703
Merge branch 'main' into eb/sc-138971/logging
eli-darkly Jul 28, 2022
e4dc34d
merge from public after release
Jul 28, 2022
af39f39
Merge pull request #318 from launchdarkly/eb/sc-138971/logging
eli-darkly Jul 28, 2022
6a20188
Merge pull request #358 from launchdarkly/eb/sc-156598/testdata-metho…
eli-darkly Jul 28, 2022
5ad2095
update shared data store test logic to pass ClientContext with logger
eli-darkly Jul 28, 2022
ed818bc
Merge pull request #362 from launchdarkly/eb/sc-138971/store-tests-lo…
eli-darkly Jul 28, 2022
3a54988
enable external javadoc links for com.launchdarkly.logging types
eli-darkly Jul 28, 2022
bb26529
use variable for dependency version
eli-darkly Jul 28, 2022
7757812
Merge pull request #363 from launchdarkly/eb/sc-138971/logging-javado…
eli-darkly Jul 28, 2022
6f946da
merge from public after release
Jul 29, 2022
7413443
Merge branch 'main' into 6.0-logging
eli-darkly Jul 29, 2022
ff3809a
Merge branch '6.0' into eb/sc-157086/component-configurer
eli-darkly Jul 29, 2022
5349366
Merge branch 'eb/sc-157086/component-configurer' into eb/sc-157087/co…
eli-darkly Jul 29, 2022
806646d
Merge branch '6.0' into eb/sc-156594/u2c-1-model
eli-darkly Jul 29, 2022
f628b66
Merge branch 'eb/sc-156594/u2c-1-model' into eb/sc-156594/u2c-2-eval-…
eli-darkly Jul 29, 2022
10ce6d8
Merge branch 'eb/sc-156594/u2c-2-eval-targets' into eb/sc-156594/u2c-…
eli-darkly Jul 29, 2022
fca2b0f
Merge branch 'eb/sc-156594/u2c-3-eval-clauses' into eb/sc-156594/u2c-…
eli-darkly Jul 29, 2022
a267691
Merge branch 'eb/sc-156594/u2c-4-eval-rollouts' into eb/sc-156594/u2c…
eli-darkly Jul 29, 2022
3bb8955
Merge branch 'eb/sc-156594/u2c-5-eval-segments' into eb/sc-156594/u2c…
eli-darkly Jul 29, 2022
afb9617
Merge branch 'eb/sc-156594/u2c-6-segment-recursion' into eb/sc-156593…
eli-darkly Jul 29, 2022
076bbdc
Merge branch 'eb/sc-156593/u2c-7-events-context' into eb/sc-156593/u2…
eli-darkly Jul 29, 2022
e809f0c
Merge branch 'eb/sc-156593/u2c-8-events-all' into eb/sc-159596/u2c-9-…
eli-darkly Jul 29, 2022
3f96aef
Merge branch 'eb/sc-159596/u2c-9-client-api' into eb/sc-156598/u2c-10…
eli-darkly Jul 29, 2022
688100e
Merge branch 'eb/sc-156598/u2c-10-test-data' into eb/sc-156592/event-…
eli-darkly Jul 29, 2022
d950e38
Merge branch 'eb/sc-156592/event-refactor-1' into eb/sc-156592/event-…
eli-darkly Jul 29, 2022
421c8c8
Merge branch 'eb/sc-156592/event-refactor-2-diag' into eb/sc-156592/e…
eli-darkly Jul 29, 2022
758a1c3
Merge branch 'eb/sc-156592/event-refactor-3-processor' into eb/sc-156…
eli-darkly Jul 29, 2022
535475f
Merge branch 'eb/sc-156592/event-refactor-4-http' into eb/sc-156592/e…
eli-darkly Jul 29, 2022
876d619
Merge branch 'eb/sc-156592/event-refactor-5-java7' into eb/sc-156592/…
eli-darkly Jul 29, 2022
8a0cb72
remove another Guava usage
eli-darkly Jul 29, 2022
f1f266a
make events test code independent of server-side data model
eli-darkly Jul 29, 2022
25ea2e6
Merge branch 'eb/sc-156592/event-refactor-6-isolate' into eb/sc-15659…
eli-darkly Jul 29, 2022
fa29cf2
fix flaky big segment status polling tests
eli-darkly Jul 29, 2022
6c29106
Merge pull request #366 from launchdarkly/eb/sc-162343/flaky-test
eli-darkly Jul 30, 2022
ffd969a
Merge branch 'main' into 6.0
eli-darkly Jul 30, 2022
c109e40
Merge branch '6.0' into eb/sc-156594/u2c-1-model
eli-darkly Jul 30, 2022
83ea3ea
Merge branch 'eb/sc-156594/u2c-1-model' into eb/sc-156594/u2c-2-eval-…
eli-darkly Jul 30, 2022
14dc6ae
Merge branch 'eb/sc-156594/u2c-2-eval-targets' into eb/sc-156594/u2c-…
eli-darkly Jul 30, 2022
d622d6e
Merge branch 'eb/sc-156594/u2c-3-eval-clauses' into eb/sc-156594/u2c-…
eli-darkly Jul 30, 2022
a7323d8
Merge branch 'eb/sc-156594/u2c-4-eval-rollouts' into eb/sc-156594/u2c…
eli-darkly Jul 30, 2022
7fdb22a
Merge branch 'eb/sc-156594/u2c-5-eval-segments' into eb/sc-156594/u2c…
eli-darkly Jul 30, 2022
aa2c52f
Merge branch 'eb/sc-156594/u2c-6-segment-recursion' into eb/sc-156593…
eli-darkly Jul 30, 2022
9bd756d
Merge branch 'eb/sc-156593/u2c-7-events-context' into eb/sc-156593/u2…
eli-darkly Jul 30, 2022
1420893
Merge branch 'eb/sc-156593/u2c-8-events-all' into eb/sc-159596/u2c-9-…
eli-darkly Jul 30, 2022
2a54090
Merge branch 'eb/sc-159596/u2c-9-client-api' into eb/sc-156598/u2c-10…
eli-darkly Jul 30, 2022
ca38572
Merge branch 'eb/sc-156598/u2c-10-test-data' into eb/sc-156592/event-…
eli-darkly Jul 30, 2022
3683ed2
Merge branch 'eb/sc-156592/event-refactor-1' into eb/sc-156592/event-…
eli-darkly Jul 30, 2022
5d50437
Merge branch 'eb/sc-156592/event-refactor-2-diag' into eb/sc-156592/e…
eli-darkly Jul 30, 2022
c34ee3d
fix benchmark code
eli-darkly Jul 30, 2022
e1ab1c0
Merge branch 'eb/sc-156592/event-refactor-3-processor' into eb/sc-156…
eli-darkly Jul 30, 2022
83dff69
Merge branch 'eb/sc-156592/event-refactor-4-http' into eb/sc-156592/e…
eli-darkly Jul 30, 2022
7d480f2
Merge branch 'eb/sc-156592/event-refactor-5-java7' into eb/sc-156592/…
eli-darkly Jul 30, 2022
8c9908a
Merge branch 'eb/sc-156592/event-refactor-6-isolate' into eb/sc-15659…
eli-darkly Jul 30, 2022
8a8c240
update benchmarks
eli-darkly Jul 30, 2022
ee9593d
javadoc formatting
eli-darkly Jul 30, 2022
fbeb610
javadocs
eli-darkly Jul 30, 2022
09638bd
undo accidental reversion
eli-darkly Aug 2, 2022
c2e6028
remove some more stray references to java-server-sdk test helper code
eli-darkly Aug 2, 2022
75447c8
Merge branch 'eb/sc-156592/event-refactor-6-isolate' into eb/sc-15659…
eli-darkly Aug 2, 2022
2223aef
Merge pull request #359 from launchdarkly/eb/sc-157086/component-conf…
eli-darkly Aug 2, 2022
a65e29c
Merge pull request #360 from launchdarkly/eb/sc-157087/concrete-configs
eli-darkly Aug 2, 2022
dcfbcf0
more efficient equals() and hashCode() for Operator
eli-darkly Aug 3, 2022
fcc62e6
Merge pull request #340 from launchdarkly/eb/sc-156594/u2c-1-model
eli-darkly Aug 3, 2022
c04ad85
Merge pull request #341 from launchdarkly/eb/sc-156594/u2c-2-eval-tar…
eli-darkly Aug 3, 2022
17ce43b
Merge pull request #342 from launchdarkly/eb/sc-156594/u2c-3-eval-cla…
eli-darkly Aug 3, 2022
2896497
Merge pull request #343 from launchdarkly/eb/sc-156594/u2c-4-eval-rol…
eli-darkly Aug 4, 2022
b0dfafb
method can be static
eli-darkly Aug 4, 2022
7c774d3
Merge pull request #344 from launchdarkly/eb/sc-156594/u2c-5-eval-seg…
eli-darkly Aug 4, 2022
96e53ae
Merge branch '6.0' into eb/sc-156594/u2c-6-segment-recursion
eli-darkly Aug 4, 2022
e2234c5
Merge branch 'eb/sc-156594/u2c-6-segment-recursion' into eb/sc-156593…
eli-darkly Aug 4, 2022
b2a15ef
Merge branch 'eb/sc-156593/u2c-7-events-context' into eb/sc-156593/u2…
eli-darkly Aug 4, 2022
710ce60
Merge branch 'eb/sc-156593/u2c-8-events-all' into eb/sc-159596/u2c-9-…
eli-darkly Aug 4, 2022
14cf966
Merge branch 'eb/sc-159596/u2c-9-client-api' into eb/sc-156598/u2c-10…
eli-darkly Aug 4, 2022
f618309
Merge branch 'eb/sc-156598/u2c-10-test-data' into eb/sc-156592/event-…
eli-darkly Aug 4, 2022
67e4877
Merge branch 'eb/sc-156592/event-refactor-1' into eb/sc-156592/event-…
eli-darkly Aug 4, 2022
6e38390
Merge branch 'eb/sc-156592/event-refactor-2-diag' into eb/sc-156592/e…
eli-darkly Aug 4, 2022
5ee69e0
Merge branch 'eb/sc-156592/event-refactor-3-processor' into eb/sc-156…
eli-darkly Aug 4, 2022
1def6f4
Merge branch 'eb/sc-156592/event-refactor-4-http' into eb/sc-156592/e…
eli-darkly Aug 4, 2022
61eaccb
Merge branch 'eb/sc-156592/event-refactor-5-java7' into eb/sc-156592/…
eli-darkly Aug 4, 2022
6717251
Merge branch 'eb/sc-156592/event-refactor-6-isolate' into eb/sc-15659…
eli-darkly Aug 4, 2022
7219363
Merge pull request #345 from launchdarkly/eb/sc-156594/u2c-6-segment-…
eli-darkly Aug 5, 2022
803f401
Merge pull request #348 from launchdarkly/eb/sc-156593/u2c-7-events-c…
eli-darkly Aug 5, 2022
c2afeb5
clarify comment
eli-darkly Aug 5, 2022
93f400b
typo
eli-darkly Aug 5, 2022
bf67a39
Merge pull request #349 from launchdarkly/eb/sc-156593/u2c-8-events-all
eli-darkly Aug 18, 2022
d84b5ad
Merge pull request #350 from launchdarkly/eb/sc-159596/u2c-9-client-api
eli-darkly Aug 18, 2022
e383fca
Merge pull request #351 from launchdarkly/eb/sc-156598/u2c-10-test-data
eli-darkly Aug 18, 2022
878bea2
Merge pull request #353 from launchdarkly/eb/sc-156592/event-refactor-1
eli-darkly Aug 23, 2022
0212341
Merge branch 'eb/sc-156598/u2c-10-test-data' into 6.0
eli-darkly Aug 25, 2022
14e361a
remove event logic, migrate to using java-sdk-internal
eli-darkly Aug 25, 2022
433b43a
adjust for API change
eli-darkly Aug 25, 2022
ac34290
use constant
eli-darkly Aug 25, 2022
56d019d
fix packaging tests
eli-darkly Aug 25, 2022
e16ba1d
remove inapplicable benchmarks
eli-darkly Aug 25, 2022
eb505a4
Merge pull request #368 from launchdarkly/eb/sc-156592/event-refactor…
eli-darkly Aug 26, 2022
34a1698
Merge pull request #355 from launchdarkly/eb/sc-156592/event-refactor…
eli-darkly Aug 26, 2022
7b38aa4
Merge pull request #356 from launchdarkly/eb/sc-156592/event-refactor…
eli-darkly Aug 26, 2022
a9c6dd9
Merge pull request #357 from launchdarkly/eb/sc-156592/event-refactor…
eli-darkly Aug 26, 2022
3d089c0
add error message if makefile can't run
eli-darkly Aug 26, 2022
2ce2201
Merge pull request #364 from launchdarkly/eb/sc-156592/event-refactor…
eli-darkly Aug 29, 2022
8260813
Merge pull request #367 from launchdarkly/eb/sc-156592/event-refactor…
eli-darkly Aug 29, 2022
1615580
Merge pull request #369 from launchdarkly/eb/sc-156592/use-sdk-internal
eli-darkly Aug 29, 2022
efdf67c
force result to be "not in experiment" if bucketing calculation faile…
eli-darkly Aug 30, 2022
e8dbc16
use newer HTTP/TCP test helpers
eli-darkly Aug 30, 2022
7ad115b
Update Windows orb, fix Windows JDK install in CI (#372)
aengelberg Aug 30, 2022
f7ad37b
update snakeyaml for CVE-CVE-2022-25857
eli-darkly Sep 2, 2022
658cdc3
latest snakeyaml is 1.31
eli-darkly Sep 2, 2022
c2c6063
Merge pull request #373 from launchdarkly/eb/sc-167615/snakeyaml-update
eli-darkly Sep 2, 2022
2d4eec8
Merge branch 'main' of github.com:launchdarkly/java-server-sdk
eli-darkly Sep 2, 2022
8da0ef2
merge from public after release
Sep 2, 2022
0f86f7b
Merge pull request #370 from launchdarkly/eb/sc-166632/no-experiment-…
eli-darkly Sep 7, 2022
90d70d2
Merge pull request #371 from launchdarkly/eb/sc-166399/update-test-he…
eli-darkly Sep 7, 2022
decdb31
bump snakeyaml version for CVE-2022-38752
eli-darkly Sep 12, 2022
a612d96
Merge pull request #374 from launchdarkly/eb/sc-168802/snakeyaml-patch
eli-darkly Sep 12, 2022
d937330
merge from public after release
Sep 13, 2022
cd4a9bd
disable Windows Java 11 build
eli-darkly Oct 3, 2022
6eac0c0
Merge pull request #375 from launchdarkly/eb/sc-171428/no-windows-jav…
eli-darkly Oct 4, 2022
b7dd8a6
Merge branch 'main' into 6.0
eli-darkly Oct 4, 2022
c29476b
minor test updates for java-sdk-internal API changes
eli-darkly Oct 7, 2022
f382bac
Merge pull request #376 from launchdarkly/eb/sc-171019/json-diag-event
eli-darkly Oct 10, 2022
85b9720
fix packaging of com.launchdarkly.logging classes
eli-darkly Oct 14, 2022
52ba6b3
rm debugging
eli-darkly Oct 14, 2022
f4cc631
reconsidered - let's include the logging classes in the jars
eli-darkly Oct 14, 2022
78d1540
fix packaging test logic
eli-darkly Oct 14, 2022
b787f60
correct documentation
eli-darkly Oct 20, 2022
8eaf967
Merge pull request #377 from launchdarkly/eb/sc-173058/packaging
eli-darkly Oct 21, 2022
d5ffd47
merge from public after release
Oct 21, 2022
900482e
Merge branch 'main' into 6.0
eli-darkly Oct 21, 2022
3197c49
remove secondary meta-attribute
eli-darkly Oct 21, 2022
b3a34a2
rm obsolete references to UserAttribute
eli-darkly Oct 21, 2022
287b8fe
Merge pull request #378 from launchdarkly/eb/sc-156589/no-secondary
eli-darkly Oct 21, 2022
296f85d
support passing LDUser instead of LDContext in all SDK methods (#379)
eli-darkly Nov 22, 2022
75887a7
Merge branch 'main' of github.com:launchdarkly/java-server-sdk
eli-darkly Dec 1, 2022
224a519
Merge branch '6.0'
eli-darkly Dec 1, 2022
823bf59
update java-sdk-common dependency
eli-darkly Dec 1, 2022
05d8b33
use okhttp-eventsource 3.0.0-SNAPSHOT
eli-darkly Dec 2, 2022
3c69684
use non-snapshot okhttp-eventsource
eli-darkly Dec 2, 2022
eaa4b8c
include nested segment references in dependency update checks
eli-darkly Dec 5, 2022
9d248f2
use java-sdk-internal 1.0.0
eli-darkly Dec 5, 2022
7144179
Merge branch 'main' into eb/sc-162314/update-eventsource
eli-darkly Dec 5, 2022
f5a117f
Merge pull request #380 from launchdarkly/eb/sc-162314/update-eventso…
eli-darkly Dec 6, 2022
18cadfb
Merge pull request #382 from launchdarkly/eb/sc-156595/nested-segment…
eli-darkly Dec 6, 2022
1038c8e
remove SLF4J dependency, remove "all" jar, simplify build (#381)
eli-darkly Dec 6, 2022
6c8c03f
don't generate evaluation events for invalid context
eli-darkly Dec 6, 2022
a76d4c4
Merge pull request #383 from launchdarkly/eb/sc-156594/no-eval-event-…
eli-darkly Dec 6, 2022
61e8088
Merge branch 'main' of github.com:launchdarkly/java-server-sdk
eli-darkly Dec 7, 2022
ca31d39
use synchronous EventSource
eli-darkly Dec 17, 2022
50889d2
comments
eli-darkly Dec 17, 2022
a44644a
revise implementation of special HTTP configurations test
eli-darkly Dec 19, 2022
55cecdf
make sure we set readTimeout last
eli-darkly Dec 19, 2022
8686704
use okhttp-eventsource 4.0.0
eli-darkly Dec 20, 2022
1be7630
Merge pull request #384 from launchdarkly/eb/sc-180984/sync-eventsource
eli-darkly Dec 20, 2022
6071318
merge from public after release
Dec 20, 2022
5852110
use newer HTTP test helpers (#385)
eli-darkly Dec 20, 2022
acf7e58
use synchronous EventSource (5.x backport)
eli-darkly Dec 20, 2022
4640f10
Merge pull request #386 from launchdarkly/eb/sc-180984/sync-eventsour…
eli-darkly Dec 20, 2022
5769012
merge from public after release
Dec 21, 2022
ed2d9c5
Merge branch 'main' of github.com:launchdarkly/java-server-sdk
eli-darkly Dec 21, 2022
6ab43d2
update Gradle to 7.6 + fix snapshot releases
eli-darkly Dec 31, 2022
fd3d257
Merge pull request #387 from launchdarkly/eb/sc-107787/gradle-update
eli-darkly Jan 3, 2023
ed0d0c5
fix #288 (#289)
antonmos Jan 4, 2023
b44afc0
Merge branch 'contrib' of github.com:launchdarkly/java-server-sdk
eli-darkly Jan 4, 2023
7f979f4
add unit test for externally-contributed YAML security fix
eli-darkly Jan 4, 2023
288159d
backport YAML CVE fix from 6.x
eli-darkly Jan 4, 2023
422ef21
Merge pull request #388 from launchdarkly/eb/sc-182242/yaml-cve-test
eli-darkly Jan 4, 2023
8e124ed
Merge pull request #389 from launchdarkly/eb/sc-182242/yaml-cve-5.x
eli-darkly Jan 4, 2023
a45cf00
Merge branch '5.x'
eli-darkly Jan 4, 2023
1d48c9c
prepare 5.10.5 release (#290)
LaunchDarklyReleaseBot Jan 4, 2023
fa22907
Releasing version 5.10.5
Jan 4, 2023
734ba2e
merge from public after release
Jan 4, 2023
5d5d62e
Merge branch '5.x'
eli-darkly Jan 4, 2023
0978dbf
Merge branch 'main' of github.com:launchdarkly/java-server-sdk
eli-darkly Jan 4, 2023
ca7fc44
don't allow uncaught RuntimeException on stream thread and don't repo…
eli-darkly Jan 6, 2023
6f77b97
Merge pull request #390 from launchdarkly/eb/sc-182728/no-error-on-st…
eli-darkly Jan 6, 2023
45f3f2c
prepare 5.10.6 release (#292)
LaunchDarklyReleaseBot Jan 6, 2023
277727b
Releasing version 5.10.6
Jan 6, 2023
d2c8e7b
merge from public after release
Jan 6, 2023
dc8792c
Merge branch '5.x'
eli-darkly Jan 6, 2023
06dc932
Merge branch 'main' of github.com:launchdarkly/java-server-sdk
eli-darkly Jan 6, 2023
fc3f660
don't log a JSON error if the stream closes while we're parsing an ev…
eli-darkly Jan 10, 2023
66c660c
prepare 5.10.7 release (#294)
LaunchDarklyReleaseBot Jan 10, 2023
6e5abed
Releasing version 5.10.7
Jan 10, 2023
70d0a01
merge from public after release
Jan 10, 2023
d84616a
Merge branch '5.x'
eli-darkly Jan 10, 2023
9c2b9ec
Merge branch 'main' of github.com:launchdarkly/java-server-sdk
eli-darkly Jan 10, 2023
792d94a
merge from public after release
Jan 10, 2023
f83dcde
fix: segment cycle detection
louis-launchdarkly Jan 30, 2023
5c6bcb0
Merge pull request #392 from launchdarkly/lc/sc-185539/fix-segment-cy…
louis-launchdarkly Jan 30, 2023
87b96c4
merge from public after release
Feb 1, 2023
e7e1ddb
Currently passing harness tests, but need to clean up query param cod…
tanderson-ld Mar 13, 2023
2e4d9a1
Minor changes moving helper function into internal repo
tanderson-ld Mar 15, 2023
4cf8c6b
chore: bump snakeyaml
louis-launchdarkly Mar 16, 2023
a3132f3
fix: Yaml constructor
louis-launchdarkly Mar 16, 2023
236692c
Additional unit tests for filtering and cleaning up
tanderson-ld Mar 17, 2023
8d68e25
Merge pull request #394 from launchdarkly/lc/sc-192272/try-2.0
tanderson-ld Mar 20, 2023
a5a1564
merge from public after release
Mar 20, 2023
b8ea3d2
Bumping java-sdk-internal
tanderson-ld Mar 21, 2023
03a408d
Merge pull request #395 from launchdarkly/ta/sc-191398/support-flag-f…
tanderson-ld Mar 21, 2023
864cabf
Merge branch 'main' of github.com:launchdarkly/java-server-sdk
louis-launchdarkly Mar 23, 2023
8eb0847
Merge branch 'main' of github.com:launchdarkly/java-server-sdk
louis-launchdarkly Apr 11, 2023
c737ec8
merge from public after release
Apr 13, 2023
a05776d
updates daily flag number
ember-stevens Jun 6, 2023
57271ad
[sc-205159] Update README with current number of flags served (#397)
ember-stevens Jun 8, 2023
84fb571
feat: Add ability to set custom headers (#398)
keelerm84 Jun 12, 2023
330b91a
merge from public after release
Jun 13, 2023
ad7b727
chore: bump guava to address CVE-2023-2976
louis-launchdarkly Jun 23, 2023
eb18cf2
Add file CODEOWNERS
ld-repository-standards[bot] Jun 26, 2023
db29d1c
Add file CODEOWNERS (#400)
kparkinson-ld Jun 26, 2023
898119e
Bumping java-sdk-internal dependency to incorporate Guava CVE fixes.
tanderson-ld Jun 27, 2023
1660c48
chore: bump guava to address CVE-2023-2976 (#399)
tanderson-ld Jun 27, 2023
183c95b
merge from public after release
Jun 29, 2023
d1ad215
chore: Improve contract test performance. (#402)
kinyoklion Aug 30, 2023
db297c9
chore: Fix windows CI build. (#403)
kinyoklion Aug 30, 2023
5dc81ee
feat!: Add support for technology migrations. (#419)
kinyoklion Oct 12, 2023
0d1cf73
merge from public after release
Oct 16, 2023
6088ac3
feat: Allow configuring wrapper properties from an existing configura…
kinyoklion Nov 2, 2023
747f1ea
fix: Verify wrapperInfo is present before attempting to copy. (#423)
kinyoklion Nov 2, 2023
797cb86
merge from public after release
Nov 2, 2023
db2ea82
chore: propagating NPE fix from common
tanderson-ld Nov 14, 2023
f54d6c1
chore: propagating NPE fix from common (#425)
tanderson-ld Nov 14, 2023
d9ce5c8
merge from public after release
Nov 14, 2023
2106a05
feat: adds LDReactorClient for adapting LDClient to reactor ecosystem
tanderson-ld Feb 1, 2024
eb1c083
chore: adding documentation and adjusting some dependencies for alpha
tanderson-ld Feb 5, 2024
22c2c33
chore: fixing checkstyle errors
tanderson-ld Feb 5, 2024
6623698
fix: updating to use older version of reactor-core for increased comp…
tanderson-ld Feb 5, 2024
f41f6d8
fix: changing reactor to optional
tanderson-ld Feb 6, 2024
e3c70c0
fix: adding optionals to classpath
tanderson-ld Feb 6, 2024
eac9db5
feat: incorporating feedback from customer
tanderson-ld Feb 7, 2024
2e43069
fix: removing unnecessary change related to test dependencies
tanderson-ld Feb 7, 2024
d81c9e4
fix: fixing javadoc failing on missing deps
tanderson-ld Feb 7, 2024
23cc280
feat: adds LDReactorClientInterface
tanderson-ld Feb 8, 2024
4e31a4d
fix: moving LDClientReactorInterface to integrations.reactor package
tanderson-ld Feb 8, 2024
fc53743
fix: adjusting LDReactorClient constructors to take in SDK key and co…
tanderson-ld Feb 9, 2024
7eac558
feat: adds LDReactorClient for adapting LDClient to reactor ecosystem…
tanderson-ld Feb 9, 2024
cda5ca3
Merge remote-tracking branch 'public/main'
tanderson-ld Feb 9, 2024
d88c8cd
merge from public after release
Feb 9, 2024
551f715
fix: Bump launchdarklyJavaSdkInternal to 1.3.0 (#427)
keelerm84 Mar 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ allprojects {
ext {
sdkBasePackage = "com.launchdarkly.sdk"
sdkBaseName = "launchdarkly-java-server-sdk"

// List any packages here that should be included in OSGi imports for the SDK, if they cannot
// be discovered by looking in our explicit dependencies.
systemPackageImports = [ "javax.net", "javax.net.ssl" ]
Expand All @@ -71,9 +71,9 @@ ext.versions = [
"commonsCodec": "1.15",
"gson": "2.8.9",
"guava": "32.0.1-jre",
"jackson": "2.11.2",
"jackson": "2.11.2",
"launchdarklyJavaSdkCommon": "2.1.1",
"launchdarklyJavaSdkInternal": "1.2.1",
"launchdarklyJavaSdkInternal": "1.3.0",
"launchdarklyLogging": "1.1.0",
"okhttp": "4.9.3", // specify this for the SDK build instead of relying on the transitive dependency from okhttp-eventsource
"okhttpEventsource": "4.1.0",
Expand Down Expand Up @@ -172,7 +172,7 @@ dependencies {
optional libraries.optional

internal libraries.internal

commonClasses "com.launchdarkly:launchdarkly-java-sdk-common:${versions.launchdarklyJavaSdkCommon}"
commonDoc "com.launchdarkly:launchdarkly-java-sdk-common:${versions.launchdarklyJavaSdkCommon}:sources"
}
Expand Down Expand Up @@ -521,7 +521,7 @@ jacocoTestCoverageVerification {
}
}
}

// General rule that we should expect 100% test coverage; exclude any methods that have overrides above
rule {
element = "METHOD"
Expand Down Expand Up @@ -584,7 +584,7 @@ publishing {
artifact sourcesJar
artifact javadocJar
artifact testJar

pom.withXml {
def root = asNode()
root.appendNode('description', 'Official LaunchDarkly SDK for Java')
Expand All @@ -602,7 +602,7 @@ nexusPublishing {
repositories {
sonatype {
username = ossrhUsername
password = ossrhPassword
password = ossrhPassword
}
}
}
Expand Down
30 changes: 16 additions & 14 deletions contract-tests/service/src/main/java/sdktest/TestService.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,32 +34,34 @@ public class TestService {
"tags",
"filtering",
"migrations",
"event-sampling"
"event-sampling",
"inline-context",
"anonymous-redaction"
};

static final Gson gson = new GsonBuilder().serializeNulls().create();

static final OkHttpClient client = new OkHttpClient();

private final Map<String, SdkClientEntity> clients = new ConcurrentHashMap<String, SdkClientEntity>();
private final AtomicInteger clientCounter = new AtomicInteger(0);
private final String clientVersion;

private TestService() {
LDClient dummyClient = new LDClient("", new LDConfig.Builder().offline(true).build());
clientVersion = dummyClient.version();
try {
dummyClient.close();
} catch (Exception e) {}
}

@SuppressWarnings("serial")
public static class BadRequestException extends Exception {
public BadRequestException(String message) {
super(message);
}
}

public static void main(String[] args) throws Exception {
TestService service = new TestService();

Expand All @@ -70,7 +72,7 @@ public static void main(String[] args) throws Exception {
.addRegex("POST", Pattern.compile("/clients/(.*)"), ctx -> service.postClientCommand(diableKeepAlive(ctx)))
.addRegex("DELETE", Pattern.compile("/clients/(.*)"), ctx -> service.deleteClient(diableKeepAlive(ctx)));

HttpServer server = HttpServer.start(PORT, router);
HttpServer server = HttpServer.start(PORT, router);
server.getRecorder().setEnabled(false); // don't accumulate a request log

System.out.println("Listening on port " + PORT);
Expand All @@ -97,21 +99,21 @@ private void forceQuit() {
System.out.println("Test harness has told us to quit");
System.exit(0);
}

private void postCreateClient(RequestContext ctx) {
CreateInstanceParams params = readJson(ctx, CreateInstanceParams.class);

String clientId = String.valueOf(clientCounter.incrementAndGet());
SdkClientEntity client = new SdkClientEntity(this, params);

clients.put(clientId, client);

ctx.addHeader("Location", "/clients/" + clientId);
}

private void postClientCommand(RequestContext ctx) {
CommandParams params = readJson(ctx, CommandParams.class);

String clientId = ctx.getPathParam(0);
SdkClientEntity client = clients.get(clientId);
if (client == null) {
Expand All @@ -131,9 +133,9 @@ private void postClientCommand(RequestContext ctx) {
client.logger.error("Unexpected exception: {}", e);
ctx.setStatus(500);
}
}
}
}

private void deleteClient(RequestContext ctx) {
String clientId = ctx.getPathParam(0);
SdkClientEntity client = clients.get(clientId);
Expand All @@ -143,11 +145,11 @@ private void deleteClient(RequestContext ctx) {
client.close();
}
}

private <T> T readJson(RequestContext ctx, Class<T> paramsClass) {
return gson.fromJson(ctx.getRequest().getBody(), paramsClass);
}

private void writeJson(RequestContext ctx, Object data) {
String json = gson.toJson(data);
Handlers.bodyJson(json).apply(ctx);
Expand Down