diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 15dad9bfbe..35145f54cf 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index fba9dcc5e9..c16008715d 100644 --- a/amps/ags/rm-automation/pom.xml +++ b/amps/ags/rm-automation/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index 1a00fc3176..e1bd3fd15a 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-automation-community-repo - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 54a212c4a8..52a6b6db2f 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index b4b5defaa2..5347afd3d1 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 79563e1f59..5a1c1d89df 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 714d06ce9d..e70636069e 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 9ea90ab377..4a5d8e4a60 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 78ad3d1d8f..a298152f92 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index d897443fe9..fd731eef66 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 3d6856bae7..7ff5c1dbd1 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 2c27ce7e46..d047ee8536 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index cabc91f15e..505eb77f0d 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 62ffe4fadf..cb7705d765 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 1d709b861b..996f764806 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 4231869ebc..ebe2d1c7f5 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-tests - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 5b1a000efd..05fc67dcb1 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 9b1358a9f4..4fb4317690 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 7601592f74..9e8dcaab36 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestDefaultsModel.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestDefaultsModel.java new file mode 100644 index 0000000000..5070b52815 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestDefaultsModel.java @@ -0,0 +1,190 @@ +package org.alfresco.rest.search; + +import java.util.List; +import java.util.Objects; + +import org.alfresco.rest.core.IRestModel; +import org.alfresco.utility.model.TestModel; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Generated by 'krystian' on '2023-06-12 18:46' from 'Alfresco Content Services REST API' swagger file + * Generated from 'Alfresco Content Services REST API' swagger file + * Base Path {@linkplain /alfresco/api/-default-/public/search/versions/1} + */ +public class RestRequestDefaultsModel extends TestModel implements IRestModel +{ + @JsonProperty(value = "entry") + RestRequestDefaultsModel model; + + @Override + public RestRequestDefaultsModel onModel() + { + return model; + } + + /** + A list of query fields/properties used to expand TEXT: queries. +The default is cm:content. +You could include all content properties using d:content or list all individual content properties or types. +As more terms are included the query size, complexity, memory impact and query time will increase. + + */ + + private List textAttributes; + /** + The default way to combine query parts when AND or OR is not explicitly stated - includes ! - + +one two three +(one two three) + + */ + + private String defaultFTSOperator; + /** + The default way to combine query parts in field query groups when AND or OR is not explicitly stated - includes ! - + +FIELD:(one two three) + + */ + + private String defaultFTSFieldOperator; + /** + The default name space to use if one is not provided + */ + + private String namespace; + + private String defaultFieldName; + + public List getTextAttributes() + { + return this.textAttributes; + } + + public void setTextAttributes(List textAttributes) + { + this.textAttributes = textAttributes; + } + + public String getDefaultFTSOperator() + { + return this.defaultFTSOperator; + } + + public void setDefaultFTSOperator(String defaultFTSOperator) + { + this.defaultFTSOperator = defaultFTSOperator; + } + + public String getDefaultFTSFieldOperator() + { + return this.defaultFTSFieldOperator; + } + + public void setDefaultFTSFieldOperator(String defaultFTSFieldOperator) + { + this.defaultFTSFieldOperator = defaultFTSFieldOperator; + } + + public String getNamespace() + { + return this.namespace; + } + + public void setNamespace(String namespace) + { + this.namespace = namespace; + } + + public String getDefaultFieldName() + { + return this.defaultFieldName; + } + + public void setDefaultFieldName(String defaultFieldName) + { + this.defaultFieldName = defaultFieldName; + } + + @Override + public String toString() + { + return "RestRequestDefaultsModel{" + "textAttributes=" + textAttributes + ", defaultFTSOperator='" + defaultFTSOperator + '\'' + ", defaultFTSFieldOperator='" + + defaultFTSFieldOperator + '\'' + ", namespace='" + namespace + '\'' + ", defaultFieldName='" + defaultFieldName + '\'' + '}'; + } + + @Override + public boolean equals(Object o) + { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; + RestRequestDefaultsModel that = (RestRequestDefaultsModel) o; + return Objects.equals(textAttributes, that.textAttributes) && Objects.equals(defaultFTSOperator, that.defaultFTSOperator) && Objects.equals( + defaultFTSFieldOperator, that.defaultFTSFieldOperator) && Objects.equals(namespace, that.namespace) && Objects.equals(defaultFieldName, that.defaultFieldName); + } + + @Override + public int hashCode() + { + return Objects.hash(textAttributes, defaultFTSOperator, defaultFTSFieldOperator, namespace, defaultFieldName); + } + + public static Builder builder() + { + return new Builder(); + } + + public static class Builder + { + private List textAttributes; + private String defaultFTSOperator; + private String defaultFTSFieldOperator; + private String namespace; + private String defaultFieldName; + + public Builder textAttributes(List textAttributes) + { + this.textAttributes = textAttributes; + return this; + } + + public Builder defaultFTSOperator(String defaultFTSOperator) + { + this.defaultFTSOperator = defaultFTSOperator; + return this; + } + + public Builder defaultFTSFieldOperator(String defaultFTSFieldOperator) + { + this.defaultFTSFieldOperator = defaultFTSFieldOperator; + return this; + } + + public Builder namespace(String namespace) + { + this.namespace = namespace; + return this; + } + + public Builder defaultFieldName(String defaultFieldName) + { + this.defaultFieldName = defaultFieldName; + return this; + } + + public RestRequestDefaultsModel create() + { + RestRequestDefaultsModel defaults = new RestRequestDefaultsModel(); + defaults.setTextAttributes(this.textAttributes); + defaults.setDefaultFTSOperator(this.defaultFTSOperator); + defaults.setDefaultFTSFieldOperator(this.defaultFTSFieldOperator); + defaults.setNamespace(this.namespace); + defaults.setDefaultFieldName(this.defaultFieldName); + + return defaults; + } + } +} + diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestTemplatesModel.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestTemplatesModel.java new file mode 100644 index 0000000000..6cf79ec33f --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestTemplatesModel.java @@ -0,0 +1,105 @@ +package org.alfresco.rest.search; + +import java.util.Objects; + +import org.alfresco.rest.core.IRestModel; +import org.alfresco.utility.model.TestModel; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Generated by 'krystian' on '2023-06-12 18:46' from 'Alfresco Content Services REST API' swagger file + * Generated from 'Alfresco Content Services REST API' swagger file + * Base Path {@linkplain /alfresco/api/-default-/public/search/versions/1} + */ +public class RestRequestTemplatesModel extends TestModel implements IRestModel +{ + @JsonProperty(value = "entry") + RestRequestTemplatesModel model; + + @Override + public RestRequestTemplatesModel onModel() + { + return model; + } + + private String name; + + private String template; + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getTemplate() + { + return template; + } + + public void setTemplate(String template) + { + this.template = template; + } + + @Override + public String toString() + { + return "RestRequestTemplatesModel{" + "name='" + name + '\'' + ", template='" + template + '\'' + '}'; + } + + @Override + public boolean equals(Object o) + { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; + RestRequestTemplatesModel that = (RestRequestTemplatesModel) o; + return Objects.equals(name, that.name) && Objects.equals(template, that.template); + } + + @Override + public int hashCode() + { + return Objects.hash(name, template); + } + + public static Builder builder() + { + return new Builder(); + } + + public static class Builder + { + private String name; + private String template; + + public Builder name(String name) + { + this.name = name; + return this; + } + + public Builder template(String template) + { + this.template = template; + return this; + } + + public RestRequestTemplatesModel create() + { + RestRequestTemplatesModel template = new RestRequestTemplatesModel(); + template.setName(this.name); + template.setTemplate(this.template); + + return template; + } + } +} + diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/SearchRequest.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/SearchRequest.java index 33539f899a..90d1dd61d0 100644 --- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/SearchRequest.java +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/SearchRequest.java @@ -43,14 +43,15 @@ */ package org.alfresco.rest.search; +import java.util.ArrayList; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonProperty; + import org.alfresco.rest.model.RestRequestRangesModel; import org.alfresco.rest.model.RestRequestSpellcheckModel; import org.alfresco.utility.model.TestModel; -import java.util.ArrayList; -import java.util.List; - /** * Search Query object. * @author msuzuki @@ -76,6 +77,8 @@ public class SearchRequest extends TestModel String facetFormat; List include; List sort; + RestRequestDefaultsModel defaults; + List templates; public SearchRequest() { @@ -255,6 +258,26 @@ public class SearchRequest extends TestModel this.fields = fields; } + public RestRequestDefaultsModel getDefaults() + { + return defaults; + } + + public void setDefaults(RestRequestDefaultsModel defaults) + { + this.defaults = defaults; + } + + public List getTemplates() + { + return templates; + } + + public void setTemplates(List templates) + { + this.templates = templates; + } + public List getSort() { if (sort == null) diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index b0c3090e6b..e5ac4c637f 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index e4e8289c75..a97aaa6237 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/pom.xml b/pom.xml index bf2e21be15..8b0665b766 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT pom Alfresco Community Repo Parent diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 8be886f969..a7c369e97e 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 12f4b739c4..7a3829a24d 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.1.0.136-SNAPSHOT + 23.1.0.140-SNAPSHOT diff --git a/repository/src/main/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java b/repository/src/main/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java deleted file mode 100644 index c219600ab2..0000000000 --- a/repository/src/main/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java +++ /dev/null @@ -1,159 +0,0 @@ -//JAKARTA_TO_DO|ACS-5421|Misc|Consider removal// -///* -// * #%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% -// */ -//package org.alfresco.repo.config.source; -// -//import java.io.InputStream; -//import java.util.List; -// -//import org.springframework.extensions.config.ConfigException; -//import org.springframework.extensions.config.source.UrlConfigSource; -//import org.alfresco.model.ContentModel; -//import org.alfresco.repo.tenant.TenantService; -//import org.alfresco.service.cmr.repository.ContentReader; -//import org.alfresco.service.cmr.repository.ContentService; -//import org.alfresco.service.cmr.repository.InvalidStoreRefException; -//import org.alfresco.service.cmr.repository.NodeRef; -//import org.alfresco.service.cmr.repository.NodeService; -//import org.alfresco.service.cmr.repository.StoreRef; -//import org.alfresco.service.cmr.search.SearchService; -//import org.alfresco.service.namespace.NamespaceService; -// -///** -// * ConfigSource that looks for a prefix to determine where to look for the config.
-// * Valid prefixes are: -// *
    -// *
  • :// the location provided is a path to a repository file
    • -// *
