Merge pull request #110 from uts-cic/develop

Develop

.gitignore

@@ -60,7 +60,7 @@ fabric.properties
 /src/main/resources/logback.xml
 /.idea/
 !/src/main/resources/logback.xml
-project/
+
 src/test/java/
 src/test/resources/
 src/test/scala-2.12/
@@ -116,3 +116,6 @@ src/main/scala/tap/nlp/old/OldNlpSentence.scala
 src/main/scala/tap/nlp/old/SentenceConverter.scala
 /src/main/scala/worksheet.sc
 /src/main/scala/experiments.sc
+/project/project/
+/project/target/
+/project/LocalSbtSettings.scala

.travis.yml

@@ -5,8 +5,8 @@ jdk: oraclejdk8
 scala:
    - 2.12.3
 
-env:
-  global:
+env: TAP_HOSTS=localhost
+ # global:
  #   _JAVA_OPTIONS=-Xmx2500
 
 script:

build.sbt

@@ -14,9 +14,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import LocalSbtSettings._
+
 name := "tap"
 
-version := "3.0.9"
+version := "3.1.0-RC4"
 
 scalaVersion := "2.12.3"
 
@@ -30,7 +32,7 @@ val sangriaJsonVersion = "1.0.4"
 val akkaStreamVersion = "2.5.6"
 val scalatestVersion = "3.0.4"
 val scalatestPlayVersion = "3.1.2"
-val nlytxCommonsVersion = "0.1.1"
+val nlytxCommonsVersion = "0.3.0"
 val factorieVersion = "1.2"
 val nlytxFactorieVersion = "0.5.1"
 //Java library versions
