GitHub user kaspersorensen opened a pull request:

    https://github.com/apache/metamodel/pull/24

    METAMODEL-140 Elasticsearch support complex mappings

    My addition to #23:
    
     *  added an exclusion of a unittest on Java 6 / ES 0.x.
     * did a basic code formatting.
    
    If travis build is working based on this, then I thing we're ready to merge.

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/kaspersorensen/metamodel master

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/metamodel/pull/24.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #24
    
----
commit b7f609ac22f2a53dfe1b87eab02d2ec84a5ff7fe
Author: unknown <[email protected]>
Date:   2015-05-14T18:20:41Z

    changed ElasticSearchDataContext.java detectTable to iterate through the
    mappingMetaData and only parse the properties element
    
    changed ElasticSearchMetaDataParser.java parse to split on "}," so that it
    keeps the full description of a field with the field name, and adjusted
    getMetaDataFieldTupeFromMetaDataField to handle the presence of extra
    field descriptors and the edge case of the last field which will end with
    a "}"
    
    changed ElasticSearchMetaDataParserTest.java to test the case when a field
    has an extra descriptor by adding the index=not_analyzed tag to the
    message field in the metaDataInfo string

commit ec1aadd06910551b211132de99a82649feb2ec72
Author: unknown <[email protected]>
Date:   2015-05-14T19:32:23Z

    added ElasticSearchDataContextNonDynamicMappingTest.java to test cases
    when there are objects at the same level as the properties object

commit 159cb6a9b24a146af2341bd48ed2e6f2c569527b
Author: unknown <[email protected]>
Date:   2015-05-14T19:45:15Z

    removed unnecessary line from test

commit 8b913cc915a03711b9826ddd4fa5bb01b235725b
Author: unknown <[email protected]>
Date:   2015-05-14T20:11:38Z

    moved new test to ElasticSearchDataContextTest.java so that code would
    compile with RAT licence issues

commit 70f649a313078bcce7aadb81f0d59e66a7d5ab59
Author: Kasper Sørensen <[email protected]>
Date:   2015-05-20T19:43:03Z

    Merge remote-tracking branch 'maphysics/master'

commit 4ef40c71824e5877a795258d21fd0079a7643337
Author: Kasper Sørensen <[email protected]>
Date:   2015-05-20T19:47:02Z

    Added programmatic exclusion of unittest on ES 0.x

commit 3090c8f2be31d5b1996cc5b2aca82c101d2fd792
Author: Kasper Sørensen <[email protected]>
Date:   2015-05-20T19:47:50Z

    Code format

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---

Reply via email to