remove GORM-without-Grails package

grails-guides · Jul 31, 2017 · 875ee9b · 875ee9b
1 parent 43ac273
commit 875ee9b
Show file tree

Hide file tree

Showing 29 changed files with 104 additions and 96 deletions.
diff --git a/complete/src/main/groovy/demo/GORMwithoutGrails/service/MakeService.groovy b/complete/src/main/groovy/demo/GORMwithoutGrails/service/MakeService.groovy
diff --git a/complete/src/main/groovy/demo/GORMwithoutGrails/service/ModelService.groovy b/complete/src/main/groovy/demo/GORMwithoutGrails/service/ModelService.groovy
diff --git a/complete/src/main/groovy/demo/GORMwithoutGrails/service/VehicleService.groovy b/complete/src/main/groovy/demo/GORMwithoutGrails/service/VehicleService.groovy
diff --git a/...rails/GormWithoutGrailsApplication.groovy → .../demo/GormWithoutGrailsApplication.groovy b/...rails/GormWithoutGrailsApplication.groovy → .../demo/GormWithoutGrailsApplication.groovy
@@ -1,4 +1,4 @@
-package demo.GORMwithoutGrails
+package demo
 
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication

diff --git a/...utGrails/controller/MakeController.groovy → ...ovy/demo/controller/MakeController.groovy b/...utGrails/controller/MakeController.groovy → ...ovy/demo/controller/MakeController.groovy
@@ -1,6 +1,6 @@
-package demo.GORMwithoutGrails.controller
+package demo.controller
 
-import demo.GORMwithoutGrails.service.MakeService
+import demo.service.MakeService
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController

diff --git a/...tGrails/controller/ModelController.groovy → ...vy/demo/controller/ModelController.groovy b/...tGrails/controller/ModelController.groovy → ...vy/demo/controller/ModelController.groovy
@@ -1,6 +1,6 @@
-package demo.GORMwithoutGrails.controller
+package demo.controller
 
-import demo.GORMwithoutGrails.service.ModelService
+import demo.service.ModelService
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController

diff --git a/...rails/controller/VehicleController.groovy → .../demo/controller/VehicleController.groovy b/...rails/controller/VehicleController.groovy → .../demo/controller/VehicleController.groovy
@@ -1,6 +1,6 @@
-package demo.GORMwithoutGrails.controller
+package demo.controller
 
-import demo.GORMwithoutGrails.service.VehicleService
+import demo.service.VehicleService
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController

diff --git a/...mo/GORMwithoutGrails/domain/Driver.groovy → ...src/main/groovy/demo/domain/Driver.groovy b/...mo/GORMwithoutGrails/domain/Driver.groovy → ...src/main/groovy/demo/domain/Driver.groovy
@@ -1,4 +1,4 @@
-package demo.GORMwithoutGrails.domain
+package demo.domain
 
 import grails.gorm.annotation.Entity
 

diff --git a/...demo/GORMwithoutGrails/domain/Make.groovy → ...e/src/main/groovy/demo/domain/Make.groovy b/...demo/GORMwithoutGrails/domain/Make.groovy → ...e/src/main/groovy/demo/domain/Make.groovy
@@ -1,4 +1,4 @@
-package demo.GORMwithoutGrails.domain
+package demo.domain
 
 import grails.gorm.annotation.Entity
 import org.grails.datastore.gorm.GormEntity

diff --git a/...emo/GORMwithoutGrails/domain/Model.groovy → .../src/main/groovy/demo/domain/Model.groovy b/...emo/GORMwithoutGrails/domain/Model.groovy → .../src/main/groovy/demo/domain/Model.groovy
@@ -1,4 +1,4 @@
-package demo.GORMwithoutGrails.domain
+package demo.domain
 
 import grails.gorm.annotation.Entity
 import org.grails.datastore.gorm.GormEntity

