Skip to content

Commit

Permalink
2.0-RELEASE - 08/20/2019
Browse files Browse the repository at this point in the history
* Complete rewrite to correspond to 4.0 OSS Datastax Driver
* Moved to annotation processing based code generation
* Split projects to separate spring, tests, and generator from core driver
* New Feature: FailoverPolicy to enable custom failover policies
* New Feature: Rest DAO generation
* New Hugo based manual - https://tmobile.github.io/casquatch/
* New Travis CI Integration - https://travis-ci.com/tmobile/casquatch
  • Loading branch information
tdl-jturner committed Aug 20, 2019
1 parent 1aede43 commit 88f9601
Show file tree
Hide file tree
Showing 312 changed files with 4,594 additions and 2,407 deletions.
2 changes: 1 addition & 1 deletion .admin/integration_tests
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export DATACENTER=dc1
export DATACENTER2=dc2
export KEYSPACE=fulltest
export OUTPUT=.admin/test.out
export VERSION=2.0-SNAPSHOT
export VERSION=2.0-RELEASE
export BASEDIR=`pwd`
export WORKER="docker run --rm --network cassandra_test_default -v $HOME/.m2/repository:/root/.m2/repository -v $BASEDIR:$BASEDIR -w $BASEDIR -it maven:latest"
export MVN="$WORKER mvn "
Expand Down
2 changes: 1 addition & 1 deletion casquatch-driver-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.tmobile.opensource.casquatch</groupId>
<artifactId>casquatch-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-RELEASE</version>
</parent>

<artifactId>casquatch-driver-processor</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion casquatch-driver-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.tmobile.opensource.casquatch</groupId>
<artifactId>casquatch-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-RELEASE</version>
</parent>

<artifactId>casquatch-driver-spring</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion casquatch-driver-tests/genmodels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Helper script to spin up docker and regenerate test models
#

VERSION=2.0-SNAPSHOT
VERSION=2.0-RELEASE
KEYSPACE=junittest
INSTANCE=casquatch-driver-tests
OUTPUT_FOLDER=src/test/java/com/tmobile/opensource/casquatch/tests/
Expand Down
2 changes: 1 addition & 1 deletion casquatch-driver-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.tmobile.opensource.casquatch</groupId>
<artifactId>casquatch-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-RELEASE</version>
</parent>

<artifactId>casquatch-driver-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion casquatch-driver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.tmobile.opensource.casquatch</groupId>
<artifactId>casquatch-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-RELEASE</version>
</parent>

<artifactId>casquatch-driver</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions casquatch-examples/.setup.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

