Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/persistence-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ under the License.
<groupId>org.apache.syncope.core</groupId>
<artifactId>syncope-core-persistence-common</artifactId>
<version>${project.version}</version>
</dependency>
</dependency>
</dependencies>
<executions>
<execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,7 @@ public long countToExec(final TaskType type) {
return neo4jTemplate.count(query.toString());
}

protected String toOrderByStatement(
final Class<? extends Task<?>> beanClass,
final Stream<Sort.Order> orderByClauses) {

protected String toOrderByStatement(final Stream<Sort.Order> orderByClauses) {
StringBuilder subStatement = new StringBuilder();
orderByClauses.forEach(clause -> {
String field = clause.getProperty().trim();
Expand Down Expand Up @@ -295,7 +292,7 @@ public <T extends Task<T>> List<T> findToExec(final TaskType type, final Pageabl
}

query.append("RETURN n.id ").
append(toOrderByStatement(taskUtils.getTaskEntity(), pageable.getSort().get()));
append(toOrderByStatement(pageable.getSort().get()));

if (pageable.isPaged()) {
query.append(" SKIP ").append(pageable.getPageSize() * pageable.getPageNumber()).
Expand Down Expand Up @@ -467,7 +464,7 @@ public <T extends Task<T>> List<T> findAll(

query.append(" WITH n ");

query.append(toOrderByStatement(taskUtils.getTaskEntity(), pageable.getSort().get()));
query.append(toOrderByStatement(pageable.getSort().get()));

if (pageable.isPaged()) {
query.append(" SKIP ").append(pageable.getPageSize() * pageable.getPageNumber()).
Expand Down
9 changes: 8 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ under the License.
<spring-boot.version>4.0.6</spring-boot.version>
<spring-cloud-version>5.0.1</spring-cloud-version>

<hibernate.version>7.3.6.Final</hibernate.version>
<hibernate.version>7.4.0.Final</hibernate.version>

<jasypt.version>1.9.3</jasypt.version>

Expand Down Expand Up @@ -1649,6 +1649,13 @@ under the License.
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-maven-plugin</artifactId>
<version>${hibernate.version}</version>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>4.0.3</version>
</dependency>
</dependencies>
</plugin>

<plugin>
Expand Down
Loading