Project

General

Profile

« Previous | Next » 

Revision b09fb3b9

Added by Andreas Müller over 3 years ago

cleanup and improve generics

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/agent/IAgentDao.java
105 105
	 */
106 106
	public List<UuidAndTitleCache<Team>> getTeamUuidAndTitleCache();
107 107

  
108
	/**
109
	 * @return
110
	 */
111 108
	public List<UuidAndTitleCache<Institution>> getInstitutionUuidAndTitleCache(Integer limit, String pattern);
112 109

  
113
    /**
114
     * @param clazz
115
     * @param limit
116
     * @param pattern
117
     * @return
118
     */
119
    List<UuidAndTitleCache<AgentBase>> getUuidAndAbbrevTitleCache(Class clazz, Integer limit, String pattern);
120

  
121
    /**
122
     * @param clazz
123
     * @param queryString
124
     * @param matchmode
125
     * @param criterion
126
     * @param pageSize
127
     * @param pageNumber
128
     * @param orderHints
129
     * @param propertyPaths
130
     * @return
131
     */
132
    List<AgentBase> findByTitleAndAbbrevTitle(Class clazz, String queryString, MatchMode matchmode,
110
    public List<UuidAndTitleCache<AgentBase>> getUuidAndAbbrevTitleCache(Class clazz, Integer limit, String pattern);
111

  
112
    public <T extends AgentBase<?>> List<T> findByTitleAndAbbrevTitle(Class<T> clazz, String queryString, MatchMode matchmode,
133 113
            List<Criterion> criterion, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints,
134 114
            List<String> propertyPaths);
135 115
}
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java
205 205
    }
206 206

  
207 207
	@Override
208
    public List<AgentBase> findByTitleAndAbbrevTitle(Class clazz, String queryString, MatchMode matchmode, List<Criterion> criterion, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
208
    public <T extends AgentBase<?>> List<T> findByTitleAndAbbrevTitle(Class<T> clazz, String queryString, MatchMode matchmode, List<Criterion> criterion, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
209 209
        Set<String> params = new HashSet<>();
210 210
        params.add("titleCache");
211 211
        params.add("nomenclaturalTitle");
212 212

  
213 213
	    return findByParam(clazz, params, queryString, matchmode, criterion, pageSize, pageNumber, orderHints, propertyPaths);
214 214
    }
215

  
216

  
217
}
215
}
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AgentServiceImpl.java
258 258
    }
259 259

  
260 260
    @Override
261
    public List<AgentBase> findByTitleAndAbbrevTitle(IIdentifiableEntityServiceConfigurator<AgentBase> config){
261
    public <T extends AgentBase<?>> List<T> findByTitleAndAbbrevTitle(IIdentifiableEntityServiceConfigurator<T> config){
262 262
        return dao.findByTitleAndAbbrevTitle(config.getClazz(),config.getTitleSearchStringSqlized(), config.getMatchMode(), config.getCriteria(), config.getPageSize(), config.getPageNumber(), config.getOrderHints(), config.getPropertyPaths());
263 263
    }
264 264
}
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IAgentService.java
165 165
	 */
166 166
	public UpdateResult convertPerson2Team(Person person) throws MergeException, IllegalArgumentException;
167 167

  
168
    public <T extends AgentBase<?>> List<T> findByTitleAndAbbrevTitle(IIdentifiableEntityServiceConfigurator<T> config);
168 169

  
169
    public List<AgentBase> findByTitleAndAbbrevTitle(IIdentifiableEntityServiceConfigurator<AgentBase> config);
170

  
171
}
170
}
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/FindOccurrencesConfigurator.java
17 17
/**
18 18
 * @author pplitzner
19 19
 * @since Apr 13, 2015
20
 *
21 20
 */
22
public class FindOccurrencesConfigurator extends IdentifiableServiceConfiguratorImpl<SpecimenOrObservationBase>{
21
public class FindOccurrencesConfigurator
22
        extends IdentifiableServiceConfiguratorImpl<SpecimenOrObservationBase>{
23 23

  
24
    private static final long serialVersionUID = 1L;
24
    private static final long serialVersionUID = -3225141895711379298L;
25 25

  
26 26
    private SpecimenOrObservationType specimenType;
27 27
    private UUID associatedTaxonUuid;
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/IIdentifiableEntityServiceConfigurator.java
26 26
public interface IIdentifiableEntityServiceConfigurator<T extends IIdentifiableEntity>
27 27
            extends Serializable {
28 28

  
29
	public Class<? extends T> getClazz();
29
	public Class<T> getClazz();
30 30

  
31 31
	public void setClazz(Class<? extends T> clazz);
32 32

  
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/IdentifiableServiceConfiguratorImpl.java
39 39
	private List<OrderHint> orderHints;
40 40

  
41 41
	@Override
42
	public Class<? extends T> getClazz() {
43
		return clazz;
42
	public Class<T> getClazz() {
43
		return (Class)clazz;
44 44
	}
45 45

  
46 46
	@Override

Also available in: Unified diff