Project

General

Profile

Revision fe0c2ae8

IDfe0c2ae8739c0cde7b527a912a7a1c49326028ea
Parent f13dc62d
Child 0df21dfd

Added by Andreas Müller over 3 years ago

cleanup

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java
105 105
	@Transactional(readOnly = true)
106 106
	@Override
107 107
	public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) {
108
		ISourceable result = null;
108
		ISourceable<?> result = null;
109 109

  
110 110
		List<T> list = dao.findOriginalSourceByIdInSource(idInSource, idNamespace);
111 111
		if (! list.isEmpty()){
......
142 142
				results = dao.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
143 143
		 }
144 144

  
145
		  return new DefaultPagerImpl<>(pageNumber, numberOfResults, pageSize, results);
145
		 return new DefaultPagerImpl<>(pageNumber, numberOfResults, pageSize, results);
146 146
	}
147 147

  
148 148
	@Transactional(readOnly = true)
......
175 175
		 long r = 0;
176 176
		 r += numberOfResults;
177 177

  
178
		  return new DefaultPagerImpl<>(pageNumber, r , pageSize, results);
178
		 return new DefaultPagerImpl<>(pageNumber, r , pageSize, results);
179 179
	}
180 180

  
181 181
	@Transactional(readOnly = true)
......
185 185

  
186 186
		 List<T> results = new ArrayList<>();
187 187
		 if(numberOfResults > 0) { // no point checking again //TODO use AbstractPagerImpl.hasResultsInRange(numberOfResults, pageNumber, pageSize)
188
				results = dao.findByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
188
		     results = dao.findByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
189 189
		 }
190 190
		 return results;
191 191
	}
......
292 292
	 * @param entitiesToUpdate
293 293
	 * @param entity
294 294
	 */
295
	/**
296
	 * @param cacheStrategy
297
	 * @param entitiesToUpdate
298
	 * @param entity
299
	 */
300 295
	@SuppressWarnings("unchecked")
301 296
	private void updateTitleCacheForSingleEntity(
302 297
			IIdentifiableEntityCacheStrategy<T> cacheStrategy,
cdmlib-test/src/main/java/eu/etaxonomy/cdm/test/integration/CdmIntegrationTest.java
24 24
import org.dbunit.database.DatabaseConnection;
25 25
import org.dbunit.database.IDatabaseConnection;
26 26
import org.dbunit.dataset.filter.ITableFilterSimple;
27
import org.dbunit.dataset.xml.FlatXmlDataSet;
27 28
import org.dbunit.ext.h2.H2DataTypeFactory;
28 29
import org.h2.tools.Server;
29 30
import org.junit.Before;
......
31 32
import org.springframework.transaction.support.DefaultTransactionDefinition;
32 33
import org.unitils.UnitilsJUnit4;
33 34
import org.unitils.database.annotations.TestDataSource;
35
import org.unitils.dbunit.util.MultiSchemaXmlDataSetReader;
34 36
import org.unitils.orm.hibernate.annotation.HibernateSessionFactory;
35 37
import org.unitils.spring.annotation.SpringApplicationContext;
36 38
import org.unitils.spring.annotation.SpringBeanByType;

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)