merged from trunk
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/branches/common/common-clients/2.0@83965 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
fabio.simeoni
parent
e58ebe247e
commit
4ce241ea41
|
|
@ -8,7 +8,10 @@
|
|||
<Changeset component="common-clients-2.0.1" date="2013-01-11">
|
||||
<Change>Improved error handling in Plugin#convert()</Change>
|
||||
</Changeset>
|
||||
<Changeset component="${build.finalName}" date="2013-15-04">
|
||||
<Changeset component="common-clients-2.0.2" date="2013-15-04">
|
||||
<Change>AddressUtils preserve protocol from URIs/URLs</Change>
|
||||
</Changeset>
|
||||
<Changeset component="${build.finalName}" date="2013-10-10">
|
||||
<Change>internal refactoring</Change>
|
||||
</Changeset>
|
||||
</ReleaseNotes>
|
||||
2
pom.xml
2
pom.xml
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
<groupId>org.gcube.core</groupId>
|
||||
<artifactId>common-clients</artifactId>
|
||||
<version>2.0.2-SNAPSHOT</version>
|
||||
<version>2.1.0-SNAPSHOT</version>
|
||||
|
||||
<name>Common Clients</name>
|
||||
<description>A framework for client APIs</description>
|
||||
|
|
|
|||
|
|
@ -28,6 +28,18 @@ public interface ProxyPlugin<A,S,P> {
|
|||
* @return the namespace
|
||||
*/
|
||||
String namespace();
|
||||
|
||||
/**
|
||||
* Returns the gCube name of the service.
|
||||
* @return the name
|
||||
*/
|
||||
String serviceClass();
|
||||
|
||||
/**
|
||||
* Returns the gCube class of the service.
|
||||
* @return the class
|
||||
*/
|
||||
String serviceName();
|
||||
|
||||
/**
|
||||
* Converts a fault raised by a {@link Call} into a fault that can be recognised by {@link ProxyDelegate} clients.
|
||||
|
|
|
|||
|
|
@ -1,134 +0,0 @@
|
|||
package org.gcube.common.clients.queries;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.gcube.common.clients.delegates.ProxyPlugin;
|
||||
import org.gcube.common.clients.exceptions.DiscoveryException;
|
||||
|
||||
/**
|
||||
* Partial implementation of {@link Query}s.
|
||||
*
|
||||
* @author Fabio Simeoni
|
||||
*
|
||||
* @param <A> the type of service addresses
|
||||
* @param <R> the type of query results
|
||||
*/
|
||||
public abstract class AbstractQuery<A,R> implements Query<A> {
|
||||
|
||||
private final ProxyPlugin<A,?,?> plugin;
|
||||
private final Map<String,String> conditions = new HashMap<String, String>();
|
||||
|
||||
//default matcher does not filter out any result
|
||||
private ResultMatcher<R> matcher = new ResultMatcher<R>() {
|
||||
@Override public boolean match(R doc) {
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Creates an instance with a {@link ISFacade}, a {@link PluginAdapter}, and a type of IS queries
|
||||
* @param facade the facade
|
||||
* @param plugin the plugin
|
||||
* @param queryClass the query type
|
||||
*/
|
||||
protected AbstractQuery(ProxyPlugin<A,?,?> plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a condition to the query.
|
||||
* @param property an expression that identifies a property of service endpoints
|
||||
* @param value the value of the property
|
||||
*/
|
||||
public void addCondition(String property, String value) {
|
||||
this.conditions.put(property,value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets an {@link ResultMatcher} for the query.
|
||||
* @param matcher the matcher.
|
||||
*/
|
||||
public void setMatcher(ResultMatcher<R> matcher) {
|
||||
this.matcher=matcher;
|
||||
}
|
||||
|
||||
@Override
|
||||
public final List<A> fire() throws DiscoveryException {
|
||||
|
||||
//delegate actual execution to subclass-specific mechanisms
|
||||
List<R> results = fire(conditions);
|
||||
|
||||
//from results to addresses
|
||||
List<A> endpoints = new ArrayList<A>();
|
||||
|
||||
for (R result : results)
|
||||
try {
|
||||
if (matcher.match(result)) //should we include this? ask matcher
|
||||
endpoints.add(address(result)); //extract address
|
||||
}
|
||||
catch(IllegalArgumentException e) {
|
||||
//skip result, this is just a signal from subclasses
|
||||
};
|
||||
|
||||
return endpoints;
|
||||
}
|
||||
|
||||
/**
|
||||
* Executes the query through implementation-specific means.
|
||||
* @param conditions the conditions to apply on the query prior to its execution
|
||||
* @return the query results
|
||||
* @throws DiscoveryException if the query could not be executed
|
||||
*/
|
||||
protected abstract List<R> fire(Map<String,String> conditions) throws DiscoveryException;
|
||||
|
||||
/**
|
||||
* Returns an endpoint address from a query result.
|
||||
* @param result the result
|
||||
* @return the address
|
||||
* @throws IllegalArgumentException if an address cannot be derived from the result
|
||||
*/
|
||||
protected abstract A address(R result) throws IllegalArgumentException;
|
||||
|
||||
/**
|
||||
* Returns the {@link ProxyPlugin}.
|
||||
* @return the plugin
|
||||
*/
|
||||
protected ProxyPlugin<A,?,?> plugin() {
|
||||
return plugin;
|
||||
}
|
||||
|
||||
//queries are value objects based on properties
|
||||
|
||||
@Override
|
||||
public final boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null)
|
||||
return false;
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
AbstractQuery<?,?> other = (AbstractQuery<?,?>) obj;
|
||||
if (conditions == null) {
|
||||
if (other.conditions != null)
|
||||
return false;
|
||||
} else if (!conditions.equals(other.conditions))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public final int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result + ((conditions == null) ? 0 : conditions.hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public final String toString() {
|
||||
return conditions.toString();
|
||||
}
|
||||
}
|
||||
|
|
@ -9,7 +9,7 @@ package org.gcube.common.clients.queries;
|
|||
*
|
||||
* @param <R> the type of query results
|
||||
*
|
||||
* @see AbstractQuery
|
||||
* @see Query
|
||||
*
|
||||
*/
|
||||
public interface ResultMatcher<R> {
|
||||
|
|
|
|||
Loading…
Reference in New Issue