Skip to content

Commit

Permalink
chore: more SQ fixes. ref:#29501
Browse files Browse the repository at this point in the history
  • Loading branch information
@erickgonzalez
erickgonzalez committed Oct 15, 2024
1 parent 353c37c commit e60bbf3
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 19 deletions.
35 changes: 17 additions & 18 deletions dotCMS/src/main/java/com/dotmarketing/portlets/templates/business/TemplateFactoryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ public class TemplateFactoryImpl implements TemplateFactory {
public static final String CONTENTLET_INODE_TABLE_FIELD = "inode";
private static final String FILTER_STRING = "filter";
private static TemplateCache templateCache = CacheLocator.getTemplateCache();
private static TemplateSQL templateSQL = TemplateSQL.getInstance();

@SuppressWarnings("unchecked")

Expand All @@ -54,7 +53,7 @@ public Template find(final String inode) throws DotStateException, DotDataExcept

if(template==null){
final List<Map<String, Object>> templateResults = new DotConnect()
.setSQL(templateSQL.FIND_BY_INODE)
.setSQL(TemplateSQL.FIND_BY_INODE)
.addParam(inode)
.loadObjectResults();
if (templateResults.isEmpty()) {
Expand All @@ -77,8 +76,8 @@ public List<Template> findTemplatesAssignedTo(final Host parentHost, final boole
throws DotDataException {
final DotConnect dc = new DotConnect();
final String query = !includeArchived ?
templateSQL.FIND_TEMPLATES_BY_HOST_INODE + " and vi.deleted = "
+ DbConnectionFactory.getDBFalse() : templateSQL.FIND_TEMPLATES_BY_HOST_INODE;
TemplateSQL.FIND_TEMPLATES_BY_HOST_INODE + " and vi.deleted = "
+ DbConnectionFactory.getDBFalse() : TemplateSQL.FIND_TEMPLATES_BY_HOST_INODE;
dc.setSQL(query);
dc.addParam(parentHost.getIdentifier());

Expand Down Expand Up @@ -136,7 +135,7 @@ public void save(final Template template, final String inode) throws DotDataExce

private void insertInodeInDB(final Template template) throws DotDataException{
DotConnect dc = new DotConnect();
dc.setSQL(templateSQL.INSERT_INODE);
dc.setSQL(TemplateSQL.INSERT_INODE);
dc.addParam(template.getInode());
dc.addParam(template.getiDate());
dc.addParam(template.getOwner());
Expand All @@ -145,7 +144,7 @@ private void insertInodeInDB(final Template template) throws DotDataException{

private void insertTemplateInDB(final Template template) throws DotDataException {
DotConnect dc = new DotConnect();
dc.setSQL(templateSQL.INSERT_TEMPLATE);
dc.setSQL(TemplateSQL.INSERT_TEMPLATE);
dc.addParam(template.getInode());
dc.addParam(template.isShowOnMenu());
dc.addParam(template.getTitle());
Expand Down Expand Up @@ -178,7 +177,7 @@ public void deleteFromCache(final Template template) throws DotDataException {
@SuppressWarnings("unchecked")
public Template findWorkingTemplateByName(String name, Host host) throws DotDataException {
DotConnect dc = new DotConnect();
dc.setSQL(templateSQL.FIND_WORKING_TEMPLATE_BY_HOST_INODE_AND_TITLE);
dc.setSQL(TemplateSQL.FIND_WORKING_TEMPLATE_BY_HOST_INODE_AND_TITLE);
dc.addParam(host.getIdentifier());
dc.addParam(name);
try{
Expand Down Expand Up @@ -550,7 +549,7 @@ public void updateThemeWithoutVersioning(final String templateInode, final Strin

private void updateInodeInDB(final Template template) throws DotDataException{
DotConnect dc = new DotConnect();
dc.setSQL(templateSQL.UPDATE_INODE);
dc.setSQL(TemplateSQL.UPDATE_INODE);
dc.addParam(template.getiDate());
dc.addParam(template.getOwner());
dc.addParam(template.getInode());
Expand All @@ -559,7 +558,7 @@ private void updateInodeInDB(final Template template) throws DotDataException{

private void updateTemplateInDB(final Template template) throws DotDataException {
DotConnect dc = new DotConnect();
dc.setSQL(templateSQL.UPDATE_TEMPLATE);
dc.setSQL(TemplateSQL.UPDATE_TEMPLATE);
dc.addParam(template.isShowOnMenu());
dc.addParam(template.getTitle());
dc.addParam(template.getModDate());
Expand Down Expand Up @@ -594,16 +593,16 @@ public void updateUserReferences(String userId, String replacementUserId)throws
DotConnect dc = new DotConnect();

try {
dc.setSQL(templateSQL.FIND_TEMPLATES_BY_MOD_USER);
dc.setSQL(TemplateSQL.FIND_TEMPLATES_BY_MOD_USER);
dc.addParam(userId);
List<HashMap<String, String>> templates = dc.loadResults();

dc.setSQL(templateSQL.UPDATE_MOD_USER_BY_MOD_USER);
dc.setSQL(TemplateSQL.UPDATE_MOD_USER_BY_MOD_USER);
dc.addParam(replacementUserId);
dc.addParam(userId);
dc.loadResult();

dc.setSQL(templateSQL.UPDATE_LOCKED_BY);
dc.setSQL(TemplateSQL.UPDATE_LOCKED_BY);
dc.addParam(replacementUserId);
dc.addParam(userId);
dc.loadResult();
Expand All @@ -630,10 +629,10 @@ public List<Template> findAllVersions(final Identifier identifier, final boolean
final StringBuffer query = new StringBuffer();

if(bringOldVersions) {
query.append(templateSQL.FIND_ALL_VERSIONS_BY_IDENTIFIER);
query.append(TemplateSQL.FIND_ALL_VERSIONS_BY_IDENTIFIER);

} else {//This only brings the inode of the working and live version
query.append(templateSQL.FIND_WORKING_LIVE_VERSION_BY_IDENTIFIER);
query.append(TemplateSQL.FIND_WORKING_LIVE_VERSION_BY_IDENTIFIER);
}

dc.setSQL(query.toString());
Expand All @@ -654,21 +653,21 @@ public void deleteTemplateByInode(final String templateInode) throws DotDataExce

private void deleteInodeInDB(final String inode) throws DotDataException{
DotConnect dc = new DotConnect();
dc.setSQL(templateSQL.DELETE_INODE);
dc.setSQL(TemplateSQL.DELETE_INODE);
dc.addParam(inode);
dc.loadResult();
}

private void deleteTemplateInDB(final String inode) throws DotDataException{
DotConnect dc = new DotConnect();
dc.setSQL(templateSQL.DELETE_TEMPLATE_BY_INODE);
dc.setSQL(TemplateSQL.DELETE_TEMPLATE_BY_INODE);
dc.addParam(inode);
dc.loadResult();
}

public List<Template> findTemplatesByContainerInode(final String containerInode) throws DotDataException{
DotConnect dc = new DotConnect();
dc.setSQL(templateSQL.FIND_TEMPLATES_BY_CONTAINER_INODE);
dc.setSQL(TemplateSQL.FIND_TEMPLATES_BY_CONTAINER_INODE);
dc.addParam(containerInode);
return TransformerLocator.createTemplateTransformer(dc.loadObjectResults()).asList();
}
Expand Down Expand Up @@ -735,7 +734,7 @@ public List<HTMLPageVersion> getPages(final String templateId)
throws DotDataException, DotSecurityException {

final DotConnect dotConnect = new DotConnect();
dotConnect.setSQL(templateSQL.GET_PAGES_BY_TEMPLATE_ID);
dotConnect.setSQL(TemplateSQL.GET_PAGES_BY_TEMPLATE_ID);
dotConnect.addParam(templateId);

return ((List<Map<String, String>>) dotConnect.loadResults()).stream()
Expand Down
12 changes: 11 additions & 1 deletion dotCMS/src/main/java/com/dotmarketing/portlets/templates/business/TemplateSQL.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,17 @@

public class TemplateSQL {

public static TemplateSQL getInstance(){ return new TemplateSQL(); }
private static TemplateSQL instance;

private TemplateSQL(){
}
public static TemplateSQL getInstance() {
if (instance == null) {
instance = new TemplateSQL();
}

return instance;
}

public static final String FIND_TEMPLATES_BY_HOST_INODE =
"select template.*, template_identifier.* from " + Type.TEMPLATE.getTableName() + " template, inode template_1_, " +
Expand Down

0 comments on commit e60bbf3

Please sign in to comment.