-// * as well as those defined in the core (UrlConfigSource) -// * -// * Example store URLs -// * workspace://SpacesStore/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.webclient_extension.childname}/cm:web-client-config-custom.xml -// * workspace://SpacesStore/app:company_home/app:dictionary/app:webclient_extension/cm:web-client-config-custom.xml -// */ -//public class RepoUrlConfigSource extends UrlConfigSource -//{ -// private TenantService tenantService; -// private SearchService searchService; -// private ContentService contentService; -// private NamespaceService namespaceService; -// private NodeService nodeService; -// -// -// public void setTenantService(TenantService tenantService) -// { -// this.tenantService = tenantService; -// } -// -// public void setSearchService(SearchService searchService) -// { -// this.searchService = searchService; -// } -// -// public void setContentService(ContentService contentService) -// { -// this.contentService = contentService; -// } -// -// public void setNamespaceService(NamespaceService namespaceService) -// { -// this.namespaceService = namespaceService; -// } -// -// public void setNodeService(NodeService nodeService) -// { -// this.nodeService = nodeService; -// } -// -// -// public RepoUrlConfigSource(String sourceLocation) -// { -// super(sourceLocation); -// } -// -// public RepoUrlConfigSource(List sourceLocations) -// { -// super(sourceLocations); -// } -// -// -// public InputStream getInputStream(String sourceUrl) -// { -// // determine the config source -// try -// { -// return super.getInputStream(sourceUrl); -// } -// catch (ConfigException ce) -// { -// int idx = sourceUrl.indexOf(StoreRef.URI_FILLER); -// if (idx != -1) -// { -// // assume this is a repository location -// int idx2 = sourceUrl.indexOf("/", idx+3); -// -// String store = sourceUrl.substring(0, idx2); -// String path = sourceUrl.substring(idx2); -// -// StoreRef storeRef = tenantService.getName(new StoreRef(store)); -// NodeRef rootNode = null; -// -// try -// { -// rootNode = nodeService.getRootNode(storeRef); -// } -// catch (InvalidStoreRefException e) -// { -// throw ce; -// } -// -// List nodeRefs = searchService.selectNodes(rootNode, path, null, namespaceService, false); -// -// if (nodeRefs.size() == 0) -// { -// // if none found, then simply skip -// return null; -// } -// else if (nodeRefs.size() > 1) -// { -// // unexpected -// throw new ConfigException("Found duplicate config sources in the repository " + sourceUrl); -// } -// -// NodeRef nodeRef = nodeRefs.get(0); -// -// ContentReader cr = contentService.getReader(nodeRef, ContentModel.PROP_CONTENT); -// -// return cr.getContentInputStream(); -// } -// else -// { -// // not a repository url -// throw ce; -// } -// } -// } -//} diff --git a/repository/src/main/resources/alfresco/repository.properties b/repository/src/main/resources/alfresco/repository.properties index 49aad509f8..908bf8bbef 100644 --- a/repository/src/main/resources/alfresco/repository.properties +++ b/repository/src/main/resources/alfresco/repository.properties @@ -1349,7 +1349,7 @@ system.remove-alf_server-table-from-db.ignored=true allow.unsecure.callback.jsonp=false # pre-configured allow list of media/mime types to allow inline instead of attachment (via Content-Disposition response header) -content.nonAttach.mimetypes=application/pdf,image/jpeg,image/gif,image/png,image/tiff,image/bmp +content.nonAttach.mimetypes=application/pdf,image/jpeg,image/gif,image/png,image/tiff,image/bmp,application/octet-stream # Zip file compression ratio threshold as a percentage, above which the zip file will be considered a "zip bomb" and the # import extraction process cancelled.