Skip to content
This repository has been archived by the owner on Aug 1, 2022. It is now read-only.

Commit

Permalink
fixed files after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@wildflowwer
wildflowwer committed Aug 20, 2021
1 parent fe58b92 commit 8b37637
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 43 deletions.
16 changes: 2 additions & 14 deletions modules/engines/engine-hdb/src/main/java/com/sap/xsk/hdb/ds/facade/XSKHDBCoreFacade.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,27 +131,15 @@ public void updateEntities() {
Map<String, XSKDataStructureModel> dataStructureSequencesModel = managerServices.get(IXSKDataStructureModel.TYPE_HDB_SEQUENCE)
.getDataStructureModels();

<<<<<<< HEAD
if (dataStructureCdsModel.isEmpty()
&& dataStructureTablesModel.isEmpty()
&& dataStructureViewsModel.isEmpty()
&& dataStructureProceduresModel.isEmpty()
&& dataStructureTableFunctionsModel.isEmpty()
&& dataStructureSchemasModel.isEmpty()
&& dataStructureSynonymModel.isEmpty()
&& dataStructureSequencesModel.isEmpty()) {
=======
if (//dataStructureEntitiesModel.isEmpty()
// &&
dataStructureTablesModel.isEmpty()
&& dataStructureViewsModel.isEmpty()
&& dataStructureProceduresModel.isEmpty()
&& dataStructureTableFunctionsModel.isEmpty()
&& dataStructureSchemasModel.isEmpty()
&& dataStructureSynonymModel.isEmpty()
&& dataStructureSequencesModel.isEmpty()
&& dataStructureScalarFunctionsModel.isEmpty()) {
>>>>>>> 9a79ad6b (fixed: processor for .hdbscalarfunction)
&& dataStructureSequencesModel.isEmpty()
&& dataStructureScalarFunctionsModel.isEmpty()) {

logger.trace("No XSK Data Structures to update.");
return;
Expand Down
44 changes: 15 additions & 29 deletions modules/engines/engine-hdb/src/main/java/com/sap/xsk/hdb/ds/module/XSKHDBModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

import com.sap.xsk.hdb.ds.api.IXSKDataStructureModel;
import com.sap.xsk.hdb.ds.parser.XSKDataStructureParser;
//import com.sap.xsk.hdb.ds.parser.hdbdd.XSKEntitiesParser;
import com.sap.xsk.hdb.ds.parser.hdbprocedure.XSKHDBProcedureParser;
import com.sap.xsk.hdb.ds.parser.hdbschema.XSKSchemaParser;
import com.sap.xsk.hdb.ds.parser.hdbsequence.XSKHDBSequenceParser;
Expand All @@ -44,18 +43,6 @@ public class XSKHDBModule extends AbstractDirigibleModule {

private static Map<String, IXSKDataStructureManager> managerServices;

<<<<<<< HEAD
private static void bindManagerServicesToFileExtensions(Map<String, IXSKDataStructureManager> managerServices) {
managerServices.put(IXSKDataStructureModel.TYPE_HDBDD, new IXSKEntityManagerService());
managerServices.put(IXSKDataStructureModel.TYPE_HDB_TABLE, new IXSKTableManagerService());
managerServices.put(IXSKDataStructureModel.TYPE_HDB_VIEW, new IXSKViewManagerService());
managerServices.put(IXSKDataStructureModel.TYPE_HDB_SYNONYM, new IXSKSynonymManagerService());
managerServices.put(IXSKDataStructureModel.TYPE_HDB_TABLE_FUNCTION, new IXSKTableFunctionManagerService());
managerServices.put(IXSKDataStructureModel.TYPE_HDB_SCHEMA, new IXSKSchemaManagerService());
managerServices.put(IXSKDataStructureModel.TYPE_HDB_PROCEDURE, new IXSKProceduresManagerService());
managerServices.put(IXSKDataStructureModel.TYPE_HDB_SEQUENCE, new IXSKHDBSequenceManagerService());
}
=======
private static Map<String, XSKDataStructureParser> parserServices;

public static synchronized Map<String, IXSKDataStructureManager> getManagerServices() {
Expand Down Expand Up @@ -89,29 +76,28 @@ private static void bindManagerServicesToFileExtensions(Map<String, IXSKDataStru
managerServices.put(IXSKDataStructureModel.TYPE_HDB_SEQUENCE, new IXSKHDBSequenceManagerService());
managerServices.put(IXSKDataStructureModel.TYPE_HDB_SCALARFUNCTION, new IXSKScalarFunctionManagerService());
}
>>>>>>> 9a79ad6b (fixed: processor for .hdbscalarfunction)

private static void bindParsersToFileExtension(Map<String, XSKDataStructureParser> parserServices) {
parserServices.put(IXSKDataStructureModel.FILE_EXTENSION_ENTITIES, new XSKHdbddParser());
parserServices.put(IXSKDataStructureModel.FILE_EXTENSION_TABLE, new XSKTableParser());
parserServices.put(IXSKDataStructureModel.FILE_EXTENSION_VIEW, new XSKViewParser());
parserServices.put(IXSKDataStructureModel.FILE_EXTENSION_SYNONYM, new XSKSynonymParser());
parserServices.put(IXSKDataStructureModel.FILE_EXTENSION_HDBTABLEFUNCTION, new XSKHDBTableFunctionParser());
parserServices.put(IXSKDataStructureModel.FILE_EXTENSION_HDBSCHEMA, new XSKSchemaParser());
parserServices.put(IXSKDataStructureModel.FILE_EXTENSION_HDBPROCEDURE, new XSKHDBProcedureParser());
parserServices.put(IXSKDataStructureModel.FILE_EXTENSION_HDBSEQUENCE, new XSKHDBSequenceParser());
parserServices.put(IXSKDataStructureModel.FILE_EXTENSION_TABLE, new XSKTableParser());
parserServices.put(IXSKDataStructureModel.FILE_EXTENSION_VIEW, new XSKViewParser());
parserServices.put(IXSKDataStructureModel.FILE_EXTENSION_SYNONYM, new XSKSynonymParser());
parserServices.put(IXSKDataStructureModel.FILE_EXTENSION_HDBTABLEFUNCTION, new XSKHDBTableFunctionParser());
parserServices.put(IXSKDataStructureModel.FILE_EXTENSION_HDBSCHEMA, new XSKSchemaParser());
parserServices.put(IXSKDataStructureModel.FILE_EXTENSION_HDBPROCEDURE, new XSKHDBProcedureParser());
parserServices.put(IXSKDataStructureModel.FILE_EXTENSION_HDBSEQUENCE, new XSKHDBSequenceParser());
parserServices.put(IXSKDataStructureModel.FILE_EXTENSION_HDBSCALARFUNCTION, new XSKHDBScalarFunctionParser());

parserServices.put(IXSKDataStructureModel.TYPE_HDBDD, new XSKHdbddParser());
parserServices.put(IXSKDataStructureModel.TYPE_HDB_TABLE, new XSKTableParser());
parserServices.put(IXSKDataStructureModel.TYPE_HDB_VIEW, new XSKViewParser());
parserServices.put(IXSKDataStructureModel.TYPE_HDB_SYNONYM, new XSKSynonymParser());
parserServices.put(IXSKDataStructureModel.TYPE_HDB_TABLE_FUNCTION, new XSKHDBTableFunctionParser());
parserServices.put(IXSKDataStructureModel.TYPE_HDB_SCHEMA, new XSKSchemaParser());
parserServices.put(IXSKDataStructureModel.TYPE_HDB_PROCEDURE, new XSKHDBProcedureParser());
parserServices.put(IXSKDataStructureModel.TYPE_HDB_SEQUENCE, new XSKHDBSequenceParser());
parserServices.put(IXSKDataStructureModel.TYPE_HDB_TABLE, new XSKTableParser());
parserServices.put(IXSKDataStructureModel.TYPE_HDB_VIEW, new XSKViewParser());
parserServices.put(IXSKDataStructureModel.TYPE_HDB_SYNONYM, new XSKSynonymParser());
parserServices.put(IXSKDataStructureModel.TYPE_HDB_TABLE_FUNCTION, new XSKHDBTableFunctionParser());
parserServices.put(IXSKDataStructureModel.TYPE_HDB_SCHEMA, new XSKSchemaParser());
parserServices.put(IXSKDataStructureModel.TYPE_HDB_PROCEDURE, new XSKHDBProcedureParser());
parserServices.put(IXSKDataStructureModel.TYPE_HDB_SEQUENCE, new XSKHDBSequenceParser());
parserServices.put(IXSKDataStructureModel.TYPE_HDB_SCALARFUNCTION, new XSKHDBScalarFunctionParser());
}
}

@Override
public String getName() {
Expand Down

0 comments on commit 8b37637

Please sign in to comment.