Commit10b170c

committed

- added missing gap units

- added factory methods for dates, instants and strings

1 parent028d69c commit10b170cCopy full SHA for 10b170c

File tree

3 files changed

+26

-18

lines changed

src
- main/java/com/indoqa/solr/facet/api
  - GapUnit.java
  - RangeFacet.java
- test/java/com/indoqa/solr/facet/api
  - JsonSerializationTest.java

3 files changed

+26

-18

lines changed

`‎src/main/java/com/indoqa/solr/facet/api/GapUnit.java‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@`
`18`	`18`
`19`	`19`	`publicenumGapUnit {`
`20`	`20`
`21`		`-DAYS,HOURS,MINUTES,SECONDS`
	`21`	`+YEARS,MONTHS,WEEKS,DAYS,HOURS,MINUTES,SECONDS`
`22`	`22`
`23`	`23`	`}`

`‎src/main/java/com/indoqa/solr/facet/api/RangeFacet.java‎`

Lines changed: 24 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`*/`
`17`	`17`	`packagecom.indoqa.solr.facet.api;`
`18`	`18`
	`19`	`+importjava.time.Instant;`
`19`	`20`	`importjava.time.format.DateTimeFormatter;`
`20`	`21`	`importjava.util.Date;`
`21`	`22`
`@@ -31,12 +32,12 @@ public class RangeFacet extends AbstractFacet {`
`31`	`32`	`privatestaticfinalStringPARAM_FIELD ="field";`
`32`	`33`
`33`	`34`	`privatefinalStringfield;`
`34`		`-privatefinalDatestart;`
`35`		`-privatefinalDateend;`
	`35`	`+privatefinalStringstart;`
	`36`	`+privatefinalStringend;`
`36`	`37`	`privatefinalGapUnitgapUnit;`
`37`	`38`	`privatefinalintgapValue;`
`38`	`39`
`39`		`-publicRangeFacet(Stringname,Stringfield,Datestart,Dateend,GapUnitgapUnit,intgapValue) {`
	`40`	`+privateRangeFacet(Stringname,Stringfield,Stringstart,Stringend,GapUnitgapUnit,intgapValue) {`
`40`	`41`	`super(TYPE_RANGE,name);`
`41`	`42`
`42`	`43`	`this.field =field;`
`@@ -46,23 +47,30 @@ public RangeFacet(String name, String field, Date start, Date end, GapUnit gapUn`
`46`	`47`	`this.gapValue =gapValue;`
`47`	`48`	`}`
`48`	`49`
	`50`	`+publicstaticRangeFacetfromDates(Stringname,Stringfield,Datestart,Dateend,GapUnitgapUnit,intgapValue) {`
	`51`	`+returnfromInstants(name,field,start.toInstant(),end.toInstant(),gapUnit,gapValue);`
	`52`	`+ }`
	`53`	`+`
	`54`	`+publicstaticRangeFacetfromInstants(Stringname,Stringfield,Instantstart,Instantend,GapUnitgapUnit,intgapValue) {`
	`55`	`+returnfromStrings(name,field,DateTimeFormatter.ISO_INSTANT.format(start),DateTimeFormatter.ISO_INSTANT.format(end),`
	`56`	`+gapUnit,gapValue);`
	`57`	`+ }`
	`58`	`+`
	`59`	`+publicstaticRangeFacetfromStrings(Stringname,Stringfield,Stringstart,Stringend,GapUnitgapUnit,intgapValue) {`
	`60`	`+returnnewRangeFacet(name,field,start,end,gapUnit,gapValue);`
	`61`	`+ }`
	`62`	`+`
`49`	`63`	`@Override`
`50`	`64`	`protectedvoidwriteFacetConfiguration(JSONWriterjsonWriter) {`
`51`	`65`	`super.writeFacetConfiguration(jsonWriter);`
`52`	`66`
`53`		`-this.writeStringField(jsonWriter,PARAM_FIELD,this.field);`
`54`		`-this.writeValueSeparator(jsonWriter);`
`55`		`-this.writeStringField(jsonWriter,PARAM_START,this.toString(this.start));`
`56`		`-this.writeValueSeparator(jsonWriter);`
`57`		`-this.writeStringField(jsonWriter,PARAM_END,this.toString(this.end));`
`58`		`-this.writeValueSeparator(jsonWriter);`
`59`		`-this.writeStringField(jsonWriter,PARAM_GAP,this.toString(this.gapValue,this.gapUnit));`
`60`		`- }`
`61`		`-`
`62`		`-privateStringtoString(Datedate) {`
`63`		`-StringBuilderstringBuilder =newStringBuilder();`
`64`		`-DateTimeFormatter.ISO_INSTANT.formatTo(date.toInstant(),stringBuilder);`
`65`		`-returnstringBuilder.toString();`
	`67`	`+writeStringField(jsonWriter,PARAM_FIELD,this.field);`
	`68`	`+writeValueSeparator(jsonWriter);`
	`69`	`+writeStringField(jsonWriter,PARAM_START,this.start);`
	`70`	`+writeValueSeparator(jsonWriter);`
	`71`	`+writeStringField(jsonWriter,PARAM_END,this.end);`
	`72`	`+writeValueSeparator(jsonWriter);`
	`73`	`+writeStringField(jsonWriter,PARAM_GAP,this.toString(this.gapValue,this.gapUnit));`
`66`	`74`	`}`
`67`	`75`
`68`	`76`	`privateStringtoString(intvalue,GapUnitunit) {`

`‎src/test/java/com/indoqa/solr/facet/api/JsonSerializationTest.java‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void test() {`
`34`	`34`	`@Test`
`35`	`35`	`publicvoidtestDateRangeFacet() {`
`36`	`36`	`FacetListfacetList =newFacetList();`
`37`		`-RangeFacetrangeFacet =newRangeFacet("name","field",newDate(),newDate(),GapUnit.MINUTES,1);`
	`37`	`+RangeFacetrangeFacet =RangeFacet.fromDates("name","field",newDate(),newDate(),GapUnit.MINUTES,1);`
`38`	`38`	`facetList.addSubFacet(rangeFacet);`
`39`	`39`
`40`	`40`	`System.out.println(facetList.toJsonString());`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit10b170c

File tree

3 files changed

3 files changed

`‎src/main/java/com/indoqa/solr/facet/api/GapUnit.java‎`

`‎src/main/java/com/indoqa/solr/facet/api/RangeFacet.java‎`

`‎src/test/java/com/indoqa/solr/facet/api/JsonSerializationTest.java‎`

0 commit comments