Fix property merging order & separate keen from non-keen

keenlabs / KeenClient-Java

Official Java client for the Keen IO API. Build analytics features directly into your Java apps.

https://keen.io/docs

MIT License

74 stars 43 forks source link

Fix property merging order & separate keen from non-keen #70

Closed louiszuckerman closed 8 years ago

louiszuckerman commented 8 years ago

Merge properties in order from lowest to highest priority: static globals, dynamic globals, per-event
Separate merging of keen properties from globals so they are merged by the same priority as event properties

Upstream issue keenlabs/KeenClient-Java#66

dkador commented 8 years ago

Thanks for the PR! Looks good. We're going to have to release this as a new major version, as it's a breaking change (I think it's the right change, but it is different behavior). Here are a couple requests for you:

fix up the travis build by merging master back into this PR.
bump the version number to 3.0.0 in gradle.properties
update the README

louiszuckerman commented 8 years ago

Travis is aware of the build error: https://github.com/travis-ci/travis-ci/issues/5669

dkador commented 8 years ago

Okay, I'm going to merge this. My prediction is travis will somehow be okay with this run once it's merged. Let's give it a shot.