X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsserver%2Fapiv1.go;fp=lib%2Fapiv1%2Fapiv1.go;h=1f6df9e5f104fff736191a028a33f1d80d0d4478;hb=2f7828d01f4c4ca2909f95f098627cd5475ed225;hp=fffed2d53950f8b89a77e569cd2b1876c050c327;hpb=5caebfb4b7c3b73988f067082b219ce5b7f409ba;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/apiv1/apiv1.go b/lib/xdsserver/apiv1.go
similarity index 58%
rename from lib/apiv1/apiv1.go
rename to lib/xdsserver/apiv1.go
index fffed2d..1f6df9e 100644
--- a/lib/apiv1/apiv1.go
+++ b/lib/xdsserver/apiv1.go
@@ -1,36 +1,20 @@
-package apiv1
+package xdsserver
 
 import (
-	"github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
-
-	"github.com/iotbzh/xds-server/lib/crosssdk"
-	"github.com/iotbzh/xds-server/lib/model"
-	"github.com/iotbzh/xds-server/lib/session"
-	"github.com/iotbzh/xds-server/lib/xdsconfig"
 )
 
 // APIService .
 type APIService struct {
-	router    *gin.Engine
+	*Context
 	apiRouter *gin.RouterGroup
-	sessions  *session.Sessions
-	cfg       *xdsconfig.Config
-	mfolders  *model.Folders
-	sdks      *crosssdk.SDKs
-	log       *logrus.Logger
 }
 
-// New creates a new instance of API service
-func New(r *gin.Engine, sess *session.Sessions, cfg *xdsconfig.Config, mfolders *model.Folders, sdks *crosssdk.SDKs) *APIService {
+// NewAPIV1 creates a new instance of API service
+func NewAPIV1(ctx *Context) *APIService {
 	s := &APIService{
-		router:    r,
-		sessions:  sess,
-		apiRouter: r.Group("/api/v1"),
-		cfg:       cfg,
-		mfolders:  mfolders,
-		sdks:      sdks,
-		log:       cfg.Log,
+		Context:   ctx,
+		apiRouter: ctx.WWWServer.router.Group("/api/v1"),
 	}
 
 	s.apiRouter.GET("/version", s.getVersion)