Skip to content

Commit

Permalink
fix: remove useless error tag
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nolife999
Nolife999 committed Oct 6, 2023
1 parent 64a2f65 commit f9e8cf2
Show file tree
Hide file tree
Showing 2 changed files with 163 additions and 179 deletions.
324 changes: 160 additions & 164 deletions arc-core/src/main/java/fr/insee/arc/core/service/p2chargement/engine/ChargeurXml.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,175 +28,171 @@
import fr.insee.arc.utils.utils.SecuredSaxParser;

/**
* Classe chargeant les fichiers Xml. Utiliser l'api SAX pour parser les fichiers
* Classe chargeant les fichiers Xml. Utiliser l'api SAX pour parser les
* fichiers
*
* @author S4LWO8
*
*/
public class ChargeurXml implements IChargeur{
private static final Logger LOGGER = LogManager.getLogger(ChargeurXml.class);
private String fileName;
private Connection connexion;
private String tableChargementPilTemp;
private String currentPhase;
private Norme norme;
private String validite;
private InputStream f;

// temporary table where data will be loaded by the XML SAX engine
private String tableTempA;
private FastList<String> tempTableAColumnsLongName=new FastList<>(Arrays.asList(ColumnEnum.ID_SOURCE.getColumnName(),"id","date_integration","id_norme","periodicite","validite"));
private FastList<String> tempTableAColumnsShortName=new FastList<>(Arrays.asList("m0","m1","m2","m3","m4","m5"));
private FastList<String> tempTableAColumnsType=new FastList<>(Arrays.asList(ColumnEnum.ID_SOURCE.getColumnType().getTypeCollated(),"int","text collate \"C\"","text collate \"C\"","text collate \"C\"","text collate \"C\""));

private String rapport = null;
private Boolean error = false;
private String jointure;

/**
* constructor with thread object
* @param threadChargementService
* @param fileName
*/
public ChargeurXml(ThreadChargementService threadChargementService, String fileName) {
this.fileName = fileName;
this.connexion = threadChargementService.getConnexion().getExecutorConnection();
this.tableTempA = threadChargementService.getTableTempA();
this.tableChargementPilTemp = threadChargementService.getTableChargementPilTemp();
this.currentPhase = threadChargementService.getCurrentPhase();
this.f = threadChargementService.filesInputStreamLoad.getTmpInxChargement();
this.norme = threadChargementService.normeOk;
this.validite = threadChargementService.validite;
}

/**
* Autonomous execution with parameters constructor
* @throws ArcException
*/
public void executeEngine() throws ArcException {
initialisation();
execution();
}

@Override
public void initialisation() throws ArcException {
StaticLoggerDispatcher.info(LOGGER, "** requeteCreateA **");

java.util.Date beginDate = new java.util.Date();

StringBuilder requete = new StringBuilder();
requete.append(FormatSQL.dropTable(this.tableTempA));
requete.append("CREATE ");

if (!this.tableTempA.contains(".")) {
requete.append("TEMPORARY ");
} else {
requete.append(" ");
}

// la tabble temporaire A : ids|id|d|data|nombre_colonnes
// data : contiendra les données chargé au format text séparée par des virgules
// nombre_colonnes : contiendra le nombre de colonne contenue dans data, nécessaire pour compléter la ligne avec des virgules

requete.append(" TABLE " + this.tableTempA + " (");
boolean noComma=true;
for (int i=0;i<tempTableAColumnsLongName.size();i++)
{
if (noComma)
{
noComma=false;
}
else
{
requete.append(",");
}
requete.append(tempTableAColumnsShortName.get(i)+" "+tempTableAColumnsType.get(i)+" ");
}
requete.append(") ");
requete.append(FormatSQL.WITH_NO_VACUUM);
requete.append(";");

try {
public class ChargeurXml implements IChargeur {
private static final Logger LOGGER = LogManager.getLogger(ChargeurXml.class);
private String fileName;
private Connection connexion;
private String tableChargementPilTemp;
private String currentPhase;
private Norme norme;
private String validite;
private InputStream f;

// temporary table where data will be loaded by the XML SAX engine
private String tableTempA;
private FastList<String> tempTableAColumnsLongName = new FastList<>(Arrays.asList(
ColumnEnum.ID_SOURCE.getColumnName(), "id", "date_integration", "id_norme", "periodicite", "validite"));
private FastList<String> tempTableAColumnsShortName = new FastList<>(
Arrays.asList("m0", "m1", "m2", "m3", "m4", "m5"));
private FastList<String> tempTableAColumnsType = new FastList<>(
Arrays.asList(ColumnEnum.ID_SOURCE.getColumnType().getTypeCollated(), "int", "text collate \"C\"",
"text collate \"C\"", "text collate \"C\"", "text collate \"C\""));

private String rapport = null;
private String jointure;

/**
* constructor with thread object
*
* @param threadChargementService
* @param fileName
*/
public ChargeurXml(ThreadChargementService threadChargementService, String fileName) {
this.fileName = fileName;
this.connexion = threadChargementService.getConnexion().getExecutorConnection();
this.tableTempA = threadChargementService.getTableTempA();
this.tableChargementPilTemp = threadChargementService.getTableChargementPilTemp();
this.currentPhase = threadChargementService.getCurrentPhase();
this.f = threadChargementService.filesInputStreamLoad.getTmpInxChargement();
this.norme = threadChargementService.normeOk;
this.validite = threadChargementService.validite;
}

/**
* Autonomous execution with parameters constructor
*
* @throws ArcException
*/
public void executeEngine() throws ArcException {
initialisation();
execution();
}

@Override
public void initialisation() throws ArcException {
StaticLoggerDispatcher.info(LOGGER, "** requeteCreateA **");

java.util.Date beginDate = new java.util.Date();

StringBuilder requete = new StringBuilder();
requete.append(FormatSQL.dropTable(this.tableTempA));
requete.append("CREATE ");

if (!this.tableTempA.contains(".")) {
requete.append("TEMPORARY ");
} else {
requete.append(" ");
}

// la tabble temporaire A : ids|id|d|data|nombre_colonnes
// data : contiendra les données chargé au format text séparée par des virgules
// nombre_colonnes : contiendra le nombre de colonne contenue dans data,
// nécessaire pour compléter la ligne avec des virgules

requete.append(" TABLE " + this.tableTempA + " (");
boolean noComma = true;
for (int i = 0; i < tempTableAColumnsLongName.size(); i++) {
if (noComma) {
noComma = false;
} else {
requete.append(",");
}
requete.append(tempTableAColumnsShortName.get(i) + " " + tempTableAColumnsType.get(i) + " ");
}
requete.append(") ");
requete.append(FormatSQL.WITH_NO_VACUUM);
requete.append(";");

try {
UtilitaireDao.get(0).executeBlock(this.connexion, requete);
} catch (ArcException e) {
LoggerHelper.errorAsComment(LOGGER, "ChargeurXML.initialisation - creation failed on the temporary table A which is the temporary recipient for the xml file to be loaded");
throw e;
LoggerHelper.errorAsComment(LOGGER,
"ChargeurXML.initialisation - creation failed on the temporary table A which is the temporary recipient for the xml file to be loaded");
throw e;
}
java.util.Date endDate = new java.util.Date();

StaticLoggerDispatcher.info(LOGGER,
"** requeteCreateA en " + (endDate.getTime() - beginDate.getTime()) + " ms **");

}

@Override
public void finalisation() {
StringBuilder requeteBilan = new StringBuilder();
requeteBilan.append(ApiService.pilotageMarkIdsource(this.tableChargementPilTemp, fileName, this.currentPhase,
TraitementEtat.OK.toString(), rapport, this.jointure));

try {
UtilitaireDao.get(0).executeBlock(this.connexion, requeteBilan);
} catch (ArcException ex) {
LoggerHelper.errorGenTextAsComment(getClass(), "chargerXml()", LOGGER, ex);
}
java.util.Date endDate = new java.util.Date();

StaticLoggerDispatcher.info(LOGGER, "** requeteCreateA en " + (endDate.getTime() - beginDate.getTime()) + " ms **");


}

@Override
public void finalisation() {
StringBuilder requeteBilan = new StringBuilder();
if (error) {
requeteBilan.append(ApiService.pilotageMarkIdsource(this.tableChargementPilTemp, fileName, this.currentPhase, TraitementEtat.KO.toString(),
rapport));
} else {
requeteBilan.append(ApiService.pilotageMarkIdsource(this.tableChargementPilTemp, fileName, this.currentPhase, TraitementEtat.OK.toString(),
rapport, this.jointure));
}

try {
UtilitaireDao.get(0).executeBlock(this.connexion, requeteBilan);
} catch (ArcException ex) {
LoggerHelper.errorGenTextAsComment(getClass(), "chargerXml()", LOGGER, ex);
}
}

@Override
public void execution() throws ArcException {
StaticLoggerDispatcher.info(LOGGER, "** execution**");
java.util.Date beginDate = new java.util.Date();

// Création de la table de stockage
XMLHandlerCharger4 handler = new XMLHandlerCharger4(connexion, fileName, norme, validite, this.tableTempA, this.tempTableAColumnsLongName, this.tempTableAColumnsShortName);

// appel du parser et gestion d'erreur
try {
SAXParser saxParser = SecuredSaxParser.buildSecuredSaxParser();
saxParser.parse(f, handler);
} catch (ParserConfigurationException | SAXException | IOException e) {
error = true;
ArcException businessException = new ArcException(e, ArcExceptionMessage.XML_SAX_PARSING_FAILED, this.fileName).logMessageException();
rapport = businessException.getMessage().replace("'", "''");
throw businessException;
}

this.jointure=handler.getJointure();

java.util.Date endDate = new java.util.Date();
StaticLoggerDispatcher.info(LOGGER, "** excecution temps" + (endDate.getTime() - beginDate.getTime()) + " ms");



}

@Override
public void charger() throws ArcException {
initialisation();
execution();
finalisation();

}


/**
* @return the f
*/
public InputStream getF() {
return f;
}


/**
* @param f the f to set
*/
public void setF(InputStream f) {
this.f = f;
}

}

@Override
public void execution() throws ArcException {
StaticLoggerDispatcher.info(LOGGER, "** execution**");
java.util.Date beginDate = new java.util.Date();

// Création de la table de stockage
XMLHandlerCharger4 handler = new XMLHandlerCharger4(connexion, fileName, norme, validite, this.tableTempA,
this.tempTableAColumnsLongName, this.tempTableAColumnsShortName);

// appel du parser et gestion d'erreur
try {
SAXParser saxParser = SecuredSaxParser.buildSecuredSaxParser();
saxParser.parse(f, handler);
} catch (ParserConfigurationException | SAXException | IOException e) {
ArcException businessException = new ArcException(e, ArcExceptionMessage.XML_SAX_PARSING_FAILED,
this.fileName).logMessageException();
rapport = businessException.getMessage().replace("'", "''");
throw businessException;
}

this.jointure = handler.getJointure();

java.util.Date endDate = new java.util.Date();
StaticLoggerDispatcher.info(LOGGER, "** excecution temps" + (endDate.getTime() - beginDate.getTime()) + " ms");

}

@Override
public void charger() throws ArcException {
initialisation();
execution();
finalisation();

}

/**
* @return the f
*/
public InputStream getF() {
return f;
}

/**
* @param f the f to set
*/
public void setF(InputStream f) {
this.f = f;
}

}
18 changes: 3 additions & 15 deletions ...core/src/main/java/fr/insee/arc/core/service/p2chargement/engine/ChargeurXmlComplexe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ public class ChargeurXmlComplexe implements IChargeur {
"text collate \"C\"", "text collate \"C\"", "text collate \"C\"", "text collate \"C\""));

private String rapport;
private boolean error = false;
public String jointure;

public ChargeurXmlComplexe(ThreadChargementService threadChargementService, String fileName) {
Expand Down Expand Up @@ -156,21 +155,11 @@ public void initialisation() throws ArcException {
}

@Override
public void finalisation() {
public void finalisation() throws ArcException {
StringBuilder requeteBilan = new StringBuilder();
if (error) {
requeteBilan.append(ApiService.pilotageMarkIdsource(this.tableChargementPilTemp, fileName,
this.currentPhase, TraitementEtat.KO.toString(), rapport));
} else {
requeteBilan.append(ApiService.pilotageMarkIdsource(this.tableChargementPilTemp, fileName,
requeteBilan.append(ApiService.pilotageMarkIdsource(this.tableChargementPilTemp, fileName,
this.currentPhase, TraitementEtat.OK.toString(), rapport, this.jointure));
}

try {
UtilitaireDao.get(0).executeBlock(this.connexion, requeteBilan);
} catch (ArcException ex) {
LoggerHelper.errorGenTextAsComment(getClass(), "chargerXml()", LOGGER, ex);
}
UtilitaireDao.get(0).executeBlock(this.connexion, requeteBilan);
}

@Override
Expand All @@ -194,7 +183,6 @@ public void execution() throws ArcException {
SAXParser saxParser = SecuredSaxParser.buildSecuredSaxParser();
saxParser.parse(f, handler);
} catch (ParserConfigurationException | SAXException | IOException e) {
error = true;
ArcException businessException = new ArcException(e, ArcExceptionMessage.XML_SAX_PARSING_FAILED,
this.fileName).logMessageException();
rapport = businessException.getMessage().replace("'", "''");
Expand Down

0 comments on commit f9e8cf2

Please sign in to comment.