Mentions légales du service

Skip to content
Snippets Groups Projects

EVSCLT-949 Report counter fix and HandleObjectFile DAO proxy

Merged Cédric Eoche-Duval requested to merge bugfix/EVSCLT-949-report-counters into release/3.0.0
28 files
+ 1201
2080
Compare changes
  • Side-by-side
  • Inline
Files
28
package net.ihe.gazelle.mca.contentanalyzer.adapters.analysis.dao;
import net.ihe.gazelle.common.application.action.ApplicationPreferenceManager;
import net.ihe.gazelle.evsclient.application.interfaces.adapters.ProcessingNotFoundException;
import net.ihe.gazelle.evsclient.domain.processing.UnexpectedProcessingException;
import net.ihe.gazelle.evsclient.interlay.dao.AbstractProcessingDaoImpl;
import net.ihe.gazelle.evsclient.interlay.dao.RepositoryType;
import net.ihe.gazelle.evsclient.interlay.dao.HandledObjectFile;
import net.ihe.gazelle.evsclient.interlay.dao.Repository;
import net.ihe.gazelle.evsclient.interlay.util.FileUtil;
import net.ihe.gazelle.hql.criterion.HQLCriterionsForFilter;
import net.ihe.gazelle.hql.paths.HQLSafePathBasicDate;
@@ -40,8 +40,8 @@ public class AnalysisDaoImpl extends AbstractProcessingDaoImpl<Analysis> impleme
}
@Override
public RepositoryType getRepositoryType(Analysis processedObject) {
return RepositoryTypes.MCA;
public Repository getRepositoryType(Analysis processedObject) {
return McaRepositoryTypes.MCA;
}
@Override
@@ -50,7 +50,7 @@ public class AnalysisDaoImpl extends AbstractProcessingDaoImpl<Analysis> impleme
}
public Analysis getByParentAnalysisPart(AnalysisPart parentAnalysisPart) {
AnalysisQuery analysisQuery = new AnalysisQuery(entityManagerFactory.createEntityManager());
AnalysisQuery analysisQuery = new AnalysisQuery(getEntityManager());
analysisQuery.rootAnalysisPart().id().eq(parentAnalysisPart.getId());
return analysisQuery.getUniqueResult();
}
@@ -85,4 +85,19 @@ public class AnalysisDaoImpl extends AbstractProcessingDaoImpl<Analysis> impleme
}
}
}
/**
*
* {@inheritDoc}
*
* @deprecated This method is exposing internal information of the DAO mechanism and is violating responsabilies.
* However some legacy code are still coupled with the file mechanism (such as MCA) and must be refactored first
* before deleting this method.
*/
@Override
@Deprecated
public HandledObjectFile getObjectDAOImpl(Analysis analysis) {
return getEntityManager().find(HandledObjectFile.class, analysis.getObject().getId());
}
}
Loading