Skip to content

Commit

Permalink
Merge pull request #9 from hidevopsio/upgrade-hiboot-v0.10
Browse files Browse the repository at this point in the history 
hiboot-v0.10
  • Loading branch information
@john-deng
john-deng authored Nov 5, 2018
2 parents c40eab2 + da9775c commit ecbd651
Show file tree
Hide file tree
Showing 34 changed files with 155 additions and 154 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ branches:
only:
- master

go_import_path: hidevops.io/hiboot-data

before_install:
- go get -u github.com/golang/dep/cmd/dep
- dep ensure -v
Expand Down
97 changes: 48 additions & 49 deletions Gopkg.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Gopkg.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
version = "2.0.1"

[[constraint]]
name = "github.com/hidevopsio/hiboot"
version = "v0.9.8"
name = "hidevops.io/hiboot"
version = "v0.10.1"

[[constraint]]
name = "github.com/stretchr/testify"
Expand Down
24 changes: 12 additions & 12 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<a href="https://opensource.org/licenses/Apache-2.0">
<img src="https://img.shields.io/badge/License-Apache%202.0-green.svg" />
</a>
<a href="https://goreportcard.com/report/github.com/hidevopsio/hiboot-data">
<img src="https://goreportcard.com/badge/github.com/hidevopsio/hiboot-data" />
<a href="https://goreportcard.com/report/hidevops.io/hiboot-data">
<img src="https://goreportcard.com/badge/hidevops.io/hiboot-data" />
</a>
<a href="https://godoc.org/github.com/hidevopsio/hiboot-data">
<a href="https://godoc.org/hidevops.io/hiboot-data">
<img src="https://godoc.org/github.com/golang/gddo?status.svg" />
</a>
</p>
Expand All @@ -37,7 +37,7 @@ then Hiboot auto-configures an database bolt for any service to inject.
You need to opt-in to auto-configuration by embedding app.Configuration in your configuration and
calling the app.Register() function inside the init() function of your configuration pkg.

For more details, see https://godoc.org/github.com/hidevopsio/hiboot/pkg/starter
For more details, see https://godoc.org/hidevops.io/hiboot/pkg/starter

## Creating Your Own Starter

Expand Down Expand Up @@ -87,7 +87,7 @@ import (
"encoding/json"
"errors"
"github.com/boltdb/bolt"
"github.com/hidevopsio/hiboot-data/starter"
"hidevops.io/hiboot-data/starter"
"sync"
)

Expand Down Expand Up @@ -237,8 +237,8 @@ package bolt
// limitations under the License.

import (
"github.com/hidevopsio/hiboot/pkg/app"
"github.com/hidevopsio/hiboot/pkg/log"
"hidevops.io/hiboot/pkg/app"
"hidevops.io/hiboot/pkg/log"
)

