Architect teams to be the core focus

build.gradle

@@ -5,22 +5,18 @@ buildscript {
         mavenCentral()
         jcenter()
     }
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:1.3.8.RELEASE")
-    }
 }
 
 plugins {
     id 'net.saliman.cobertura' version '2.2.8'
+    id 'org.springframework.boot' version '1.5.8.RELEASE'
 }
 
 apply plugin: 'groovy'
 apply plugin: 'java'
 apply plugin: 'idea'
-apply plugin: 'spring-boot'
 apply plugin: 'codenarc'
 apply plugin: 'maven'
-apply plugin: 'project-report'
 
 archivesBaseName = 'dgleague-service'
 group = 'com.recknerd.discgolf'
@@ -65,7 +61,7 @@ dependencies {
 
     compile 'org.springframework.boot:spring-boot-starter-data-jpa'
     compile 'org.springframework.boot:spring-boot-starter-data-rest'
-    runtime 'org.postgresql:postgresql:9.4.1211'
+    runtime 'org.postgresql:postgresql:9.4.1212'
 
     // tag::jetty[]
     compile("org.springframework.boot:spring-boot-starter-web") {
@@ -80,8 +76,8 @@ dependencies {
     //compile("org.springframework.boot:spring-boot-starter-security")
     // end::security[]
 
-    compile 'io.springfox:springfox-swagger2:2.1.2'
-    compile 'io.springfox:springfox-swagger-ui:2.1.2'
+    compile 'io.springfox:springfox-swagger2:2.7.0'
+    compile 'io.springfox:springfox-swagger-ui:2.7.0'
 
     testCompile 'org.springframework.boot:spring-boot-starter-test'
     testCompile 'org.springframework:spring-test'
@@ -98,7 +94,7 @@ tasks.withType(CodeNarc) {
 
 // CodeNarc settings
 codenarc {
-    toolVersion = '0.26.0'
+    toolVersion = '0.27.0'
 }
 
 codenarcMain {
@@ -120,7 +116,7 @@ cobertura {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.13'
+    gradleVersion = '4.2.1'
 }
 
 clean {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Sep 20 21:28:53 EDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip

gradlew

@@ -1,25 +1,43 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

src/main/groovy/com/recknerd/discgolf/configuration/DataRestConfiguration.groovy

@@ -1,19 +1,38 @@
 package com.recknerd.discgolf.configuration
 
+import com.recknerd.discgolf.domain.entity.AceEntity
+import com.recknerd.discgolf.domain.entity.CourseEntity
+import com.recknerd.discgolf.domain.entity.CtpEntity
+import com.recknerd.discgolf.domain.entity.HoleEntity
+import com.recknerd.discgolf.domain.entity.LeagueEntity
 import com.recknerd.discgolf.domain.entity.PlayerEntity
+import com.recknerd.discgolf.domain.entity.RoundEntity
+import com.recknerd.discgolf.domain.entity.ScheduleEntity
+import com.recknerd.discgolf.domain.entity.ScoreEntity
+import com.recknerd.discgolf.domain.entity.TeamEntity
 import org.springframework.context.annotation.Configuration
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration
-import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguration
+import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurerAdapter
 
 @Configuration
-class DataRestConfiguration extends RepositoryRestMvcConfiguration {
+class DataRestConfiguration extends RepositoryRestConfigurerAdapter {
 
     @Override
-    protected void configureRepositoryRestConfiguration(RepositoryRestConfiguration config) {
+    void configureRepositoryRestConfiguration(RepositoryRestConfiguration config) {
         super.configureRepositoryRestConfiguration(config)
         config.setReturnBodyOnCreate(true)
         config.setReturnBodyOnUpdate(true)
-        config.exposeIdsFor(PlayerEntity)
-        config.metadataConfiguration().setAlpsEnabled(false)
+        config.exposeIdsFor(
+                AceEntity,
+                CourseEntity,
+                CtpEntity,
+                HoleEntity,
+                LeagueEntity,
+                PlayerEntity,
+                RoundEntity,
+                ScheduleEntity,
+                ScoreEntity,
+                TeamEntity
+        )
     }
 }

src/main/groovy/com/recknerd/discgolf/configuration/SwaggerConfiguration.groovy

@@ -12,6 +12,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.http.MediaType
 import springfox.documentation.builders.ApiInfoBuilder
 import springfox.documentation.service.ApiInfo
+import springfox.documentation.service.Contact
 import springfox.documentation.spi.DocumentationType
 import springfox.documentation.spring.web.plugins.Docket
 
@@ -25,7 +26,9 @@ class SwaggerConfiguration {
     String title
     String description
     String termsOfServiceUrl
-    String contact
+    String contactEmail
+    String contactName
+    String contactUrl
     String license
     String licenseUrl
 
@@ -52,10 +55,10 @@ class SwaggerConfiguration {
                 title: title,
                 description: description,
                 termsOfServiceUrl: termsOfServiceUrl,
-                contact: contact,
+                contact: new Contact(contactName, contactUrl, contactEmail),
                 license: license,
                 licenseUrl: licenseUrl,
                 version: version
         ).build()
     }
-}
+}

src/main/groovy/com/recknerd/discgolf/domain/PlayerInlineTeamsProjection.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016 Lexmark International, Inc.  All rights reserved.
+ */
+
+package com.recknerd.discgolf.domain
+
+import com.recknerd.discgolf.domain.entity.PlayerEntity
+import com.recknerd.discgolf.domain.entity.TeamEntity
+import org.springframework.data.rest.core.config.Projection
+
+/**
+ *
+ */
+@Projection(name = "inlineTeams", types = [ PlayerEntity ])
+interface PlayerInlineTeamsProjection {
+    Long id
+    String name
+    String email
+    Set<TeamEntity> teams
+}

src/main/groovy/com/recknerd/discgolf/domain/entity/AceEntity.groovy

@@ -22,7 +22,7 @@ class AceEntity {
     @JoinColumn(name = 'player_id')
     PlayerEntity player
 
-    @ManyToOne
+    @ManyToOne()
     @JoinColumn(name = 'hole_id')
     HoleEntity hole
 }

src/main/groovy/com/recknerd/discgolf/domain/entity/PlayerEntity.groovy

@@ -6,8 +6,7 @@ import javax.persistence.GenerationType
 import javax.persistence.Id
 import javax.persistence.Entity
 import javax.persistence.GeneratedValue
-import javax.persistence.JoinColumn
-import javax.persistence.ManyToOne
+import javax.persistence.ManyToMany
 import javax.persistence.OneToMany
 
 @Entity(name= 'player')
@@ -23,12 +22,8 @@ class PlayerEntity {
     @Column(unique = true, name = 'email', nullable = false)
     String email
 
-    @ManyToOne
-    @JoinColumn(name = 'team_id')
-    TeamEntity team
-
-    @OneToMany(mappedBy='player', cascade=CascadeType.ALL)
-    Set<ScoreEntity> scores
+    @ManyToMany(mappedBy="players", cascade=CascadeType.ALL)
+    Set<TeamEntity> teams
 
     @OneToMany(mappedBy='player', cascade=CascadeType.ALL)
     Set<AceEntity> aces

src/main/groovy/com/recknerd/discgolf/domain/entity/ScoreEntity.groovy

@@ -13,7 +13,7 @@ import javax.persistence.UniqueConstraint
 
 @Entity(name = 'score')
 @Table(uniqueConstraints = [
-        @UniqueConstraint(columnNames = ['player_id', 'round_id'])
+        @UniqueConstraint(columnNames = ['team_id', 'round_id'])
 ])
 class ScoreEntity {
 
@@ -25,8 +25,8 @@ class ScoreEntity {
     Integer score
 
     @ManyToOne
-    @JoinColumn(name = 'player_id')
-    PlayerEntity player
+    @JoinColumn(name = 'team_id')
+    TeamEntity team
 
     @ManyToOne
     @JoinColumn(name = 'round_id')