diff --git a/...demo/GORMwithoutGrails/domain/User.groovy → ...e/src/main/groovy/demo/domain/User.groovy b/...demo/GORMwithoutGrails/domain/User.groovy → ...e/src/main/groovy/demo/domain/User.groovy
@@ -1,4 +1,4 @@
-package demo.GORMwithoutGrails.domain
+package demo.domain
 
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString

diff --git a/...o/GORMwithoutGrails/domain/Vehicle.groovy → ...rc/main/groovy/demo/domain/Vehicle.groovy b/...o/GORMwithoutGrails/domain/Vehicle.groovy → ...rc/main/groovy/demo/domain/Vehicle.groovy
@@ -1,4 +1,4 @@
-package demo.GORMwithoutGrails.domain
+package demo.domain
 
 import grails.gorm.annotation.Entity
 import org.grails.datastore.gorm.GormEntity

diff --git a/complete/src/main/groovy/demo/service/MakeService.groovy b/complete/src/main/groovy/demo/service/MakeService.groovy
@@ -0,0 +1,7 @@
+package demo.service
+
+import demo.domain.Make
+
+interface MakeService {
+    List<Make> list()
+}
diff --git a/...houtGrails/service/MakeServiceImpl.groovy → ...roovy/demo/service/MakeServiceImpl.groovy b/...houtGrails/service/MakeServiceImpl.groovy → ...roovy/demo/service/MakeServiceImpl.groovy
@@ -1,6 +1,6 @@
-package demo.GORMwithoutGrails.service
+package demo.service
 
-import demo.GORMwithoutGrails.domain.Make
+import demo.domain.Make
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 

diff --git a/complete/src/main/groovy/demo/service/ModelService.groovy b/complete/src/main/groovy/demo/service/ModelService.groovy
@@ -0,0 +1,7 @@
+package demo.service
+
+import demo.domain.Model
+
+interface ModelService {
+    List<Model> list()
+}
diff --git a/...outGrails/service/ModelServiceImpl.groovy → ...oovy/demo/service/ModelServiceImpl.groovy b/...outGrails/service/ModelServiceImpl.groovy → ...oovy/demo/service/ModelServiceImpl.groovy
@@ -1,6 +1,7 @@
-package demo.GORMwithoutGrails.service
+package demo.service
 
-import demo.GORMwithoutGrails.domain.Model
+import demo.domain.Model
+import demo.domain.Model
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 

diff --git a/complete/src/main/groovy/demo/service/VehicleService.groovy b/complete/src/main/groovy/demo/service/VehicleService.groovy
@@ -0,0 +1,7 @@
+package demo.service
+
+import demo.domain.Vehicle
+
+interface VehicleService {
+    List<Vehicle> list()
+}
diff --git a/...tGrails/service/VehicleServiceImpl.groovy → ...vy/demo/service/VehicleServiceImpl.groovy b/...tGrails/service/VehicleServiceImpl.groovy → ...vy/demo/service/VehicleServiceImpl.groovy
@@ -1,6 +1,6 @@
-package demo.GORMwithoutGrails.service
+package demo.service
 
-import demo.GORMwithoutGrails.domain.Vehicle
+import demo.domain.Vehicle
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 

diff --git a/complete/src/test/groovy/demo/GORMwithoutGrails/domain/DriverSpec.groovy b/complete/src/test/groovy/demo/GORMwithoutGrails/domain/DriverSpec.groovy
@@ -1,14 +1,17 @@
-package demo.GORMwithoutGrails.domain
+package demo.domain
 
-import grails.gorm.transactions.Rollback
+import demo.domain.Driver
 import org.grails.orm.hibernate.HibernateDatastore
+import spock.lang.Specification
+import grails.gorm.transactions.Rollback
 import spock.lang.AutoCleanup
 import spock.lang.Shared
