diff --git a/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java b/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java index 44be8da09d..e89f055e45 100644 --- a/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java +++ b/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java @@ -93,15 +93,15 @@ public class RMv33HoldAuditEntryValuesPatchUnitTest verify(mockedRecordsManagementQueryDAO, times(1)).updatePropertyStringValueEntity(deleteHoldPropertyStringValueEntity); assertEquals("Add To Hold", addToHoldPropertyStringValueEntity.getStringValue()); - assertEquals("add to hold", addToHoldPropertyStringValueEntity.getStringEndLower()); + assertEquals("add to hold", addToHoldPropertyStringValueEntity.getStringLower()); assertEquals(Long.valueOf(770_786_109L), addToHoldPropertyStringValueEntity.getStringCrc()); assertEquals("Remove From Hold", removeFromHoldPropertyStringValueEntity.getStringValue()); - assertEquals("remove from hold", removeFromHoldPropertyStringValueEntity.getStringEndLower()); + assertEquals("remove from hold", removeFromHoldPropertyStringValueEntity.getStringLower()); assertEquals(Long.valueOf(2_967_613_012L), removeFromHoldPropertyStringValueEntity.getStringCrc()); assertEquals("Delete Hold", deleteHoldPropertyStringValueEntity.getStringValue()); - assertEquals("delete hold", deleteHoldPropertyStringValueEntity.getStringEndLower()); + assertEquals("delete hold", deleteHoldPropertyStringValueEntity.getStringLower()); assertEquals(Long.valueOf(132_640_810L), deleteHoldPropertyStringValueEntity.getStringCrc()); } diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/AuditImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/AuditImpl.java index cf44a92f9c..d2259e3c6c 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/AuditImpl.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/AuditImpl.java @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -909,16 +909,14 @@ public class AuditImpl implements Audit public int getAuditEntriesCountByAppAndProperties(AuditService.AuditApplication auditApplication, AuditEntryQueryWalker propertyWalker) { - final String applicationName = auditApplication.getKey().substring(1); - AuditQueryParameters parameters = new AuditQueryParameters(); - parameters.setApplicationName(applicationName); + parameters.setApplicationName(auditApplication.getName()); parameters.setFromTime(propertyWalker.getFromTime()); parameters.setToTime(propertyWalker.getToTime()); parameters.setFromId(propertyWalker.getFromId()); parameters.setToId(propertyWalker.getToId()); parameters.setUser(propertyWalker.getCreatedByUser()); - return auditService.getAuditEntriesCountByAppAndProperties(applicationName, parameters); + return auditService.getAuditEntriesCountByAppAndProperties(parameters); } } diff --git a/repository/src/main/java/org/alfresco/repo/audit/AuditComponent.java b/repository/src/main/java/org/alfresco/repo/audit/AuditComponent.java index 821c0c4759..29955432a7 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/AuditComponent.java +++ b/repository/src/main/java/org/alfresco/repo/audit/AuditComponent.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -276,11 +276,10 @@ public interface AuditComponent /** * Issue an audit query to retrieve count of records for a given application and properties * - * @param applicationName the name of the application * @param parameters audit parameters provided by the where clause on the ReST API * @return a map containing min/max and the associated value */ - default int getAuditEntriesCountByAppAndProperties(String applicationName, AuditQueryParameters parameters) + default int getAuditEntriesCountByAppAndProperties(AuditQueryParameters parameters) { return -1; } diff --git a/repository/src/main/java/org/alfresco/repo/audit/AuditComponentImpl.java b/repository/src/main/java/org/alfresco/repo/audit/AuditComponentImpl.java index 38fbd5ff69..98479db3af 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/AuditComponentImpl.java +++ b/repository/src/main/java/org/alfresco/repo/audit/AuditComponentImpl.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -956,10 +956,8 @@ public class AuditComponentImpl implements AuditComponent return auditDAO.getAuditEntriesCountByApp(applicationId); } - @Override public int getAuditEntriesCountByAppAndProperties(String applicationName, AuditQueryParameters parameters) + @Override public int getAuditEntriesCountByAppAndProperties(AuditQueryParameters parameters) { - org.alfresco.repo.domain.audit.AuditQueryParameters dbParameters = new org.alfresco.repo.domain.audit.AuditQueryParameters(); - - return auditDAO.getAuditEntriesCountByAppAndProperties(applicationName, parameters); + return auditDAO.getAuditEntriesCountByAppAndProperties(parameters); } -} +} \ No newline at end of file diff --git a/repository/src/main/java/org/alfresco/repo/audit/AuditServiceImpl.java b/repository/src/main/java/org/alfresco/repo/audit/AuditServiceImpl.java index 7c92ec8e3f..4824914e51 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/AuditServiceImpl.java +++ b/repository/src/main/java/org/alfresco/repo/audit/AuditServiceImpl.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -190,8 +190,8 @@ public class AuditServiceImpl implements AuditService /** * {@inheritDoc} */ - @Override public int getAuditEntriesCountByAppAndProperties(String applicationName, AuditQueryParameters parameters) + @Override public int getAuditEntriesCountByAppAndProperties(AuditQueryParameters parameters) { - return auditComponent.getAuditEntriesCountByAppAndProperties(applicationName, parameters); + return auditComponent.getAuditEntriesCountByAppAndProperties(parameters); } } \ No newline at end of file diff --git a/repository/src/main/java/org/alfresco/repo/domain/CrcHelper.java b/repository/src/main/java/org/alfresco/repo/domain/CrcHelper.java index 8c71789809..d3cdb157b6 100644 --- a/repository/src/main/java/org/alfresco/repo/domain/CrcHelper.java +++ b/repository/src/main/java/org/alfresco/repo/domain/CrcHelper.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2024 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.domain; @@ -102,21 +102,22 @@ public class CrcHelper { throw new RuntimeException("UTF-8 encoding is not supported"); } - // Get the short value (case-sensitive or not) + // Crc Value will change based on the case-sensitive, So we need to get the short value based on case-sensitive String valueShort = null; - int valueLen = valueLowerCase.length(); + String currentValue = caseSensitive ? value : valueLowerCase; + int valueLen = currentValue.length(); if (valueLen < dataLength) { - valueShort = valueLowerCase; + valueShort = currentValue; } else if (useCharsFromStart) { - valueShort = valueLowerCase.substring(0, dataLength - 1); + valueShort = currentValue.substring(0, dataLength - 1); } else { - valueShort = valueLowerCase.substring(valueLen - dataLength); + valueShort = currentValue.substring(valueLen - dataLength); } return new Pair(valueShort, valueCrc); } -} +} \ No newline at end of file diff --git a/repository/src/main/java/org/alfresco/repo/domain/audit/AuditDAO.java b/repository/src/main/java/org/alfresco/repo/domain/audit/AuditDAO.java index f8c61d0a8c..cac517706e 100644 --- a/repository/src/main/java/org/alfresco/repo/domain/audit/AuditDAO.java +++ b/repository/src/main/java/org/alfresco/repo/domain/audit/AuditDAO.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -248,11 +248,10 @@ public interface AuditDAO /** * Issue an audit query to retrieve count of records for a given application and properties * - * @param applicationName name of the application to be queried * @param parameters audit parameters provided by the where clause on the ReST API * @return a map containing min/max and the associated value */ - default int getAuditEntriesCountByAppAndProperties(String applicationName, org.alfresco.service.cmr.audit.AuditQueryParameters parameters) + default int getAuditEntriesCountByAppAndProperties(org.alfresco.service.cmr.audit.AuditQueryParameters parameters) { return -1; } diff --git a/repository/src/main/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java index 89f602dba5..12468dbf8e 100644 --- a/repository/src/main/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java +++ b/repository/src/main/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -237,7 +237,7 @@ public class AuditDAOImpl extends AbstractAuditDAOImpl } @Override - public int getAuditEntriesCountByAppAndProperties(String applicationName, org.alfresco.service.cmr.audit.AuditQueryParameters parameters) + public int getAuditEntriesCountByAppAndProperties(org.alfresco.service.cmr.audit.AuditQueryParameters parameters) { AuditQueryParameters dbParameters = convertFromRestAuditQueryParameters(parameters); diff --git a/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyStringValueEntity.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyStringValueEntity.java index dbc3090298..56e188fbf6 100644 --- a/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyStringValueEntity.java +++ b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyStringValueEntity.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2024 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.domain.propval; import org.alfresco.repo.domain.CrcHelper; @@ -44,6 +44,7 @@ public class PropertyStringValueEntity private String stringValue; private String stringEndLower; private Long stringCrc; + private String stringLower; public PropertyStringValueEntity() { @@ -115,6 +116,9 @@ public class PropertyStringValueEntity Pair crcPair = CrcHelper.getStringCrcPair(value, 16, false, true); stringEndLower = crcPair.getFirst(); stringCrc = crcPair.getSecond(); + // Calculate the crc value with case-insensitive + Pair crcPairWithCaseInSensitive = CrcHelper.getStringCrcPair(value, 16, false, false); + stringLower = crcPairWithCaseInSensitive.getFirst(); } public Long getId() @@ -156,4 +160,14 @@ public class PropertyStringValueEntity { this.stringCrc = stringCrc; } + + public String getStringLower() + { + return stringLower; + } + + public void setStringLower(String stringLower) + { + this.stringLower = stringLower; + } } diff --git a/repository/src/main/java/org/alfresco/service/cmr/audit/AuditService.java b/repository/src/main/java/org/alfresco/service/cmr/audit/AuditService.java index 4a7bcd0091..bbb2f886ac 100644 --- a/repository/src/main/java/org/alfresco/service/cmr/audit/AuditService.java +++ b/repository/src/main/java/org/alfresco/service/cmr/audit/AuditService.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -256,11 +256,10 @@ public interface AuditService /** * Issue an audit query to retrieve min / max audit record id for a given application and properties * - * @param applicationName the name of the application * @param parameters audit parameters provided by the where clause on the ReST API * @return a map containing min/max and the associated value */ - default int getAuditEntriesCountByAppAndProperties(String applicationName, AuditQueryParameters parameters) + default int getAuditEntriesCountByAppAndProperties(AuditQueryParameters parameters) { return -1; }