Skip to content

Commit

Permalink
Feature/2.0.0 (#576)
Browse files Browse the repository at this point in the history
* Feature/macro column names (#564)

* Fixing small implementation error.

* Publishing intermediary releaes for 2.0.0

* Name change

* More renaming.

* More renaming.

* More name change

* Replacing names.

* One more error.

* Changing orgs.

* Adding thrift support

* Moving samples.

* Compiling

* Re-badging contributions page.

* TravisCI: Bumping version to match CI definition [ci skip]

* Publishing to target branch only

* Feature/copy update (#566)

* Updating the copyright to the right ocmpany name

* removing duplicate colelctiosn methods

* Fixing error in time window compaction strategy.

* Unifying API

* Small fix

* Adding a deployment setting to target the first pro release.

* Updating release target instead of dependencies repo

* Bumping util version

* TravisCI: Bumping version to match CI definition [ci skip]

* Feature/license (#569)

* Adding a license.

* More license updates.

* More licensing

* More licensing

* Rest of the license

* Spacing things better

* Updating badges and license content

* Fixing refs

* TravisCI: Bumping version to match CI definition [ci skip]

* TravisCI: Bumping version to match CI definition [ci skip]

* Feature/time window compaction (#580)

* Adding compaction options

* Finishing the additiom of options

* Finalising implementation of time window compaction.

* TravisCI: Bumping version to match CI definition [ci skip]

* Feature/no key types (#583)

* Removing type parameters from labels

* Removing more Cassandra key types as they are not needed by the DSL

* Removing specialised implementations for enumerations.

* Using non nested type refs.

* Fixing type bounds and starting to add to the migration guide.

* Removing key types from everywhere

* Feature/cleanup (#584)

* Further small cleanup

* Adding a helper auxiliary.

* Adding missing test suite imeplemntation

* Adding unit tests

* Removing the duplicate description.

* Adding elements comparison to account for ordering

* Adding more of the missing tests.

* Fixing small missing bit

* TravisCI: Bumping version to match CI definition [ci skip]

* Feature/time window compaction (#586)

* Adding compaction options

* Finishing the additiom of options

* Finalising implementation of time window compaction.

* Adding the ability to set the timestamp resolution in TWCS

* Simplfying and adding more tests for serialising compaction strategies.

* Further simplifying tests

* TravisCI: Bumping version to match CI definition [ci skip]

* Feature/tuple macros (#578)

* Adding gettables by name and index.

* Adding term names to tuples

* Mapping tuple types.

* Fixing implementation of tuple types.

* OOps

* Adding more tests for a tuple column.

* Adding tests for nested tuples.

* Adding ability for primitives to freeze columns.

* Renaming Cassandra operations and removing shapeless based extractors.

* Fixing tuple type inside collections.

* Adding simple debugging.

* Small indentation fix

* Small unrelated style change

* More styling

* Fixed support of collection type tuple columns

* Small fix and adding more adopters [ci skip]

* fixing potentially flaky test by compensating for the time skew (#590)

* TravisCI: Bumping version to match CI definition [ci skip]

* Feature/type tree caches (#591)

* Small fixes for codacy reviews

* Small codacy review items

* Small spacing

* Adding a trie map caching layer for macro materialized primitives.

* removing reference tothe eold name

* Adding map primitive caching with the correct method call

* TravisCI: Bumping version to match CI definition [ci skip]

* Feature/from row macro (#592)

* Trying to add macro tree expansion guards for fromRows that won't compile

* Adding a type alias to prevent compilations from breaking

* Manual merge of fix

* Adding macro inference

* More work to bullet rpoof macro

* Further upgrade work to macroapi

* Removing manual fromRow method definitions.

* Fixing a small error

* Adding a small docs mention

* Removing unecessary abstract

* Moving table key inference to compile time

* Fixing macro implementation problem

* Fixing Macro api

* Finalising implementation of fromRow derived macro

* Fixing more implementation details.

* Adding a way to discover reference table

* Fixing macro discovery of columns.

* Small change

* Fixing one method generation

* Further simplification

* Trying to fix database instantiation problem

* Further restructuring table name expansion.

* Removing all the bad compiler time casts

* TravisCI: Bumping version to match CI definition [ci skip]

* Merging in all remote changes

* TravisCI: Bumping version to match CI definition [ci skip]

* Adding the ability to map records lazily and paginate them (#572)

* Adding the ability to map records lazily and paginate them

* Fixing compilation errors.

* Adding logging configuration

* Fixed type on provider instance variable (#581)

* TravisCI: Bumping version to match CI definition [ci skip]

* Adding a 2.0 roadmap description [ci skip]

* Adding more details about 2.0.0 release [ci skip]

* Add support for Jdk8 LocalDateTime (#593)

* TravisCI: Bumping version to match CI definition [ci skip]

* Updating version to correct setup of 1.29.5 [ci skip] (#594)

* Adding missing comment

* Removing snapshot resolver

* Reverting macro changeset accidentally leaked (#596)

* Removing macros, re-adding correct dep, removing custom resolver.

* Small adjustments

* Fixing the 2 broken tests.

* Fixing generators

* Fixing compilation error

* Adding table name variabe to prevent issues

* Adding an error handler.

* Adding a dual variant test

* Adding more safe guards

* Using macro type comparison symbol instead of equality checking

* Removing redundant conversions

* Fixing indenation [ci skip]

* Feature/scala 2.12 (#598)

* Preparing 2.12 build

* Adding Scala 2.12 build setup

* Adding Scala 2.12 JSON serialisaton support

* Fixing serialisation tests.

* Adding 2.12 compatible scalacOptions

* Fixing phantom build for 2.12

* Fixing the basic ocmmand used to publish the 2.12 version

* Changing import to fix testing

* Using different version of twitter util

* Removing test arguments as they break Scala 2.12

* Adding a different execution command

* Running setup for scala 2.11.8 instead

* Trying command alias

* Renaming module and adding a compatibility table

* Fixing small markdown issue [ci skip]

* Bumping deps to fix JDK7 issue with util-testing bringing in wrong version of Twitter uti

* Bumping the version

* Changing test runner to 2.11.8 only

* Adding README update and resolving conflict.

* Reverting accidental changes back

* TravisCI: Bumping version to match CI definition [ci skip]

* Feature/docs (#601)

* Adding a docs folder.

* Adding more docs

* Updating the readme

* Fixing the module compatibility table.

* Removing more manually implemented fromRow definitions

* Simplifying implementation again

* Further fixes to docs

* Adding tests for the macro generating table tests

* TravisCI: Bumping version to match CI definition [ci skip]

* Feature/autogen store (#604)

* Macro generating a store method

* Using a hard type to extract name information at the same time as type info

* Adding ability to generate extractors for partially matched column subsets

* Simplifying type tree printing

* Changing method name and adding mocks

* Moving definition of classes outside of test to prevent scope for intefering

* Changing tes

* Adding an Artima plugin

* Removing offending plugin

* Improving compile time logging information.
  • Loading branch information
alexflav23 committed Dec 30, 2016
1 parent 9ebd655 commit 752dda5
Show file tree
Hide file tree
Showing 372 changed files with 11,410 additions and 12,925 deletions.
6 changes: 2 additions & 4 deletions .gitignore
Expand Up @@ -21,6 +21,8 @@ java_pid*

# InteliJ IDEA
*.iml
.idea_modules/
.idea/

# sbt specific
dist/*
Expand All @@ -35,7 +37,3 @@ project/plugins/project/

# MacOS X specific
.DS_Store

#InteliJ
.idea_modules/
.idea/
7 changes: 6 additions & 1 deletion .travis.yml
Expand Up @@ -32,14 +32,19 @@ jdk:
- oraclejdk7
- oraclejdk8

matrix:
include:
- scala: 2.12.0
jdk: oraclejdk8

addons:
apt:
packages:
- oracle-java8-installer

before_install: unset SBT_OPTS JVM_OPTS

before_script: travis_retry sbt ++$TRAVIS_SCALA_VERSION update
before_script: travis_retry sbt "plz $TRAVIS_SCALA_VERSION update"

install:
- pip install 'requests[security]'
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
@@ -1,6 +1,6 @@
phantom [![Build Status](https://travis-ci.org/websudos/phantom.svg?branch=develop)](https://travis-ci.org/websudos/phantom)

==============
phantom
[![Build Status](https://travis-ci.org/outworkers/phantom.svg?branch=develop)](https://travis-ci.org/outworkers/phantom) [![Coverage Status](https://coveralls.io/repos/outworkers/phantom/badge.svg)](https://coveralls.io/r/outworkers/phantom) [![Codacy Rating](https://api.codacy.com/project/badge/grade/25bee222a7d142ff8151e6ceb39151b4)](https://www.codacy.com/app/flavian/phantom_2) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.outworkers/phantom-dsl_2.11/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.outworkers/phantom-dsl_2.11) [![Bintray](https://api.bintray.com/packages/websudos/oss-releases/phantom-dsl/images/download.svg) ](https://bintray.com/websudos/oss-releases/phantom-dsl/_latestVersion) [![ScalaDoc](http://javadoc-badge.appspot.com/com.outworkers/phantom-dsl_2.11.svg?label=scaladoc)](http://javadoc-badge.appspot.com/com.outworkers/phantom-dsl_2.11) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/outworkers/phantom?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
===============================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================
Reactive type-safe Scala DSL for Cassandra - Contributing to phantom


Expand Down
234 changes: 201 additions & 33 deletions LICENSE.txt
@@ -1,33 +1,201 @@
/*
* Copyright 2013-2016 Websudos, Limited.
*
* All rights reserved.
*
* Redistribution and use in source forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* - Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* - Redistributions of source code for the purpose of contribution to the source
* are wholly permitted via all available channels.
*
* - Redistributions in binary form to sources other than the official ones
* are only permitted with our explicit written consent.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {2013 - 2017} {outworkers ltd. "outworkers" is a registered trademark of outworkers ltd, Park Mansions Knightsbridge, London SW1X 7QT, United Kingdom}

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

0 comments on commit 752dda5

Please sign in to comment.