-
Notifications
You must be signed in to change notification settings - Fork 357
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:dhis2/dhis2-core into DHIS2-18370…
…_2.42
- Loading branch information
Showing
63 changed files
with
2,132 additions
and
1,860 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ExpressionStore.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * Copyright (c) 2004-2025, University of Oslo | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * Redistributions of source code must retain the above copyright notice, this | ||
| * list of conditions and the following disclaimer. | ||
| * | ||
| * Redistributions in binary form must reproduce the above copyright notice, | ||
| * this list of conditions and the following disclaimer in the documentation | ||
| * and/or other materials provided with the distribution. | ||
| * Neither the name of the HISP project nor the names of its contributors may | ||
| * be used to endorse or promote products derived from this software without | ||
| * specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | ||
| * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR | ||
| * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
| package org.hisp.dhis.expression; | ||
|
|
||
| import org.hisp.dhis.common.GenericStore; | ||
|
|
||
| /** | ||
| * @author david mackessy | ||
| */ | ||
| public interface ExpressionStore extends GenericStore<Expression> { | ||
|
|
||
| /** | ||
| * Update all expressions whose expression property contains the 'find' value. When updating, it | ||
| * replaces all occurrences of 'find' with 'replace'. | ||
| * | ||
| * @param find text to search for | ||
| * @param replace text used to replace 'find' | ||
| * @return number of entities updated | ||
| */ | ||
| int updateExpressionContaining(String find, String replace); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,10 +30,13 @@ | |
| import java.util.List; | ||
| import org.hisp.dhis.common.AnalyticalObjectStore; | ||
| import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet; | ||
| import org.hisp.dhis.program.Program; | ||
|
|
||
| /** | ||
| * @author Morten Olav Hansen <[email protected]> | ||
| */ | ||
| public interface MapViewStore extends AnalyticalObjectStore<MapView> { | ||
| List<MapView> getByOrganisationUnitGroupSet(OrganisationUnitGroupSet groupSet); | ||
|
|
||
| List<MapView> findByProgram(Program program); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /* | ||
| * Copyright (c) 2004-2023, University of Oslo | ||
| * Copyright (c) 2004-2024, University of Oslo | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
|
|
@@ -25,36 +25,35 @@ | |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
| package org.hisp.dhis.security; | ||
| package org.hisp.dhis.expression; | ||
|
|
||
| import jakarta.servlet.http.HttpSession; | ||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.hisp.dhis.external.conf.ConfigurationKey; | ||
| import org.hisp.dhis.external.conf.DhisConfigurationProvider; | ||
| import org.springframework.context.event.EventListener; | ||
| import org.springframework.security.web.session.HttpSessionCreatedEvent; | ||
| import org.springframework.stereotype.Component; | ||
| import jakarta.persistence.EntityManager; | ||
| import org.hisp.dhis.hibernate.HibernateGenericStore; | ||
| import org.springframework.context.ApplicationEventPublisher; | ||
| import org.springframework.jdbc.core.JdbcTemplate; | ||
| import org.springframework.stereotype.Repository; | ||
|
|
||
| /** | ||
| * @author Morten Svanæs <[email protected]> | ||
| * @author david mackessy | ||
| */ | ||
| @Component | ||
| @Slf4j | ||
| @RequiredArgsConstructor | ||
| public class DhisHttpSessionEventListener { | ||
| private final DhisConfigurationProvider config; | ||
| @Repository | ||
| public class HibernateExpressionStore extends HibernateGenericStore<Expression> | ||
| implements org.hisp.dhis.expression.ExpressionStore { | ||
|
|
||
| @EventListener | ||
| public void sessionCreated(HttpSessionCreatedEvent event) { | ||
| HttpSession session = event.getSession(); | ||
| try { | ||
| String property = config.getProperty(ConfigurationKey.SYSTEM_SESSION_TIMEOUT); | ||
| session.setMaxInactiveInterval(Integer.parseInt(property)); | ||
| } catch (Exception e) { | ||
| session.setMaxInactiveInterval( | ||
| Integer.parseInt(ConfigurationKey.SYSTEM_SESSION_TIMEOUT.getDefaultValue())); | ||
| log.error("Could not read session timeout value from config", e); | ||
| } | ||
| public HibernateExpressionStore( | ||
| EntityManager entityManager, JdbcTemplate jdbcTemplate, ApplicationEventPublisher publisher) { | ||
| super(entityManager, jdbcTemplate, publisher, Expression.class, false); | ||
| } | ||
|
|
||
| @Override | ||
| public int updateExpressionContaining(String find, String replace) { | ||
| String sql = | ||
| """ | ||
| update expression | ||
| set expression = replace(expression, '%s', '%s') | ||
| where expression like '%s'; | ||
| """ | ||
| .formatted(find, replace, "%" + find + "%"); | ||
| return jdbcTemplate.update(sql); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.