-import spock.lang.Specification
+
 
 class DriverSpec extends Specification {
 
-    @Shared @AutoCleanup HibernateDatastore datastore = new HibernateDatastore(getClass().getPackage())
+    @Shared @AutoCleanup
+    HibernateDatastore datastore = new HibernateDatastore(getClass().getPackage())
 
     @Rollback
     def "Driver created with name"() {

diff --git a/complete/src/test/groovy/demo/GORMwithoutGrails/domain/MakeSpec.groovy b/complete/src/test/groovy/demo/GORMwithoutGrails/domain/MakeSpec.groovy
@@ -1,5 +1,6 @@
-package demo.GORMwithoutGrails.domain
+package demo.domain
 
+import demo.domain.Make
 import grails.gorm.transactions.Rollback
 import org.grails.orm.hibernate.HibernateDatastore
 import spock.lang.AutoCleanup

diff --git a/complete/src/test/groovy/demo/GORMwithoutGrails/domain/ModelSpec.groovy b/complete/src/test/groovy/demo/GORMwithoutGrails/domain/ModelSpec.groovy
@@ -1,5 +1,6 @@
-package demo.GORMwithoutGrails.domain
+package demo.domain
 
+import demo.domain.Model
 import grails.gorm.transactions.Rollback
 import org.grails.orm.hibernate.HibernateDatastore
 import spock.lang.AutoCleanup

diff --git a/complete/src/test/groovy/demo/GORMwithoutGrails/domain/VehicleSpec.groovy b/complete/src/test/groovy/demo/GORMwithoutGrails/domain/VehicleSpec.groovy
@@ -1,5 +1,8 @@
-package demo.GORMwithoutGrails.domain
+package demo.domain
 
+import demo.domain.Make
+import demo.domain.Model
+import demo.domain.Vehicle
 import grails.gorm.transactions.Rollback
 import org.grails.orm.hibernate.HibernateDatastore
 import spock.lang.AutoCleanup

diff --git a/initial/src/main/groovy/demo/GORMwithoutGrails/GormWithoutGrailsApplication.groovy b/initial/src/main/groovy/demo/GORMwithoutGrails/GormWithoutGrailsApplication.groovy
@@ -1,4 +1,4 @@
-package demo.GORMwithoutGrails
+package demo
 
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication

diff --git a/initial/src/test/groovy/demo/GORMwithoutGrails/GormWithoutGrailsApplicationTests.groovy b/initial/src/test/groovy/demo/GORMwithoutGrails/GormWithoutGrailsApplicationTests.groovy
@@ -1,4 +1,4 @@
-package demo.GORMwithoutGrails
+package demo
 
 import org.junit.Test
 import org.junit.runner.RunWith

diff --git a/src/main/docs/guide/creatingTheControllers.adoc b/src/main/docs/guide/creatingTheControllers.adoc
@@ -2,13 +2,13 @@ Finally lets create some controllers so we can have basic UI access to our data.
 
 [source,bash]
 ----
-  $ cd src/main/groovy/demo/GORMwithoutGrails/controller
+  $ cd src/main/groovy/demo/controller
   $ touch MakeController
   $ touch ModelController
   $ touch VehicleController
 ----
 
-Now let’s edit our controllers under src/main/groovy/demo/GORMwithoutGrails/controller.
+Now let’s edit our controllers under src/main/groovy/demo/controller.
 We will import one of our services and update our index method. The controllers will have
 the following annotations
 
@@ -18,21 +18,21 @@ the following annotations
  - @RequestMapping("/") [on the method] - Sets the url mapping for the method, beyond the base url
 
 [source,groovy]
-./src/main/groovy/demo/GORMwithoutGrails/controller/MakeController.groovy
+./src/main/groovy/demo/controller/MakeController.groovy
 ----
-include::{sourceDir}/src/main/groovy/demo/GORMwithoutGrails/controller/MakeController.groovy[]
+include::{sourceDir}/src/main/groovy/demo/controller/MakeController.groovy[]
 ----
 
 [source,groovy]
-./src/main/groovy/demo/GORMwithoutGrails/controller/ModelController.groovy
+./src/main/groovy/demo/controller/ModelController.groovy
 ----
-include::{sourceDir}/src/main/groovy/demo/GORMwithoutGrails/controller/ModelController.groovy[]
+include::{sourceDir}/src/main/groovy/demo/controller/ModelController.groovy[]
 ----
 
 [source,groovy]
-./src/main/groovy/demo/GORMwithoutGrails/controller/VehicleController.groovy
+./src/main/groovy/demo/controller/VehicleController.groovy
 ----
-include::{sourceDir}/src/main/groovy/demo/GORMwithoutGrails/controller/VehicleController.groovy[]
+include::{sourceDir}/src/main/groovy/demo/controller/VehicleController.groovy[]
 ----
 
 Now that we have controllers with url mappings we have everything we need to test our

diff --git a/src/main/docs/guide/creatingTheDomain.adoc b/src/main/docs/guide/creatingTheDomain.adoc
@@ -12,7 +12,7 @@ Feel free to use your favorite IDE to create these or execute the following
 
 [source,bash]
 ----
-$ cd complete/src/main/groovy/demo/GORMwithoutGrails/domain/
+$ cd complete/src/main/groovy/demo/domain/
 $ touch Driver.groovy
 $ touch Make.groovy
 $ touch Model.groovy
@@ -24,7 +24,7 @@ Next lets do the same thing to setup our testing files.
 
 [source,bash]
 ----
-$ cd complete/src/test/groovy/demo/GORMwithoutGrails/domain/
+$ cd complete/src/test/groovy/demo/domain/
 $ touch DriverSpec.groovy
 $ touch MakeSpec.groovy
 $ touch ModelSpec.groovy
@@ -34,37 +34,37 @@ $ touch VehicleSpec.groovy
 Now that all our class stubs are in place lets go ahead and edit them.
 
 [source,groovy]
-./src/main/groovy/demo/GORMwithoutGrails/domain/Make.groovy
+./src/main/groovy/demo/domain/Make.groovy
 ----
-include::{sourceDir}/src/main/groovy/demo/GORMwithoutGrails/domain/Make.groovy[]
+include::{sourceDir}/src/main/groovy/demo/domain/Make.groovy[]
 ----
 
 [source,groovy]
-./src/main/groovy/demo/GORMwithoutGrails/domain/Model.groovy
+./src/main/groovy/demo/domain/Model.groovy
 ----
-include::{sourceDir}/src/main/groovy/demo/GORMwithoutGrails/domain/Model.groovy[]
+include::{sourceDir}/src/main/groovy/demo/domain/Model.groovy[]
 ----
 
 [source,groovy]
-./src/main/groovy/demo/GORMwithoutGrails/domain/Vehicle.groovy
+./src/main/groovy/demo/domain/Vehicle.groovy
 ----
-include::{sourceDir}/src/main/groovy/demo/GORMwithoutGrails/domain/Vehicle.groovy[]
+include::{sourceDir}/src/main/groovy/demo/domain/Vehicle.groovy[]
 ----
 
 There is a bit more to our `Driver.groovy` than meets the eye versus the first 3 classes. That's
 because we are actually extending our `User.groovy class with driver. This will grant us
 some extra flexibility in the future as we grow our application.
 
 [source,groovy]
-./src/main/groovy/demo/GORMwithoutGrails/domain/Driver.groovy
+./src/main/groovy/demo/domain/Driver.groovy
 ----
-include::{sourceDir}/src/main/groovy/demo/GORMwithoutGrails/domain/Driver.groovy[]
+include::{sourceDir}/src/main/groovy/demo/domain/Driver.groovy[]
 ----
 
 [source,groovy]
-./src/main/groovy/demo/GORMwithoutGrails/domain/User.groovy
+./src/main/groovy/demo/domain/User.groovy
 ----
-include::{sourceDir}/src/main/groovy/demo/GORMwithoutGrails/domain/User.groovy[]
+include::{sourceDir}/src/main/groovy/demo/domain/User.groovy[]
 ----
 
 Unlike standard GORM we annotate our domain classes with the `@Entity` annotation so that

diff --git a/src/main/docs/guide/creatingTheServices.adoc b/src/main/docs/guide/creatingTheServices.adoc
@@ -2,7 +2,7 @@ Next lets create our service layer for our application.
 
 [source,bash]
 ----
-  $ cd src/main/groovy/demo/GORMwithoutGrails/service
+  $ cd src/main/groovy/demo/service
   $ touch MakeService
   $ touch MakeServiceImpl
   $ touch ModelService
@@ -11,45 +11,45 @@ Next lets create our service layer for our application.
   $ touch VehicleServiceImpl
 ----
 
-Now let’s edit our service classes under src/main/groovy/demo/GORMwithoutGrails/service.
+Now let’s edit our service classes under src/main/groovy/demo/service.
 We’ll add a `list()` method to all of the classes. This method will have the following additional annotation.
 
 - @Transactional(readOnly = true) - good practice to have on methods that only return data
 
 [source,groovy]
-./src/main/groovy/demo/GORMwithoutGrails/service/MakeService.groovy
+./src/main/groovy/demo/service/MakeService.groovy
 ----
-include::{sourceDir}/src/main/groovy/demo/GORMwithoutGrails/service/MakeService.groovy[]
+include::{sourceDir}/src/main/groovy/demo/service/MakeService.groovy[]
 ----
 
 [source,groovy]
-./src/main/groovy/demo/GORMwithoutGrails/service/MakeServiceImpl.groovy
+./src/main/groovy/demo/service/MakeServiceImpl.groovy
 ----
-include::{sourceDir}/src/main/groovy/demo/GORMwithoutGrails/service/MakeServiceImpl.groovy[]
+include::{sourceDir}/src/main/groovy/demo/service/MakeServiceImpl.groovy[]
 ----
 
 [source,groovy]
-./src/main/groovy/demo/GORMwithoutGrails/service/ModelService.groovy
+./src/main/groovy/demo/service/ModelService.groovy
 ----
-include::{sourceDir}/src/main/groovy/demo/GORMwithoutGrails/service/ModelService.groovy[]
+include::{sourceDir}/src/main/groovy/demo/service/ModelService.groovy[]
 ----
 
 [source,groovy]
-./src/main/groovy/demo/GORMwithoutGrails/service/ModelServiceImpl.groovy
+./src/main/groovy/demo/service/ModelServiceImpl.groovy
 ----
-include::{sourceDir}/src/main/groovy/demo/GORMwithoutGrails/service/ModelServiceImpl.groovy[]
+include::{sourceDir}/src/main/groovy/demo/service/ModelServiceImpl.groovy[]
 ----
 
 [source,groovy]
-./src/main/groovy/demo/GORMwithoutGrails/service/VehicleService.groovy
+./src/main/groovy/demo/service/VehicleService.groovy
 ----
-include::{sourceDir}/src/main/groovy/demo/GORMwithoutGrails/service/VehicleService.groovy[]
+include::{sourceDir}/src/main/groovy/demo/service/VehicleService.groovy[]
 ----
 
 [source,groovy]
-./src/main/groovy/demo/GORMwithoutGrails/service/VehicleServiceImpl.groovy
+./src/main/groovy/demo/service/VehicleServiceImpl.groovy
 ----
-include::{sourceDir}/src/main/groovy/demo/GORMwithoutGrails/service/VehicleServiceImpl.groovy[]
+include::{sourceDir}/src/main/groovy/demo/service/VehicleServiceImpl.groovy[]
 ----
 
 Additionally all our service classes make use of the `@Service('someName')` annotation.