[Title] nitpick apply to SocketJobRequestListner class

[Type] Enhancement
[Module] Toolchain /
[Priority] Major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: I081eb3e5d3b981828edcd72701c60e02924dd866

diff --git a/src/build_server/SocketJobRequestListener.rb b/src/build_server/SocketJobRequestListener.rb
index 2e0bc19664d2e65bad4731347f71f09edcb1e057..b865b98e8465fabe33544221bd20cfb96e44b2eb 100644 (file)
--- a/src/build_server/SocketJobRequestListener.rb
+++ b/src/build_server/SocketJobRequestListener.rb
@@ -155,12 +155,12 @@ class SocketJobRequestListener
                # Case2. BUILD|GIT|git_repos||os|async|internal|rev_build|commit|pkgs
 
                # parse
-               project_name_list=tok[2].split(",")
-               passwd=tok[3]
-               os_list=tok[4].split(",")
-               async = (not tok[5].nil? and tok[5]=="YES") ? true : false
-               is_internal = (not tok[6].nil? and tok[6]=="YES") ? true : false
-               rev_job = (not tok[7].nil? and tok[7].eql? "YES") ? true : false
+               project_name_list = tok[2].split(",")
+               passwd = tok[3]
+               os_list = tok[4].split(",")
+               async = tok[5].eql? "YES"
+               is_internal = tok[6].eql? "YES"
+               rev_job = tok[7].eql? "YES"
                git_commit = (not tok[8].nil? and not tok[8].empty?) ? tok[8] : nil
                pkg_files = (not tok[9].nil? and not tok[9].empty?) ? tok[9].split(",") : []
 
@@ -176,7 +176,7 @@ class SocketJobRequestListener
                        project_name_list.each { |pname|
                                check_build_project(pname,passwd,req)   
                                os_list.each { |os|
-                                       new_job = create_new_job( pname, os, req  )
+                                       new_job = create_new_job( pname, os )
                                        if new_job.nil? then
                                                @log.warn "\"#{pname}\" does not support #{os}"
                                                next
@@ -199,7 +199,7 @@ class SocketJobRequestListener
                        git_repos = project_name_list[0]
                        os = os_list[0]
 
-                       new_job = create_new_internal_job(git_repos, os, git_commit, pkg_files, req)
+                       new_job = create_new_internal_job(git_repos, os, git_commit, pkg_files )
                        if rev_job then new_job.set_rev_build_check_job(nil) end
 
                # single job
@@ -208,7 +208,7 @@ class SocketJobRequestListener
                        os = os_list[0]
 
                        check_build_project(pname,passwd,req)
-                       new_job = create_new_job( pname, os, req  )
+                       new_job = create_new_job( pname, os )
                else
                        BuildCommServer.send_begin(req)
                        req.puts "Error: There is no valid job to build!"
@@ -269,13 +269,13 @@ class SocketJobRequestListener
                end
 
                case tok[1]
-               # RESOLVE|GIT|repos|commit|os|url
+               # RESOLVE|GIT|repos|commit|os|async
                when "GIT"
                        # parse
                        project_name=tok[2]
                        passwd=tok[3]
                        os=tok[4]
-                       async = (not tok[5].nil? and tok[6]=="YES" ? true:false)
+                       async = tok[5].eql? "YES"
 
                        # check project
                        prj = check_project_exist(project_name, req)
@@ -296,7 +296,7 @@ class SocketJobRequestListener
                        os = os_list[0]
                        
                        # create new job
-                       new_job = create_new_job( project_name, os, req  )
+                       new_job = create_new_job( project_name, os )
                        if new_job.nil? then
                                raise "Creating build job failed : #{project_name}, #{os}"
                        end
@@ -757,7 +757,7 @@ class SocketJobRequestListener
 
 
        private
-       def create_new_job( project_name, os, req )
+       def create_new_job( project_name, os )
                return @parent_server.prjmgr.create_new_job(project_name, os)
        end
 
@@ -779,7 +779,7 @@ class SocketJobRequestListener
 
 
        private
-       def create_new_internal_job( git_repos, os, git_commit, pkg_files, req )
+       def create_new_internal_job( git_repos, os, git_commit, pkg_files )
                prj = @parent_server.prjmgr.get_git_project( git_repos )
                if prj.nil? then
                        prj = @parent_server.prjmgr.create_unnamed_git_project( git_repos )