Skip to content

Commit

Permalink
Updated to the latest JSON schema
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Wibowo committed Nov 10, 2013
1 parent a91ffb0 commit c8625e7
Show file tree
Hide file tree
Showing 7 changed files with 5,086 additions and 9 deletions.
Expand Up @@ -13,7 +13,7 @@ public class BusinessInfo implements Serializable{
* Legal identifier associated with the business (eg, liquor licence number).
* Optional
*/
private int legalId;
private String legalId;

/**
* Australian Business Number
Expand Down Expand Up @@ -42,11 +42,11 @@ public class BusinessInfo implements Serializable{
public BusinessInfo() {
}

public int getLegalId() {
public String getLegalId() {
return legalId;
}

public void setLegalId(int legalId) {
public void setLegalId(String legalId) {
this.legalId = legalId;
}

Expand Down
39 changes: 39 additions & 0 deletions model/src/main/java/org/isolution/sensis/domain/Image.java
@@ -0,0 +1,39 @@
package org.isolution.sensis.domain;

import java.io.Serializable;

/**
* User: alexwibowo
*/
public class Image implements Serializable {

private String thumbnailUrl;

private String largeUrl;

private String altText;

public String getThumbnailUrl() {
return thumbnailUrl;
}

public void setThumbnailUrl(String thumbnailUrl) {
this.thumbnailUrl = thumbnailUrl;
}

public String getLargeUrl() {
return largeUrl;
}

public void setLargeUrl(String largeUrl) {
this.largeUrl = largeUrl;
}

public String getAltText() {
return altText;
}

public void setAltText(String altText) {
this.altText = altText;
}
}
22 changes: 17 additions & 5 deletions model/src/main/java/org/isolution/sensis/domain/ResultEntry.java
Expand Up @@ -107,7 +107,9 @@ public class ResultEntry {
* @link org.isolution.sensis.domain.OperatingHour
* @link org.isolution.sensis.domain.DayType
*/
private Map<DayType, OperatingHour> operatingHours;
private Map<DayType, OperatingHour> openingHours;

private List<Image> imageGallery;

public ResultEntry() {
}
Expand Down Expand Up @@ -249,11 +251,21 @@ public void setAdditionalAddresses(List<Address> additionalAddresses) {
this.additionalAddresses = additionalAddresses;
}

public Map<DayType, OperatingHour> getOperatingHours() {
return operatingHours;
public Map<DayType, OperatingHour> getOpeningHours() {
return openingHours;
}

public void setOpeningHours(Map<DayType, OperatingHour> openingHours) {
this.openingHours = openingHours;
}

public void setOperatingHours(Map<DayType, OperatingHour> operatingHours) {
this.operatingHours = operatingHours;
public List<Image> getImageGallery() {
return imageGallery;
}

public void setImageGallery(List<Image> imageGallery) {
this.imageGallery = imageGallery;
}


}
10 changes: 10 additions & 0 deletions service/pom.xml
Expand Up @@ -21,5 +21,15 @@
<artifactId>commons-configuration</artifactId>
<version>${commons-configuration.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>14.0.1</version>
</dependency>
</dependencies>
</project>
Expand Up @@ -3,7 +3,10 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.util.List;

import com.google.common.base.Joiner;
import org.apache.commons.io.IOUtils;
import org.codehaus.jackson.map.ObjectMapper;
import org.isolution.sensis.cfg.SensisApiConfiguration;
import org.isolution.sensis.domain.SearchResult;
Expand Down
Expand Up @@ -13,7 +13,7 @@ public void test_search() throws IOException {
SensisApiSearchService sensisApiSearchService = new SensisApiSearchService(
new FileBasedSensisApiConfiguration());
SearchResult cafe = sensisApiSearchService.search(
"malaysian restaurant", "east bentleigh");
"car repairer", "east bentleigh");
System.out.println(cafe.getCount());
}
}
5,013 changes: 5,013 additions & 0 deletions service/src/test/resources/sample.json

Large diffs are not rendered by default.

0 comments on commit c8625e7

Please sign in to comment.