PORT=$(( ( RANDOM % 300 ) + 9000 ))
GENERATOR=../../casquatch-generator/target/casquatch-generator-2.0-SNAPSHOT.jar
GENERATOR=../../casquatch-generator/target/casquatch-generator-2.0-RELEASE.jar
DOCKER_VERSION=cassandra:latest
TEST_COMMAND="mvn clean test"
RUN_COMMAND="mvn clean spring-boot:run"
Expand Down Expand Up @@ -73,4 +73,4 @@ echo "Generate Entity"
echo "---------------------------------------------"
java -Dconfig.file=src/main/resources/application.conf -jar $GENERATOR
mkdir -p src/test/java/com/tmobile/opensource/casquatch/examples/$NAME/
mv src/main/java/com/tmobile/opensource/casquatch/examples/$NAME/*EmbeddedTests.java src/test/java/com/tmobile/opensource/casquatch/examples/$NAME/
mv src/main/java/com/tmobile/opensource/casquatch/examples/$NAME/*EmbeddedTests.java src/test/java/com/tmobile/opensource/casquatch/examples/$NAME/
2 changes: 1 addition & 1 deletion casquatch-examples/loadtest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<description>Example Project integrating Casquatch for a Load Test app</description>

<properties>
<casquatch.version>2.0-SNAPSHOT</casquatch.version>
<casquatch.version>2.0-RELEASE</casquatch.version>
<java.version>1.8</java.version>
<start-class>com.tmobile.opensource.casquatch.examples.loadtest.LoadTestApplication</start-class>
<maven-compiler.version>3.8.1</maven-compiler.version>
Expand Down
2 changes: 1 addition & 1 deletion casquatch-examples/springconfigserver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<description>Example Project integrating Casquatch with Spring Config Server</description>

<properties>
<casquatch.version>2.0-SNAPSHOT</casquatch.version>
<casquatch.version>2.0-RELEASE</casquatch.version>
<java.version>1.8</java.version>
<spring-cloud.version>Greenwich.SR2</spring-cloud.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion casquatch-examples/springrest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<properties>
<java.version>1.8</java.version>
<casquatch.version>2.0-SNAPSHOT</casquatch.version>
<casquatch.version>2.0-RELEASE</casquatch.version>
<swagger.version>2.9.2</swagger.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion casquatch-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.tmobile.opensource.casquatch</groupId>
<artifactId>casquatch-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-RELEASE</version>
</parent>

<artifactId>casquatch-generator</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion casquatch-generator/src/main/resources/templates/pom.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.tmobile.opensource.casquatch</groupId>
<artifactId>casquatch-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-RELEASE</version>
</parent>

<artifactId>casquatch-generator-models-${keyspace}</artifactId>
Expand Down
16 changes: 8 additions & 8 deletions docs/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<title>404 Page not found</title>


<link href="/casquatch/css/nucleus.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/fontawesome-all.min.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/hybrid.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/featherlight.min.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/perfect-scrollbar.min.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/theme.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/hugo-theme.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/nucleus.css?1566337002" rel="stylesheet">
<link href="/casquatch/css/fontawesome-all.min.css?1566337002" rel="stylesheet">
<link href="/casquatch/css/hybrid.css?1566337002" rel="stylesheet">
<link href="/casquatch/css/featherlight.min.css?1566337002" rel="stylesheet">
<link href="/casquatch/css/perfect-scrollbar.min.css?1566337002" rel="stylesheet">
<link href="/casquatch/css/theme.css?1566337002" rel="stylesheet">
<link href="/casquatch/css/hugo-theme.css?1566337002" rel="stylesheet">

<link href="/casquatch/css/theme-casquatch.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/theme-casquatch.css?1566337002" rel="stylesheet">

<style>
:root #header + #content > #left > #rlblock_left {
Expand Down
97 changes: 66 additions & 31 deletions docs/categories/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@
<title>Categories :: Casquatch</title>


<link href="/casquatch/css/nucleus.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/fontawesome-all.min.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/hybrid.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/featherlight.min.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/perfect-scrollbar.min.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/auto-complete.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/atom-one-dark-reasonable.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/theme.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/hugo-theme.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/nucleus.css?1566337002" rel="stylesheet">
<link href="/casquatch/css/fontawesome-all.min.css?1566337002" rel="stylesheet">
<link href="/casquatch/css/hybrid.css?1566337002" rel="stylesheet">
<link href="/casquatch/css/featherlight.min.css?1566337002" rel="stylesheet">
<link href="/casquatch/css/perfect-scrollbar.min.css?1566337002" rel="stylesheet">
<link href="/casquatch/css/auto-complete.css?1566337002" rel="stylesheet">
<link href="/casquatch/css/atom-one-dark-reasonable.css?1566337002" rel="stylesheet">
<link href="/casquatch/css/theme.css?1566337002" rel="stylesheet">
<link href="/casquatch/css/hugo-theme.css?1566337002" rel="stylesheet">

<link href="/casquatch/css/theme-casquatch.css?1565804556" rel="stylesheet">
<link href="/casquatch/css/theme-casquatch.css?1566337002" rel="stylesheet">


<script src="/casquatch/js/jquery-3.3.1.min.js?1565804556"></script>
<script src="/casquatch/js/jquery-3.3.1.min.js?1566337002"></script>

<style>
:root #header + #content > #left > #rlblock_left{
Expand Down Expand Up @@ -53,14 +53,14 @@ <h4>Casquatch</h4>
<span data-search-clear=""><i class="fas fa-times"></i></span>
</div>

<script type="text/javascript" src="/casquatch/js/lunr.min.js?1565804556"></script>
<script type="text/javascript" src="/casquatch/js/auto-complete.js?1565804556"></script>
<script type="text/javascript" src="/casquatch/js/lunr.min.js?1566337002"></script>
<script type="text/javascript" src="/casquatch/js/auto-complete.js?1566337002"></script>
<script type="text/javascript">

var baseurl = "http:\/\/tmobile.github.io\/casquatch";

</script>
<script type="text/javascript" src="/casquatch/js/search.js?1565804556"></script>
<script type="text/javascript" src="/casquatch/js/search.js?1566337002"></script>


</div>
Expand Down Expand Up @@ -132,6 +132,25 @@ <h4>Casquatch</h4>










<li data-nav-id="/casquatch/overview/concepts/" title="Concepts" class="dd-item ">
<a href="/casquatch/overview/concepts/">
Concepts

</a>
</li>







</ul>

Expand Down Expand Up @@ -526,9 +545,9 @@ <h4>Casquatch</h4>



<li data-nav-id="/casquatch/examples/springrest/" title="Spring Rest" class="dd-item ">
<li data-nav-id="/casquatch/examples/springrest/" title="Spring Rest - Tutorial" class="dd-item ">
<a href="/casquatch/examples/springrest/">
Spring Rest
Spring Rest - Tutorial

</a>
</li>
Expand Down Expand Up @@ -710,9 +729,9 @@ <h4>Casquatch</h4>



<li data-nav-id="/casquatch/releasenotes/v2.0/" title="2.0-SNAPSHOT" class="dd-item ">
<li data-nav-id="/casquatch/releasenotes/v2.0/" title="2.0-RELEASE" class="dd-item ">
<a href="/casquatch/releasenotes/v2.0/">
2.0-SNAPSHOT
2.0-RELEASE

</a>
</li>
Expand Down Expand Up @@ -755,7 +774,7 @@ <h3></h3>
<section id="footer">
<center>
<a href="https://github.com/tmobile/casquatch/releases"><img alt="GitHub release" src="https://img.shields.io/github/release/tmobile/casquatch.svg?style=plastic"></a><br/>
<a href="https://travis-ci.com/tmobile/casquatch"><img alt="Travis (.com)" src="https://img.shields.io/travis/com/tmobile/casquatch?style=plastic"></a><br/>
<a href="https://travis-ci.com/tmobile/casquatch"><img alt="Travis (.com) branch" src="https://img.shields.io/travis/com/tmobile/casquatch/master?style=plastic"></a><br/>
<a href="https://search.maven.org/search?q=g:com.tmobile.opensource.casquatch"><img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.tmobile.opensource.casquatch/CassandraDriver.svg?style=plastic"></a><br/>
<a href="https://github.com/tmobile/casquatch/"><img alt="GitHub stars" src="https://img.shields.io/github/stars/tmobile/casquatch.svg?style=plastic"></a><a href="https://github.com/tmobile/casquatch/fork"><img alt="GitHub forks" src="https://img.shields.io/github/forks/tmobile/casquatch.svg?style=plastic"></a><br/>
<a href="https://github.com/tmobile/casquatch/blob/master/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/tmobile/casquatch.svg?style=plastic"></a><br/>
Expand Down Expand Up @@ -907,6 +926,22 @@ <h1>






















Expand Down Expand Up @@ -1394,20 +1429,20 @@ <h1>
<div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
<div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
</div>
<script src="/casquatch/js/clipboard.min.js?1565804556"></script>
<script src="/casquatch/js/perfect-scrollbar.min.js?1565804556"></script>
<script src="/casquatch/js/perfect-scrollbar.jquery.min.js?1565804556"></script>
<script src="/casquatch/js/jquery.sticky.js?1565804556"></script>
<script src="/casquatch/js/featherlight.min.js?1565804556"></script>
<script src="/casquatch/js/html5shiv-printshiv.min.js?1565804556"></script>
<script src="/casquatch/js/highlight.pack.js?1565804556"></script>
<script src="/casquatch/js/clipboard.min.js?1566337002"></script>
<script src="/casquatch/js/perfect-scrollbar.min.js?1566337002"></script>
<script src="/casquatch/js/perfect-scrollbar.jquery.min.js?1566337002"></script>
<script src="/casquatch/js/jquery.sticky.js?1566337002"></script>
<script src="/casquatch/js/featherlight.min.js?1566337002"></script>
<script src="/casquatch/js/html5shiv-printshiv.min.js?1566337002"></script>
<script src="/casquatch/js/highlight.pack.js?1566337002"></script>
<script>hljs.initHighlightingOnLoad();</script>
<script src="/casquatch/js/modernizr.custom-3.6.0.js?1565804556"></script>
<script src="/casquatch/js/learn.js?1565804556"></script>
<script src="/casquatch/js/hugo-learn.js?1565804556"></script>
<script src="/casquatch/js/modernizr.custom-3.6.0.js?1566337002"></script>
<script src="/casquatch/js/learn.js?1566337002"></script>
<script src="/casquatch/js/hugo-learn.js?1566337002"></script>

<link href="/casquatch/mermaid/mermaid.css?1565804556" rel="stylesheet" />
<script src="/casquatch/mermaid/mermaid.js?1565804556"></script>
<link href="/casquatch/mermaid/mermaid.css?1566337002" rel="stylesheet" />
<script src="/casquatch/mermaid/mermaid.js?1566337002"></script>
<script>
mermaid.initialize({ startOnLoad: true });
</script>
Expand Down
6 changes: 3 additions & 3 deletions docs/docs/allclasses-frame.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_191) on Wed Aug 14 10:42:35 PDT 2019 -->
<!-- Generated by javadoc (1.8.0_191) on Tue Aug 20 14:36:42 PDT 2019 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>All Classes (Project Casquatch 2.0-SNAPSHOT API)</title>
<meta name="date" content="2019-08-14">
<title>All Classes (Project Casquatch 2.0-RELEASE API)</title>
<meta name="date" content="2019-08-20">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down
6 changes: 3 additions & 3 deletions docs/docs/allclasses-noframe.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_191) on Wed Aug 14 10:42:35 PDT 2019 -->
<!-- Generated by javadoc (1.8.0_191) on Tue Aug 20 14:36:42 PDT 2019 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>All Classes (Project Casquatch 2.0-SNAPSHOT API)</title>
<meta name="date" content="2019-08-14">
<title>All Classes (Project Casquatch 2.0-RELEASE API)</title>
<meta name="date" content="2019-08-20">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_191) on Wed Aug 14 10:42:35 PDT 2019 -->
<!-- Generated by javadoc (1.8.0_191) on Tue Aug 20 14:36:41 PDT 2019 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>AbstractCasquatchEntity (Project Casquatch 2.0-SNAPSHOT API)</title>
<meta name="date" content="2019-08-14">
<title>AbstractCasquatchEntity (Project Casquatch 2.0-RELEASE API)</title>
<meta name="date" content="2019-08-20">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../script.js"></script>
</head>
<body>
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="AbstractCasquatchEntity (Project Casquatch 2.0-SNAPSHOT API)";
parent.document.title="AbstractCasquatchEntity (Project Casquatch 2.0-RELEASE API)";
}
}
catch(err) {
}
//-->
var methods = {"i0":10,"i1":9,"i2":6,"i3":10};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
var methods = {"i0":10,"i1":9,"i2":10,"i3":10};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
var tableTab = "tableTab";
Expand Down Expand Up @@ -147,7 +147,7 @@ <h3>Constructor Summary</h3>
</a>
<h3>Method Summary</h3>
<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
<tr>
<th class="colFirst" scope="col">Modifier and Type</th>
<th class="colLast" scope="col">Method and Description</th>
Expand All @@ -165,9 +165,9 @@ <h3>Method Summary</h3>
</td>
</tr>
<tr id="i2" class="altColor">
<td class="colFirst"><code>abstract <a href="../../../../com/tmobile/opensource/casquatch/AbstractCasquatchEntity.html" title="class in com.tmobile.opensource.casquatch">AbstractCasquatchEntity</a></code></td>
<td class="colFirst"><code><a href="../../../../com/tmobile/opensource/casquatch/AbstractCasquatchEntity.html" title="class in com.tmobile.opensource.casquatch">AbstractCasquatchEntity</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/tmobile/opensource/casquatch/AbstractCasquatchEntity.html#keys--">keys</a></span>()</code>
<div class="block">Return instance of class with only primary key set</div>
<div class="block">Return instance of class with only primary key set.</div>
</td>
</tr>
<tr id="i3" class="rowColor">
Expand Down Expand Up @@ -221,8 +221,8 @@ <h3>Method Detail</h3>
<ul class="blockList">
<li class="blockList">
<h4>keys</h4>
<pre>public abstract&nbsp;<a href="../../../../com/tmobile/opensource/casquatch/AbstractCasquatchEntity.html" title="class in com.tmobile.opensource.casquatch">AbstractCasquatchEntity</a>&nbsp;keys()</pre>
<div class="block">Return instance of class with only primary key set</div>
<pre>public&nbsp;<a href="../../../../com/tmobile/opensource/casquatch/AbstractCasquatchEntity.html" title="class in com.tmobile.opensource.casquatch">AbstractCasquatchEntity</a>&nbsp;keys()</pre>
<div class="block">Return instance of class with only primary key set. A default implementation is provided using Reflection but an explicit procedure is recommended.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>instance containing only primary key</dd>
Expand Down
Loading

0 comments on commit 88f9601

Please sign in to comment.