@@ -53,17 +55,13 @@ val apiDependencies = Seq(
 val analyticsDependencies = Seq(
   "io.nlytx" %% "nlytx-nlp-api" % "1.0.2",
   "io.nlytx" %% "factorie-nlp-models" % "1.0.3",
+  "io.nlytx" %% "nlytx-nlp-commons" % nlytxCommonsVersion,
   "com.typesafe.akka" % "akka-stream_2.12" % akkaStreamVersion,
   "org.apache.opennlp" % "opennlp-tools" % openNlpVersion,
   "org.languagetool" % "language-en" % langToolVersion
 )
 resolvers += Resolver.bintrayRepo("nlytx", "nlytx-nlp")
 
-val generalDependencies = Seq(
-  "io.nlytx" %% "commons" % nlytxCommonsVersion
-)
-resolvers += Resolver.bintrayRepo("nlytx", "nlytx_commons")
-
 val testDependencies = Seq(
   "org.scalactic" %% "scalactic" % scalatestVersion,
   "org.scalatest" %% "scalatest" % scalatestVersion % "test",
@@ -72,7 +70,7 @@ val testDependencies = Seq(
 )
 
 
-libraryDependencies ++= apiDependencies ++ analyticsDependencies ++ generalDependencies ++ testDependencies
+libraryDependencies ++= apiDependencies ++ analyticsDependencies ++ testDependencies
 
 scalacOptions in (Compile, doc) ++= Seq("-doc-root-content", baseDirectory.value+"/src/main/scala/root-doc.md")
 
@@ -83,8 +81,8 @@ scalacOptions in (Compile, doc) ++= Seq("-doc-root-content", baseDirectory.value
 enablePlugins(ParadoxPlugin) //Generate documentation with Paradox
 paradoxTheme := Some(builtinParadoxTheme("generic"))
 paradoxProperties in Compile ++= Map(
-  "github.base_url" -> s"https://github.com/uts-cic/tap",
-  "scaladoc.api.base_url" -> s"https://uts-cic.github.io/tap"
+  "github.base_url" -> s"$githubBaseUrl",
+  "scaladoc.api.base_url" -> s"$scaladocApiBaseUrl"
 )
 //Task for copying to root level docs folder (for GitHub pages)
 val copyDocsTask = TaskKey[Unit]("copyDocs","copies paradox docs to /docs directory")
@@ -97,30 +95,14 @@ copyDocsTask := {
   IO.copyDirectory(docSource,docDest,overwrite=true,preserveLastModified=true)
   IO.copyDirectory(apiSource,apiDest,overwrite=true,preserveLastModified=true)
 }
-//scalacOptions in Paradox ++= Seq("-doc-root-content", baseDirectory.value+"/src/main/scala/root-doc.md")
 
-//Enable this only for local builds - disabled for Travis
 enablePlugins(JavaAppPackaging) // sbt universal:packageZipTarball
-dockerExposedPorts := Seq(9000) // sbt docker:publishLocal
-
+dockerExposedPorts := Seq(9000,80) // sbt docker:publishLocal
+dockerRepository := Some(s"$dockerRepoURI")
+defaultLinuxInstallLocation in Docker := "/opt/docker"
+dockerExposedVolumes := Seq("/opt/docker/logs")
 javaOptions in Universal ++= Seq(
   // -J params will be added as jvm parameters
   "-J-Xmx4g",
   "-J-Xms2g"
-
-  // others will be added as app parameters
-//  "-Dproperty=true",
-//  "-port=8080",
-
-  // you can access any build setting/task here
-  //s"-version=${version.value}"
 )
-
-//Generate build info file
-//Disable for travis CI
-//enablePlugins(BuildInfoPlugin)
-//buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion)
-//buildInfoPackage := "org.goingok"
-//buildInfoOptions += BuildInfoOption.BuildTime
-
-resolvers += "IESL Release" at "http://dev-iesl.cs.umass.edu/nexus/content/groups/public"

docs/api/controllers/DefaultController.html

@@ -119,6 +119,12 @@ <h1>Packages</h1>
                         <a href="GraphQlController.html" title="Created by andrew@andrewresearch.net on 22/8/17.">
                           GraphQlController
                         </a>
+                      </li><li class="current-entities indented1">
+                        <span class="separator"></span>
+                        <a class="class" href="HealthController.html" title="Created by quanie on 06/10/2017."></a>
+                        <a href="HealthController.html" title="Created by quanie on 06/10/2017.">
+                          HealthController
+                        </a>
                       </li><li class="current-entities indented1">
                         <span class="separator"></span>
                         <a class="class" href="ReverseAssets.html" title=""></a>
@@ -137,6 +143,12 @@ <h1>Packages</h1>
                         <a href="ReverseGraphQlController.html" title="">
                           ReverseGraphQlController
                         </a>
+                      </li><li class="current-entities indented1">
+                        <span class="separator"></span>
+                        <a class="class" href="ReverseHealthController.html" title=""></a>
+                        <a href="ReverseHealthController.html" title="">
+                          ReverseHealthController
+                        </a>
                       </li><li class="current-entities indented1">
                         <span class="separator"></span>
                         <a class="class" href="routes.html" title=""></a>

docs/api/controllers/GraphQlController.html

@@ -119,6 +119,12 @@ <h1>Packages</h1>
                         <a href="" title="Created by andrew@andrewresearch.net on 22/8/17.">
                           GraphQlController
                         </a>
+                      </li><li class="current-entities indented1">
+                        <span class="separator"></span>
+                        <a class="class" href="HealthController.html" title="Created by quanie on 06/10/2017."></a>
+                        <a href="HealthController.html" title="Created by quanie on 06/10/2017.">
+                          HealthController
+                        </a>
                       </li><li class="current-entities indented1">
                         <span class="separator"></span>
                         <a class="class" href="ReverseAssets.html" title=""></a>
@@ -137,6 +143,12 @@ <h1>Packages</h1>
                         <a href="ReverseGraphQlController.html" title="">
                           ReverseGraphQlController
                         </a>
+                      </li><li class="current-entities indented1">
+                        <span class="separator"></span>
+                        <a class="class" href="ReverseHealthController.html" title=""></a>
+                        <a href="ReverseHealthController.html" title="">
+                          ReverseHealthController
+                        </a>
                       </li><li class="current-entities indented1">
                         <span class="separator"></span>
                         <a class="class" href="routes.html" title=""></a>
@@ -223,9 +235,9 @@ <h4 id="signature" class="signature">
         <div id="constructors" class="members">
               <h3>Instance Constructors</h3>
               <ol><li name="controllers.GraphQlController#&lt;init&gt;" visbl="pub" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="&lt;init&gt;(assets:controllers.AssetsFinder):controllers.GraphQlController"></a><a id="&lt;init&gt;:GraphQlController"></a>
+      <a id="&lt;init&gt;(assets:controllers.AssetsFinder,gqlSchema:models.GraphqlSchema,actions:models.GraphqlActions):controllers.GraphQlController"></a><a id="&lt;init&gt;:GraphQlController"></a>
       <span class="permalink">
-      <a href="../controllers/GraphQlController.html#&lt;init&gt;(assets:controllers.AssetsFinder):controllers.GraphQlController" title="Permalink">
+      <a href="../controllers/GraphQlController.html#&lt;init&gt;(assets:controllers.AssetsFinder,gqlSchema:models.GraphqlSchema,actions:models.GraphqlActions):controllers.GraphQlController" title="Permalink">
         <i class="material-icons"></i>
       </a>
     </span>
@@ -234,7 +246,7 @@ <h3>Instance Constructors</h3>
         <span class="kind">new</span>
       </span>
       <span class="symbol">
-        <span class="name">GraphQlController</span><span class="params">(<span name="assets">assets: <span class="extype" name="controllers.AssetsFinder">AssetsFinder</span></span>)</span>
+        <span class="name">GraphQlController</span><span class="params">(<span name="assets">assets: <span class="extype" name="controllers.AssetsFinder">AssetsFinder</span></span>, <span name="gqlSchema">gqlSchema: <a href="../models/GraphqlSchema.html" class="extype" name="models.GraphqlSchema">GraphqlSchema</a></span>, <span name="actions">actions: <a href="../models/GraphqlActions.html" class="extype" name="models.GraphqlActions">GraphqlActions</a></span>)</span>
       </span>
 
       <div class="fullcomment"><dl class="attributes block"> <dt>Annotations</dt><dd>
@@ -3332,6 +3344,22 @@ <h3>Value Members</h3>
       </span>
 
       <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd>AnyRef → Any</dd></dl></div>
+    </li><li name="controllers.GraphQlController#executeGraphQLQuery" visbl="pub" class="indented0 " data-isabs="false" fullComment="no" group="Ungrouped">
+      <a id="executeGraphQLQuery(query:sangria.ast.Document,name:Option[String],vars:play.api.libs.json.JsObject):scala.concurrent.Future[play.api.mvc.Result]"></a><a id="executeGraphQLQuery(Document,Option[String],JsObject):Future[Result]"></a>
+      <span class="permalink">
+      <a href="../controllers/GraphQlController.html#executeGraphQLQuery(query:sangria.ast.Document,name:Option[String],vars:play.api.libs.json.JsObject):scala.concurrent.Future[play.api.mvc.Result]" title="Permalink">
+        <i class="material-icons"></i>
+      </a>
+    </span>
+      <span class="modifier_kind">
+        <span class="modifier"></span>
+        <span class="kind">def</span>
+      </span>
+      <span class="symbol">
+        <span class="name">executeGraphQLQuery</span><span class="params">(<span name="query">query: <span class="extype" name="sangria.ast.Document">Document</span></span>, <span name="name">name: <span class="extype" name="scala.Option">Option</span>[<span class="extype" name="scala.Predef.String">String</span>]</span>, <span name="vars">vars: <span class="extype" name="play.api.libs.json.JsObject">JsObject</span></span>)</span><span class="result">: <span class="extype" name="scala.concurrent.Future">Future</span>[<span class="extype" name="play.api.mvc.Result">Result</span>]</span>
+      </span>
+
+
     </li><li name="play.api.mvc.InjectedController#fallbackControllerComponents" visbl="prt" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
       <a id="fallbackControllerComponents:play.api.mvc.ControllerComponents"></a><a id="fallbackControllerComponents:ControllerComponents"></a>
       <span class="permalink">
@@ -3546,6 +3574,22 @@ <h3>Value Members</h3>
       </span>
 
       <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd>BaseControllerHelpers</dd></dl></div>
+    </li><li name="controllers.GraphQlController#process" visbl="pub" class="indented0 " data-isabs="false" fullComment="no" group="Ungrouped">
+      <a id="process(query:String,name:Option[String],variables:play.api.libs.json.JsObject):scala.concurrent.Future[play.api.mvc.Result]"></a><a id="process(String,Option[String],JsObject):Future[Result]"></a>
+      <span class="permalink">
+      <a href="../controllers/GraphQlController.html#process(query:String,name:Option[String],variables:play.api.libs.json.JsObject):scala.concurrent.Future[play.api.mvc.Result]" title="Permalink">
+        <i class="material-icons"></i>
+      </a>
+    </span>
+      <span class="modifier_kind">
+        <span class="modifier"></span>
+        <span class="kind">def</span>
+      </span>
+      <span class="symbol">
+        <span class="name">process</span><span class="params">(<span name="query">query: <span class="extype" name="scala.Predef.String">String</span></span>, <span name="name">name: <span class="extype" name="scala.Option">Option</span>[<span class="extype" name="scala.Predef.String">String</span>]</span>, <span name="variables">variables: <span class="extype" name="play.api.libs.json.JsObject">JsObject</span></span>)</span><span class="result">: <span class="extype" name="scala.concurrent.Future">Future</span>[<span class="extype" name="play.api.mvc.Result">Result</span>]</span>
+      </span>
+
+
     </li><li name="play.api.mvc.RequestImplicits#request2flash" visbl="pub" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
       <a id="request2flash(implicitrequest:play.api.mvc.RequestHeader):play.api.mvc.Flash"></a><a id="request2flash(RequestHeader):Flash"></a>
       <span class="permalink">
@@ -3578,6 +3622,22 @@ <h3>Value Members</h3>
       </span>
 
       <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd>RequestImplicits</dd></dl></div>
+    </li><li name="controllers.GraphQlController#schema" visbl="pub" class="indented0 " data-isabs="false" fullComment="no" group="Ungrouped">
+      <a id="schema:sangria.schema.Schema[models.GraphqlActions,Unit]"></a><a id="schema:Schema[GraphqlActions,Unit]"></a>
+      <span class="permalink">
+      <a href="../controllers/GraphQlController.html#schema:sangria.schema.Schema[models.GraphqlActions,Unit]" title="Permalink">
+        <i class="material-icons"></i>
+      </a>
+    </span>
+      <span class="modifier_kind">
+        <span class="modifier"></span>
+        <span class="kind">val</span>
+      </span>
+      <span class="symbol">
+        <span class="name">schema</span><span class="result">: <span class="extype" name="sangria.schema.Schema">Schema</span>[<a href="../models/GraphqlActions.html" class="extype" name="models.GraphqlActions">GraphqlActions</a>, <span class="extype" name="scala.Unit">Unit</span>]</span>
+      </span>
+
+
     </li><li name="play.api.mvc.InjectedController#setControllerComponents" visbl="pub" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
       <a id="setControllerComponents(components:play.api.mvc.ControllerComponents):Unit"></a><a id="setControllerComponents(ControllerComponents):Unit"></a>
       <span class="permalink">

docs/api/controllers/ReverseAssets.html

@@ -119,6 +119,12 @@ <h1>Packages</h1>
                         <a href="GraphQlController.html" title="Created by andrew@andrewresearch.net on 22/8/17.">
                           GraphQlController
                         </a>
+                      </li><li class="current-entities indented1">
+                        <span class="separator"></span>
+                        <a class="class" href="HealthController.html" title="Created by quanie on 06/10/2017."></a>
+                        <a href="HealthController.html" title="Created by quanie on 06/10/2017.">
+                          HealthController
+                        </a>
                       </li><li class="current-entities indented1">
                         <span class="separator"></span>
                         <a class="class" href="" title=""></a>
@@ -137,6 +143,12 @@ <h1>Packages</h1>
                         <a href="ReverseGraphQlController.html" title="">
                           ReverseGraphQlController
                         </a>
+                      </li><li class="current-entities indented1">
+                        <span class="separator"></span>
+                        <a class="class" href="ReverseHealthController.html" title=""></a>
+                        <a href="ReverseHealthController.html" title="">
+                          ReverseHealthController
+                        </a>
                       </li><li class="current-entities indented1">
                         <span class="separator"></span>
                         <a class="class" href="routes.html" title=""></a>

docs/api/controllers/ReverseDefaultController.html

@@ -119,6 +119,12 @@ <h1>Packages</h1>
                         <a href="GraphQlController.html" title="Created by andrew@andrewresearch.net on 22/8/17.">
                           GraphQlController
                         </a>
+                      </li><li class="current-entities indented1">
+                        <span class="separator"></span>
+                        <a class="class" href="HealthController.html" title="Created by quanie on 06/10/2017."></a>
+                        <a href="HealthController.html" title="Created by quanie on 06/10/2017.">
+                          HealthController
+                        </a>
                       </li><li class="current-entities indented1">
                         <span class="separator"></span>
                         <a class="class" href="ReverseAssets.html" title=""></a>
@@ -137,6 +143,12 @@ <h1>Packages</h1>
                         <a href="ReverseGraphQlController.html" title="">
                           ReverseGraphQlController
                         </a>
+                      </li><li class="current-entities indented1">
+                        <span class="separator"></span>
+                        <a class="class" href="ReverseHealthController.html" title=""></a>
+                        <a href="ReverseHealthController.html" title="">
+                          ReverseHealthController
+                        </a>
                       </li><li class="current-entities indented1">
                         <span class="separator"></span>
                         <a class="class" href="routes.html" title=""></a>

docs/api/controllers/ReverseGraphQlController.html

@@ -119,6 +119,12 @@ <h1>Packages</h1>
                         <a href="GraphQlController.html" title="Created by andrew@andrewresearch.net on 22/8/17.">
                           GraphQlController
                         </a>
+                      </li><li class="current-entities indented1">
+                        <span class="separator"></span>
+                        <a class="class" href="HealthController.html" title="Created by quanie on 06/10/2017."></a>
+                        <a href="HealthController.html" title="Created by quanie on 06/10/2017.">
+                          HealthController
+                        </a>
                       </li><li class="current-entities indented1">
                         <span class="separator"></span>
                         <a class="class" href="ReverseAssets.html" title=""></a>
@@ -137,6 +143,12 @@ <h1>Packages</h1>
                         <a href="" title="">
                           ReverseGraphQlController
                         </a>
+                      </li><li class="current-entities indented1">
+                        <span class="separator"></span>
+                        <a class="class" href="ReverseHealthController.html" title=""></a>
+                        <a href="ReverseHealthController.html" title="">
+                          ReverseHealthController
+                        </a>
                       </li><li class="current-entities indented1">
                         <span class="separator"></span>
                         <a class="class" href="routes.html" title=""></a>