"encoding/json"
"fmt"
"os"
- "path/filepath"
- "strings"
"sync"
log "github.com/sirupsen/logrus"
+ "oransc.org/nonrtric/dmaapmediatorproducer/internal/config"
"oransc.org/nonrtric/dmaapmediatorproducer/internal/restclient"
)
-type Type struct {
- TypeId string `json:"id"`
- DMaaPTopic string `json:"dmaapTopic"`
- Schema string `json:"schema"`
- Jobs map[string]JobInfo
+type TypeData struct {
+ TypeId string `json:"id"`
+ DMaaPTopicURL string `json:"dmaapTopicUrl"`
+ Jobs map[string]JobInfo
}
type JobInfo struct {
- Owner string `json:"owner"`
- LastUpdated string `json:"last_updated"`
- InfoJobIdentity string `json:"info_job_identity"`
- TargetUri string `json:"target_uri"`
- InfoJobData string `json:"info_job_data"`
- InfoTypeIdentity string `json:"info_type_identity"`
+ Owner string `json:"owner"`
+ LastUpdated string `json:"last_updated"`
+ InfoJobIdentity string `json:"info_job_identity"`
+ TargetUri string `json:"target_uri"`
+ InfoJobData interface{} `json:"info_job_data"`
+ InfoTypeIdentity string `json:"info_type_identity"`
+}
+
+type JobTypeHandler interface {
+ GetTypes() ([]config.TypeDefinition, error)
+ GetSupportedTypes() []string
}
type JobHandler interface {
AddJob(JobInfo) error
+ DeleteJob(jobId string)
}
-var (
- mu sync.Mutex
- typeDir = "configs"
- Handler JobHandler
- allJobs = make(map[string]Type)
-)
-
-func init() {
- Handler = newJobHandlerImpl()
+type JobHandlerImpl struct {
+ mu sync.Mutex
+ configFile string
+ allTypes map[string]TypeData
+ pollClient restclient.HTTPClient
+ distributeClient restclient.HTTPClient
}
-type jobHandlerImpl struct{}
-
-func newJobHandlerImpl() *jobHandlerImpl {
- return &jobHandlerImpl{}
+func NewJobHandlerImpl(typeConfigFilePath string, pollClient restclient.HTTPClient, distributeClient restclient.HTTPClient) *JobHandlerImpl {
+ return &JobHandlerImpl{
+ configFile: typeConfigFilePath,
+ allTypes: make(map[string]TypeData),
+ pollClient: pollClient,
+ distributeClient: distributeClient,
+ }
}
-func (jh *jobHandlerImpl) AddJob(ji JobInfo) error {
- mu.Lock()
- defer mu.Unlock()
- if err := validateJobInfo(ji); err == nil {
- jobs := allJobs[ji.InfoTypeIdentity].Jobs
+func (jh *JobHandlerImpl) AddJob(ji JobInfo) error {
+ jh.mu.Lock()
+ defer jh.mu.Unlock()
+ if err := jh.validateJobInfo(ji); err == nil {
+ jobs := jh.allTypes[ji.InfoTypeIdentity].Jobs
jobs[ji.InfoJobIdentity] = ji
+ log.Debug("Added job: ", ji)
return nil
} else {
return err
}
}
-func validateJobInfo(ji JobInfo) error {
- if _, ok := allJobs[ji.InfoTypeIdentity]; !ok {
+func (jh *JobHandlerImpl) DeleteJob(jobId string) {
+ jh.mu.Lock()
+ defer jh.mu.Unlock()
+ for _, typeData := range jh.allTypes {
+ delete(typeData.Jobs, jobId)
+ }
+ log.Debug("Deleted job: ", jobId)
+}
+
+func (jh *JobHandlerImpl) validateJobInfo(ji JobInfo) error {
+ if _, ok := jh.allTypes[ji.InfoTypeIdentity]; !ok {
return fmt.Errorf("type not supported: %v", ji.InfoTypeIdentity)
}
if ji.InfoJobIdentity == "" {
return nil
}
-func GetTypes() ([]*Type, error) {
- mu.Lock()
- defer mu.Unlock()
- types := make([]*Type, 0, 1)
- err := filepath.Walk(typeDir,
- func(path string, info os.FileInfo, err error) error {
- if err != nil {
- return err
- }
- if strings.Contains(path, ".json") {
- if jobType, err := getType(path); err == nil {
- types = append(types, jobType)
- }
- }
- return nil
- })
+func (jh *JobHandlerImpl) GetTypes() ([]config.TypeDefinition, error) {
+ jh.mu.Lock()
+ defer jh.mu.Unlock()
+ typeDefsByte, err := os.ReadFile(jh.configFile)
+ if err != nil {
+ return nil, err
+ }
+ typeDefs := struct {
+ Types []config.TypeDefinition `json:"types"`
+ }{}
+ err = json.Unmarshal(typeDefsByte, &typeDefs)
if err != nil {
return nil, err
}
- return types, nil
+ for _, typeDef := range typeDefs.Types {
+ jh.allTypes[typeDef.Id] = TypeData{
+ TypeId: typeDef.Id,
+ DMaaPTopicURL: typeDef.DmaapTopicURL,
+ Jobs: make(map[string]JobInfo),
+ }
+ }
+ return typeDefs.Types, nil
}
-func GetSupportedTypes() []string {
- mu.Lock()
- defer mu.Unlock()
+func (jh *JobHandlerImpl) GetSupportedTypes() []string {
+ jh.mu.Lock()
+ defer jh.mu.Unlock()
supportedTypes := []string{}
- for k := range allJobs {
+ for k := range jh.allTypes {
supportedTypes = append(supportedTypes, k)
}
return supportedTypes
}
-func AddJob(job JobInfo) error {
- return Handler.AddJob(job)
-}
-
-func getType(path string) (*Type, error) {
- if typeDefinition, err := os.ReadFile(path); err == nil {
- var dat map[string]interface{}
- if marshalError := json.Unmarshal(typeDefinition, &dat); marshalError == nil {
- schema, _ := json.Marshal(dat["schema"])
- typeInfo := Type{
- TypeId: dat["id"].(string),
- DMaaPTopic: dat["dmaapTopic"].(string),
- Schema: string(schema),
- Jobs: make(map[string]JobInfo),
- }
- if _, ok := allJobs[typeInfo.TypeId]; !ok {
- allJobs[typeInfo.TypeId] = typeInfo
- }
- return &typeInfo, nil
- } else {
- return nil, marshalError
- }
- } else {
- return nil, err
- }
-}
-
-func RunJobs(mRAddress string) {
+func (jh *JobHandlerImpl) RunJobs(mRAddress string) {
for {
- pollAndDistributeMessages(mRAddress)
+ jh.pollAndDistributeMessages(mRAddress)
}
}
-func pollAndDistributeMessages(mRAddress string) {
- for typeId, typeInfo := range allJobs {
+func (jh *JobHandlerImpl) pollAndDistributeMessages(mRAddress string) {
+ jh.mu.Lock()
+ defer jh.mu.Unlock()
+ for typeId, typeInfo := range jh.allTypes {
log.Debugf("Processing jobs for type: %v", typeId)
- messagesBody, error := restclient.Get(fmt.Sprintf("%v/events/%v/users/dmaapmediatorproducer", mRAddress, typeInfo.DMaaPTopic))
+ messagesBody, error := restclient.Get(fmt.Sprintf("%v/%v", mRAddress, typeInfo.DMaaPTopicURL), jh.pollClient)
if error != nil {
log.Warnf("Error getting data from MR. Cause: %v", error)
continue
}
- distributeMessages(messagesBody, typeInfo)
+ jh.distributeMessages(messagesBody, typeInfo)
}
}
-func distributeMessages(messages []byte, typeInfo Type) {
+func (jh *JobHandlerImpl) distributeMessages(messages []byte, typeInfo TypeData) {
if len(messages) > 2 {
- mu.Lock()
for _, jobInfo := range typeInfo.Jobs {
- go sendMessagesToConsumer(messages, jobInfo)
+ go jh.sendMessagesToConsumer(messages, jobInfo)
}
- mu.Unlock()
}
}
-func sendMessagesToConsumer(messages []byte, jobInfo JobInfo) {
+func (jh *JobHandlerImpl) sendMessagesToConsumer(messages []byte, jobInfo JobInfo) {
log.Debugf("Processing job: %v", jobInfo.InfoJobIdentity)
- if postErr := restclient.Post(jobInfo.TargetUri, messages); postErr != nil {
+ if postErr := restclient.Post(jobInfo.TargetUri, messages, jh.distributeClient); postErr != nil {
log.Warnf("Error posting data for job: %v. Cause: %v", jobInfo, postErr)
}
}
-func clearAll() {
- allJobs = make(map[string]Type)
+func (jh *JobHandlerImpl) clearAll() {
+ jh.allTypes = make(map[string]TypeData)
}
Code Review / nonrtric.git / blobdiff