Project

General

Profile

« Previous | Next » 

Revision 114cd073

Added by Andreas Müller about 1 year ago

cleanup

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
1166 1166
        return criteria;
1167 1167
    }
1168 1168

  
1169

  
1170 1169
    @Override
1171 1170
    public <S extends T> List<S> findByParamWithRestrictions(Class<S> clazz, String param, String queryString,
1172 1171
            MatchMode matchmode, List<Restriction<?>> restrictions, Integer pageSize, Integer pageNumber,
......
1221 1220

  
1222 1221
    private class PropertySelectorImpl implements PropertySelector {
1223 1222

  
1224
        private final Set<String> includeProperties;
1225
        /**
1226
         *
1227
         */
1228 1223
        private static final long serialVersionUID = -3175311800911570546L;
1229 1224

  
1225
        private final Set<String> includeProperties;
1226

  
1230 1227
        public PropertySelectorImpl(Set<String> includeProperties) {
1231 1228
            this.includeProperties = includeProperties;
1232 1229
        }
......
1239 1236
                return false;
1240 1237
            }
1241 1238
        }
1242

  
1243 1239
    }
1244 1240

  
1245 1241
    private class CriterionWithOperator {
......
1247 1243
        Restriction.Operator operator;
1248 1244
        Criterion criterion;
1249 1245

  
1250

  
1251 1246
        public CriterionWithOperator(Operator operator, Criterion criterion) {
1252 1247
            super();
1253 1248
            this.operator = operator;
1254 1249
            this.criterion = criterion;
1255 1250
        }
1256

  
1257

  
1258 1251
    }
1259 1252

  
1260 1253
    /**
......
1274 1267
        return criteria;
1275 1268
    }
1276 1269

  
1277
    /**
1278
     * @param clazz
1279
     * @param auditEvent
1280
     * @return
1281
     */
1282 1270
    protected AuditQuery makeAuditQuery(Class<? extends CdmBase> clazz, AuditEvent auditEvent) {
1283 1271
        AuditQuery query = null;
1284 1272

  
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DeduplicationHelper.java
15 15
import javax.naming.Reference;
16 16

  
17 17
import org.apache.commons.lang.UnhandledException;
18
import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
18
import org.apache.logging.log4j.LogManager;
19
import org.apache.logging.log4j.Logger;
19 20
import org.hibernate.MappingException;
20 21
import org.hibernate.Session;
21 22
import org.hibernate.internal.SessionFactoryImpl;
......
231 232
		return superClass.isAssignableFrom(class1) && superClass.isAssignableFrom(class2);
232 233
	}
233 234

  
234
	/**
235
	 * @param <T>
236
	 * @param cdmBase1
237
	 * @param cdmBase2
238
	 * @param clazz
239
	 * @param sessionFactory
240
	 * @throws MergeException
241
	 * @throws ClassNotFoundException
242
	 * @throws NoSuchFieldException
243
	 */
244 235
	private <T extends CdmBase> void mergeExternal(T cdmBase1, T cdmBase2, Class<T> clazz,
245 236
			Session session) throws MergeException {
246 237
//		handleAnnotations
......
303 294
		}
304 295
	}
305 296

  
306

  
307
	/**
308
	 * @param <T>
309
	 * @param cdmBase1
310
	 * @param cdmBase2
311
	 * @param session
312
	 */
313 297
	private <T> void handleAnnotationsEtc(T cdmBase1, T cdmBase2, Session session) {
314 298
		//when handling annotations and other elements linked via @Any an JDBC errors occurs
315 299
		//due to the unique column constraint in the association table on the column referencing

Also available in: Unified diff