Skip to content

Commit

Permalink
Merge pull request #43 from nuest/master
Browse files Browse the repository at this point in the history 
Update to json config file and online transformer resource
  • Loading branch information
Daniel Nüst committed Dec 18, 2013
2 parents 6d630c3 + 3265b41 commit def538a
Show file tree
Hide file tree
Showing 42 changed files with 3,197 additions and 1,128 deletions.
37 changes: 37 additions & 0 deletions client/src/main/java/org/n52/geolabel/client/DocumentReference.java
View file
Expand Up @@ -90,6 +90,19 @@ public InputStream getContent() throws IOException {
HttpEntity responseEntity = httpClient.execute(new HttpGet(this.documentUrl.toString())).getEntity();
return responseEntity.getContent();
}

@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("URLDocument [");
if (this.documentUrl != null) {
builder.append("documentUrl=");
builder.append(this.documentUrl);
}
builder.append("]");
return builder.toString();
}

}

/**
Expand All @@ -109,6 +122,18 @@ public InputStream getContent() {
return null;
}

@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("InputStreamDocument [");
if (this.documentStream != null) {
builder.append("documentStream=");
builder.append(this.documentStream);
}
builder.append("]");
return builder.toString();
}

}

/**
Expand Down Expand Up @@ -138,6 +163,18 @@ public InputStream getContent() throws IOException {
return null;
}

@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("XMLDocument [");
if (this.documentXml != null) {
builder.append("documentXml=");
builder.append(this.documentXml);
}
builder.append("]");
return builder.toString();
}

}

}
15 changes: 11 additions & 4 deletions client/src/main/java/org/n52/geolabel/client/GeoLabelClientV1.java
View file
Expand Up @@ -17,6 +17,7 @@

import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;

import org.apache.commons.io.IOUtils;
Expand Down Expand Up @@ -86,9 +87,11 @@ else if (labelRequestBuilder.feedbackDocument != null && !labelRequestBuilder.fe
builder.setParameter(PARAM_METADATA, labelRequestBuilder.metadataDocument.getUrl().toString());

if (labelRequestBuilder.getDesiredSize() != null)
builder.setParameter(PARAM_DESIREDSIZE, "" + labelRequestBuilder.getDesiredSize());
builder.setParameter(PARAM_DESIREDSIZE, labelRequestBuilder.getDesiredSize().toString());

request = new HttpGet(builder.build());
URI requestUri = builder.build();

request = new HttpGet(requestUri);
} catch (URISyntaxException e) {
throw new IOException(e);
}
Expand Down Expand Up @@ -116,6 +119,7 @@ else if (labelRequestBuilder.feedbackDocument != null && !labelRequestBuilder.fe
}

// Issue request
log.debug("Issuing request {}", request);

HttpResponse response = HTTPCLIENT.execute(request);
if (response.getStatusLine().getStatusCode() != 200) {
Expand All @@ -139,8 +143,11 @@ else if (labelRequestBuilder.feedbackDocument != null && !labelRequestBuilder.fe
};

protected final static DefaultHttpClient HTTPCLIENT;
private static Logger log = LoggerFactory.getLogger(GeoLabelClientV1.class);

static Logger log = LoggerFactory.getLogger(GeoLabelClientV1.class);

protected static final String PARAM_DESIREDSIZE = Constants.PARAM_SIZE;

protected static final String PARAM_FEEDBACK = Constants.PARAM_FEEDBACK;

protected static final String PARAM_FEEDBACK_DRILL = Constants.PARAM_FEEDBACK_DRILL;
Expand All @@ -167,7 +174,7 @@ public static GeoLabelRequestBuilder createGeoLabelRequest() {
}

public static GeoLabelRequestBuilder createGeoLabelRequest(String serviceUrl) {
return new GeoLabelRequestBuilder(geolabelRequestHandler, DEFAULT_GEO_LABEL_SERVER);
return new GeoLabelRequestBuilder(geolabelRequestHandler, serviceUrl);
}

@Override
Expand Down
37 changes: 37 additions & 0 deletions client/src/main/java/org/n52/geolabel/client/GeoLabelRequestBuilder.java
View file
Expand Up @@ -139,4 +139,41 @@ public GeoLabelRequestBuilder setUseCache(boolean useCache) {
return this;
}

@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("GeoLabelRequestBuilder [");
if (this.metadataDocument != null) {
builder.append("metadataDocument=");
builder.append(this.metadataDocument);
builder.append(", ");
}
if (this.feedbackDocument != null) {
builder.append("feedbackDocument=");
builder.append(this.feedbackDocument);
builder.append(", ");
}
if (this.requestHandler != null) {
builder.append("requestHandler=");
builder.append(this.requestHandler);
builder.append(", ");
}
if (this.desiredSize != null) {
builder.append("desiredSize=");
builder.append(this.desiredSize);
builder.append(", ");
}
builder.append("forceDownload=");
builder.append(this.forceDownload);
builder.append(", useCache=");
builder.append(this.useCache);
builder.append(", ");
if (this.serviceUrl != null) {
builder.append("serviceUrl=");
builder.append(this.serviceUrl);
}
builder.append("]");
return builder.toString();
}

}
20 changes: 16 additions & 4 deletions ...ver/mapping/description/package-info.java → .../org/n52/geolabel/commons/ErrorFacet.java
View file
Expand Up @@ -13,9 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@XmlAccessorType(XmlAccessType.NONE)
package org.n52.geolabel.server.mapping.description;

import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
package org.n52.geolabel.commons;

//@XmlRootElement(name = "errorInformation")
public class ErrorFacet extends LabelFacet {
// @XmlElement
private String errorMessage;

public String getErrorMessage() {
return this.errorMessage;
}

public void setErrorMessage(String errorMessage) {
this.errorMessage = errorMessage;
updateAvailability(Availability.AVAILABLE);
}

}

0 comments on commit def538a

Please sign in to comment.