Skip to content

Commit 2e8151e

Browse files
author
chris
committed
Merge commit '3f41e42e9e5e70f78b8aafd6b46af31d76723383'
2 parents 2bda1e6 + 3f41e42 commit 2e8151e

92 files changed

Lines changed: 481 additions & 347 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ RUN mvn package -e && \
1818
FROM openjdk:8-jre-alpine
1919

2020
ENV APPDIR /app
21-
ENV VERSION 1.0
21+
ENV VERSION 1.1
2222

2323
WORKDIR $APPDIR
2424
RUN mkdir -p $APPDIR
2525

26-
COPY --from=build "/src/target/namara-$VERSION-SNAPSHOP.jar" namara-$VERSION.jar
26+
COPY --from=build "/src/target/namara-$VERSION-SNAPSHOT.jar" namara-$VERSION.jar
2727
COPY --from=build "/src/target/target.txt" target.txt

‎docs/allclasses-frame.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_101) on Tue Jun 12 11:58:08 EDT 2018 -->
5+
<!-- Generated by javadoc (1.8.0_101) on Thu Jun 28 11:10:33 EDT 2018 -->
66
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
7-
<title>All Classes (namara 1.0-SNAPSHOT API)</title>
8-
<meta name="date" content="2018-06-12">
7+
<title>All Classes (namara 1.1-SNAPSHOT API)</title>
8+
<meta name="date" content="2018-06-28">
99
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
1010
<script type="text/javascript" src="script.js"></script>
1111
</head>

‎docs/allclasses-noframe.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_101) on Tue Jun 12 11:58:08 EDT 2018 -->
5+
<!-- Generated by javadoc (1.8.0_101) on Thu Jun 28 11:10:33 EDT 2018 -->
66
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
7-
<title>All Classes (namara 1.0-SNAPSHOT API)</title>
8-
<meta name="date" content="2018-06-12">
7+
<title>All Classes (namara 1.1-SNAPSHOT API)</title>
8+
<meta name="date" content="2018-06-28">
99
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
1010
<script type="text/javascript" src="script.js"></script>
1111
</head>

