Strabon

changeset 962:1f7216ab63ee

made EndpointCapabilities the default class for getting capabilities (in beans.xml) and fixed NULL pointer exception
author Babis Nikolaou <charnik@di.uoa.gr>
date Tue Apr 02 12:09:10 2013 +0300 (2013-04-02)
parents 93bbe156e6e2
children bfb42acb9ba3
files endpoint/WebContent/WEB-INF/beans.xml endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/capabilities/CapabilitiesBean.java
line diff
     1.1 --- a/endpoint/WebContent/WEB-INF/beans.xml	Tue Apr 02 12:01:30 2013 +0300
     1.2 +++ b/endpoint/WebContent/WEB-INF/beans.xml	Tue Apr 02 12:09:10 2013 +0300
     1.3 @@ -19,7 +19,7 @@
     1.4  		<!-- true : AutoDiscoveryCapabilities -->
     1.5  		<!-- false: EndpointCapabilities -->
     1.6  		<constructor-arg type="boolean">
     1.7 -            <value>true</value>
     1.8 +            <value>false</value>
     1.9          </constructor-arg>
    1.10  	</bean>
    1.11  	
     2.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/capabilities/CapabilitiesBean.java	Tue Apr 02 12:01:30 2013 +0300
     2.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/capabilities/CapabilitiesBean.java	Tue Apr 02 12:09:10 2013 +0300
     2.3 @@ -124,13 +124,15 @@
     2.4  		
     2.5  		RequestCapabilities reCap = caps.getQueryCapabilities();
     2.6  		
     2.7 -		for (Parameter param : reCap.getParametersObject().getParameters()) {
     2.8 -			out.println("Supports parameter  : " + param.getName());
     2.9 -			
    2.10 -			if (param.getAcceptedValues().size() > 0) {
    2.11 -				out.println("    Accepted values : ");
    2.12 -				for (String acceptedValue : param.getAcceptedValues()) {
    2.13 -					out.println("\t\t      " + acceptedValue);
    2.14 +		if (reCap.getParametersObject() != null) {
    2.15 +			for (Parameter param : reCap.getParametersObject().getParameters()) {
    2.16 +				out.println("Supports parameter  : " + param.getName());
    2.17 +				
    2.18 +				if (param.getAcceptedValues().size() > 0) {
    2.19 +					out.println("    Accepted values : ");
    2.20 +					for (String acceptedValue : param.getAcceptedValues()) {
    2.21 +						out.println("\t\t      " + acceptedValue);
    2.22 +					}
    2.23  				}
    2.24  			}
    2.25  		}