Index: branches/pssGrails3/src/main/groovy/com/lemanscorp/search/solr/QuickSearch.groovy =================================================================== diff -u -r8884 -r8885 --- branches/pssGrails3/src/main/groovy/com/lemanscorp/search/solr/QuickSearch.groovy (.../QuickSearch.groovy) (revision 8884) +++ branches/pssGrails3/src/main/groovy/com/lemanscorp/search/solr/QuickSearch.groovy (.../QuickSearch.groovy) (revision 8885) @@ -1,45 +1,42 @@ package com.lemanscorp.search.solr -import java.util.TreeMap; +class QuickSearch { -class QuickSearch{ - List brandDivisionData=[] - List partDivisionData=[] - List catalogProductDivisionData=[] - List catalogCategoryDivisionData=[] + List brandDivisionData = [] + List partDivisionData = [] + List catalogProductDivisionData = [] + List catalogCategoryDivisionData = [] - TreeMap catalogMap=[:] - TreeMap firstLevelCategory=[:] + def getQuickSearchResponse() { + QuickSearchResponse qsResponse = new QuickSearchResponse() + qsResponse.divisions.add(maskDivision(catalogProductDivisionData, 'CatalogProduct')) + qsResponse.divisions.add(maskDivision(partDivisionData, 'Part')) + qsResponse.divisions.add(maskDivision(catalogCategoryDivisionData, 'CatalogCategory')) + qsResponse.divisions.add(maskDivision(brandDivisionData, 'Brand')) + qsResponse + } - def getQuickSearchResponse(){ - QuickSearchResponse qsResponse = new QuickSearchResponse() - qsResponse.divisions.add( maskDivision(catalogProductDivisionData,'CatalogProduct')) - qsResponse.divisions.add( maskDivision(partDivisionData,'Part')) - qsResponse.divisions.add( maskDivision(catalogCategoryDivisionData,'CatalogCategory')) - qsResponse.divisions.add( maskDivision(brandDivisionData,'Brand')) - return qsResponse - } - def maskDivision(def data,def divisionName){ - Division division= new Division(name:divisionName) - division.values= data - return division - } - + def maskDivision(def data, def divisionName) { + Division division = new Division(name: divisionName) + division.values = data + division + } } + class Division { - String name - long count - def values = [] + String name + long count + def values = [] } class DivValue { - String name - String id - long count + String name + String id + long count } -class QuickSearchResponse{ - List divisions = [] +class QuickSearchResponse { + List divisions = [] }