‎docs/constant-values.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_101) on Tue Jun 12 11:58:07 EDT 2018 -->
5+
<!-- Generated by javadoc (1.8.0_101) on Thu Jun 28 11:10:33 EDT 2018 -->
66
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
7-
<title>Constant Field Values (namara 1.0-SNAPSHOT API)</title>
8-
<meta name="date" content="2018-06-12">
7+
<title>Constant Field Values (namara 1.1-SNAPSHOT API)</title>
8+
<meta name="date" content="2018-06-28">
99
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
1010
<script type="text/javascript" src="script.js"></script>
1111
</head>
1212
<body>
1313
<script type="text/javascript"><!--
1414
try {
1515
if (location.href.indexOf('is-external=true') == -1) {
16-
parent.document.title="Constant Field Values (namara 1.0-SNAPSHOT API)";
16+
parent.document.title="Constant Field Values (namara 1.1-SNAPSHOT API)";
1717
}
1818
}
1919
catch(err) {

‎docs/deprecated-list.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_101) on Tue Jun 12 11:58:08 EDT 2018 -->
5+
<!-- Generated by javadoc (1.8.0_101) on Thu Jun 28 11:10:33 EDT 2018 -->
66
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
7-
<title>Deprecated List (namara 1.0-SNAPSHOT API)</title>
8-
<meta name="date" content="2018-06-12">
7+
<title>Deprecated List (namara 1.1-SNAPSHOT API)</title>
8+
<meta name="date" content="2018-06-28">
99
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
1010
<script type="text/javascript" src="script.js"></script>
1111
</head>
1212
<body>
1313
<script type="text/javascript"><!--
1414
try {
1515
if (location.href.indexOf('is-external=true') == -1) {
16-
parent.document.title="Deprecated List (namara 1.0-SNAPSHOT API)";
16+
parent.document.title="Deprecated List (namara 1.1-SNAPSHOT API)";
1717
}
1818
}
1919
catch(err) {

‎docs/help-doc.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_101) on Tue Jun 12 11:58:08 EDT 2018 -->
5+
<!-- Generated by javadoc (1.8.0_101) on Thu Jun 28 11:10:33 EDT 2018 -->
66
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
7-
<title>API Help (namara 1.0-SNAPSHOT API)</title>
8-
<meta name="date" content="2018-06-12">
7+
<title>API Help (namara 1.1-SNAPSHOT API)</title>
8+
<meta name="date" content="2018-06-28">
99
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
1010
<script type="text/javascript" src="script.js"></script>
1111
</head>
1212
<body>
1313
<script type="text/javascript"><!--
1414
try {
1515
if (location.href.indexOf('is-external=true') == -1) {
16-
parent.document.title="API Help (namara 1.0-SNAPSHOT API)";
16+
parent.document.title="API Help (namara 1.1-SNAPSHOT API)";
1717
}
1818
}
1919
catch(err) {

‎docs/index-all.html‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_101) on Tue Jun 12 11:58:08 EDT 2018 -->
5+
<!-- Generated by javadoc (1.8.0_101) on Thu Jun 28 11:10:33 EDT 2018 -->
66
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
7-
<title>Index (namara 1.0-SNAPSHOT API)</title>
8-
<meta name="date" content="2018-06-12">
7+
<title>Index (namara 1.1-SNAPSHOT API)</title>
8+
<meta name="date" content="2018-06-28">
99
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
1010
<script type="text/javascript" src="script.js"></script>
1111
</head>
1212
<body>
1313
<script type="text/javascript"><!--
1414
try {
1515
if (location.href.indexOf('is-external=true') == -1) {
16-
parent.document.title="Index (namara 1.0-SNAPSHOT API)";
16+
parent.document.title="Index (namara 1.1-SNAPSHOT API)";
1717
}
1818
}
1919
catch(err) {
@@ -523,14 +523,26 @@ <h2 class="title">Q</h2>
523523
<dd>
524524
<div class="block">Make a new query.</div>
525525
</dd>
526+
<dt><span class="memberNameLink"><a href="namara/query/QueryBuilder.html#QueryBuilder-java.lang.String-">QueryBuilder(String)</a></span> - Constructor for class namara.query.<a href="namara/query/QueryBuilder.html" title="class in namara.query">QueryBuilder</a></dt>
527+
<dd>
528+
<div class="block">Make a new query, initialized with a raw query string</div>
529+
</dd>
526530
<dt><span class="memberNameLink"><a href="namara/query/QueryBuilder.html#QueryBuilder-int-">QueryBuilder(int)</a></span> - Constructor for class namara.query.<a href="namara/query/QueryBuilder.html" title="class in namara.query">QueryBuilder</a></dt>
527531
<dd>
528532
<div class="block">Creates a new query builder with limit</div>
529533
</dd>
534+
<dt><span class="memberNameLink"><a href="namara/query/QueryBuilder.html#QueryBuilder-java.lang.String-int-">QueryBuilder(String, int)</a></span> - Constructor for class namara.query.<a href="namara/query/QueryBuilder.html" title="class in namara.query">QueryBuilder</a></dt>
535+
<dd>
536+
<div class="block">Creates a new query builder with a raw query string and a limit</div>
537+
</dd>
530538
<dt><span class="memberNameLink"><a href="namara/query/QueryBuilder.html#QueryBuilder-int-int-">QueryBuilder(int, int)</a></span> - Constructor for class namara.query.<a href="namara/query/QueryBuilder.html" title="class in namara.query">QueryBuilder</a></dt>
531539
<dd>
532540
<div class="block">Creates a new query builder with limit and offset</div>
533541
</dd>
542+
<dt><span class="memberNameLink"><a href="namara/query/QueryBuilder.html#QueryBuilder-java.lang.String-int-int-">QueryBuilder(String, int, int)</a></span> - Constructor for class namara.query.<a href="namara/query/QueryBuilder.html" title="class in namara.query">QueryBuilder</a></dt>
543+
<dd>
544+
<div class="block">Creates a new query builder with a raw query string, limit and offset</div>
545+
</dd>
534546
<dt><a href="namara/client/exception/QueryException.html" title="class in namara.client.exception"><span class="typeNameLink">QueryException</span></a> - Exception in <a href="namara/client/exception/package-summary.html">namara.client.exception</a></dt>
535547
<dd>&nbsp;</dd>
536548
<dt><span class="memberNameLink"><a href="namara/client/exception/QueryException.html#QueryException-java.lang.String-">QueryException(String)</a></span> - Constructor for exception namara.client.exception.<a href="namara/client/exception/QueryException.html" title="class in namara.client.exception">QueryException</a></dt>

‎docs/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_101) on Tue Jun 12 11:58:08 EDT 2018 -->
5+
<!-- Generated by javadoc (1.8.0_101) on Thu Jun 28 11:10:33 EDT 2018 -->
66
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
7-
<title>namara 1.0-SNAPSHOT API</title>
7+
<title>namara 1.1-SNAPSHOT API</title>
88
<script type="text/javascript">
99
targetPage = "" + window.location.search;
1010
if (targetPage != "" && targetPage != "undefined")

‎docs/namara/client/Client.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_101) on Tue Jun 12 11:58:07 EDT 2018 -->
5+
<!-- Generated by javadoc (1.8.0_101) on Thu Jun 28 11:10:33 EDT 2018 -->
66
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
7-
<title>Client (namara 1.0-SNAPSHOT API)</title>
8-
<meta name="date" content="2018-06-12">
7+
<title>Client (namara 1.1-SNAPSHOT API)</title>
8+
<meta name="date" content="2018-06-28">
99
<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
1010
<script type="text/javascript" src="../../script.js"></script>
1111
</head>
1212
<body>
1313
<script type="text/javascript"><!--
1414
try {
1515
if (location.href.indexOf('is-external=true') == -1) {
16-
parent.document.title="Client (namara 1.0-SNAPSHOT API)";
16+
parent.document.title="Client (namara 1.1-SNAPSHOT API)";
1717
}
1818
}
1919
catch(err) {

‎docs/namara/client/Record.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_101) on Tue Jun 12 11:58:07 EDT 2018 -->
5+
<!-- Generated by javadoc (1.8.0_101) on Thu Jun 28 11:10:33 EDT 2018 -->
66
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
7-
<title>Record (namara 1.0-SNAPSHOT API)</title>
8-
<meta name="date" content="2018-06-12">
7+
<title>Record (namara 1.1-SNAPSHOT API)</title>
8+
<meta name="date" content="2018-06-28">
99
<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
1010
<script type="text/javascript" src="../../script.js"></script>
1111
</head>
1212
<body>
1313
<script type="text/javascript"><!--
1414
try {
1515
if (location.href.indexOf('is-external=true') == -1) {
16-
parent.document.title="Record (namara 1.0-SNAPSHOT API)";
16+
parent.document.title="Record (namara 1.1-SNAPSHOT API)";
1717
}
1818
}
1919
catch(err) {

0 commit comments

Comments
 (0)