type boltConfiguration struct {
Expand Down Expand Up @@ -275,17 +275,17 @@ func (c *boltConfiguration) BoltRepository() Repository {

After bolt starter is built, you can inject it directly in your application.

Below is the example, for more details, please see [example](https://github.com/hidevopsio/hiboot-data/tree/master/examples/bolt)
Below is the example, for more details, please see [example](https://hidevops.io/hiboot-data/tree/master/examples/bolt)

```go


package service

import (
"github.com/hidevopsio/hiboot-data/examples/bolt/entity"
"github.com/hidevopsio/hiboot-data/starter/bolt"
"github.com/hidevopsio/hiboot/pkg/app"
"hidevops.io/hiboot-data/examples/bolt/entity"
"hidevops.io/hiboot-data/starter/bolt"
"hidevops.io/hiboot/pkg/app"
)

type UserService struct {
Expand All @@ -296,7 +296,7 @@ func init() {
app.Register(newUserService)
}

// will inject BoltRepository that configured in github.com/hidevopsio/hiboot-data/starter/bolt
// will inject BoltRepository that configured in hidevops.io/hiboot-data/starter/bolt
func newUserService(repository bolt.Repository) *UserService {
return &UserService{
repository: repository,
Expand Down
8 changes: 4 additions & 4 deletions examples/bolt/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ main.go
package main

import (
"github.com/hidevopsio/hiboot/pkg/starter/web"
_ "github.com/hidevopsio/hiboot/examples/db/bolt/controllers"
"hidevops.io/hiboot/pkg/starter/web"
_ "hidevops.io/hiboot/examples/db/bolt/controllers"
)

func main() {
Expand Down Expand Up @@ -56,14 +56,14 @@ type UserController struct {

In order to inject Repository into Service, you need to

* import github.com/hidevopsio/hiboot/pkg/starter/db
* import hidevops.io/hiboot/pkg/starter/db
* add tag `component:"repository" dataSourceType:"bolt"` to the field Repository of UserService


```go

import (
"github.com/hidevopsio/hiboot/pkg/starter/db"
"hidevops.io/hiboot/pkg/starter/db"
)

type UserService struct {
Expand Down
10 changes: 5 additions & 5 deletions examples/bolt/controller/user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
package controller

import (
"github.com/hidevopsio/hiboot-data/examples/bolt/entity"
"github.com/hidevopsio/hiboot-data/examples/bolt/service"
"github.com/hidevopsio/hiboot/pkg/app"
"github.com/hidevopsio/hiboot/pkg/app/web"
"github.com/hidevopsio/hiboot/pkg/model"
"hidevops.io/hiboot-data/examples/bolt/entity"
"hidevops.io/hiboot-data/examples/bolt/service"
"hidevops.io/hiboot/pkg/app"
"hidevops.io/hiboot/pkg/app/web"
"hidevops.io/hiboot/pkg/model"
"net/http"
)

Expand Down
6 changes: 3 additions & 3 deletions examples/bolt/controller/user_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
package controller

import (
"github.com/hidevopsio/hiboot-data/examples/bolt/entity"
"github.com/hidevopsio/hiboot/pkg/app/web"
"github.com/hidevopsio/hiboot/pkg/log"
"hidevops.io/hiboot-data/examples/bolt/entity"
"hidevops.io/hiboot/pkg/app/web"
"hidevops.io/hiboot/pkg/log"
"net/http"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/bolt/entity/user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package entity

import "github.com/hidevopsio/hiboot/pkg/model"
import "hidevops.io/hiboot/pkg/model"

type User struct {
model.RequestBody
Expand Down
10 changes: 5 additions & 5 deletions examples/bolt/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
package main

import (
_ "github.com/hidevopsio/hiboot-data/examples/bolt/controller"
"github.com/hidevopsio/hiboot/pkg/app/web"
_ "github.com/hidevopsio/hiboot/pkg/starter/actuator"
_ "github.com/hidevopsio/hiboot/pkg/starter/locale"
_ "github.com/hidevopsio/hiboot/pkg/starter/logging"
_ "hidevops.io/hiboot-data/examples/bolt/controller"
"hidevops.io/hiboot/pkg/app/web"
_ "hidevops.io/hiboot/pkg/starter/actuator"
_ "hidevops.io/hiboot/pkg/starter/locale"
_ "hidevops.io/hiboot/pkg/starter/logging"
)

func main() {
Expand Down
8 changes: 4 additions & 4 deletions examples/bolt/service/user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
package service

import (
"github.com/hidevopsio/hiboot-data/examples/bolt/entity"
"github.com/hidevopsio/hiboot-data/starter/bolt"
"github.com/hidevopsio/hiboot/pkg/app"
"hidevops.io/hiboot-data/examples/bolt/entity"
"hidevops.io/hiboot-data/starter/bolt"
"hidevops.io/hiboot/pkg/app"
)

type UserService struct {
Expand All @@ -28,7 +28,7 @@ func init() {
app.Register(newUserService)
}

// will inject BoltRepository that configured in github.com/hidevopsio/hiboot/pkg/starter/data/bolt
// will inject BoltRepository that configured in hidevops.io/hiboot/pkg/starter/data/bolt
func newUserService(repository bolt.Repository) *UserService {
return &UserService{
repository: repository,
Expand Down
4 changes: 2 additions & 2 deletions examples/bolt/service/user_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package service

import (
"github.com/hidevopsio/hiboot-data/examples/bolt/entity"
"github.com/hidevopsio/hiboot-data/starter"
"hidevops.io/hiboot-data/examples/bolt/entity"
"hidevops.io/hiboot-data/starter"
"github.com/stretchr/testify/assert"
"testing"
)
Expand Down
14 changes: 7 additions & 7 deletions examples/etcd/controller/user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
package controller

import (
"github.com/hidevopsio/hiboot-data/examples/etcd/entity"
"github.com/hidevopsio/hiboot-data/examples/etcd/service"
"github.com/hidevopsio/hiboot/pkg/app"
"github.com/hidevopsio/hiboot/pkg/app/web"
"github.com/hidevopsio/hiboot/pkg/model"
"github.com/hidevopsio/hiboot/pkg/utils/copier"
"github.com/hidevopsio/hiboot/pkg/utils/idgen"
"hidevops.io/hiboot-data/examples/etcd/entity"
"hidevops.io/hiboot-data/examples/etcd/service"
"hidevops.io/hiboot/pkg/app"
"hidevops.io/hiboot/pkg/app/web"
"hidevops.io/hiboot/pkg/model"
"hidevops.io/hiboot/pkg/utils/copier"
"hidevops.io/hiboot/pkg/utils/idgen"
"net/http"
)

Expand Down
12 changes: 6 additions & 6 deletions examples/etcd/controller/user_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ package controller

import (
"errors"
"github.com/hidevopsio/hiboot-data/examples/etcd/entity"
"github.com/hidevopsio/hiboot-data/starter/etcd/fake"
"github.com/hidevopsio/hiboot/pkg/app"
"github.com/hidevopsio/hiboot/pkg/app/web"
"github.com/hidevopsio/hiboot/pkg/log"
"github.com/hidevopsio/hiboot/pkg/utils/idgen"
"hidevops.io/hiboot-data/examples/etcd/entity"
"hidevops.io/hiboot-data/starter/etcd/fake"
"hidevops.io/hiboot/pkg/app"
"hidevops.io/hiboot/pkg/app/web"
"hidevops.io/hiboot/pkg/log"
"hidevops.io/hiboot/pkg/utils/idgen"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"net/http"
Expand Down
10 changes: 5 additions & 5 deletions examples/etcd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
package main

import (
_ "github.com/hidevopsio/hiboot-data/examples/etcd/controller"
"github.com/hidevopsio/hiboot/pkg/app/web"
_ "github.com/hidevopsio/hiboot/pkg/starter/actuator"
_ "github.com/hidevopsio/hiboot/pkg/starter/locale"
_ "github.com/hidevopsio/hiboot/pkg/starter/logging"
_ "hidevops.io/hiboot-data/examples/etcd/controller"
"hidevops.io/hiboot/pkg/app/web"
_ "hidevops.io/hiboot/pkg/starter/actuator"
_ "hidevops.io/hiboot/pkg/starter/locale"
_ "hidevops.io/hiboot/pkg/starter/logging"
)

func main() {
Expand Down
Loading

0 comments on commit ecbd651

Please sign in to comment.