inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-09-17 14:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #114 from Alfresco/fix/SEARCH-1433_with_proper_line_endings

Browse Source 
[ SEARCH-1433 ] public modifiers reinserted because IE compilation
This commit is contained in:
Andrea Gazzarini
2019-02-19 11:18:52 +00:00
committed by GitHub
parent 40ed9f9208 9c057adc14
commit 9fbdbc52cd
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java
View File

@@ -144,7 +144,8 @@ public class AlfrescoSolrDataModel implements QueryConstants
TRANSFORMATION_EXCEPTION TRANSFORMATION_EXCEPTION
} }
static final String CONTENT_S_LOCALE_PREFIX = "content@s__locale@"; public static final String CONTENT_S_LOCALE_PREFIX = "content@s__locale@";
public static final String CONTENT_M_LOCALE_PREFIX = "content@m__locale@";
static final String SHARED_PROPERTIES = "shared.properties"; static final String SHARED_PROPERTIES = "shared.properties";
protected final static Logger log = LoggerFactory.getLogger(AlfrescoSolrDataModel.class); protected final static Logger log = LoggerFactory.getLogger(AlfrescoSolrDataModel.class);
@@ -280,7 +281,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
* @param aclId the acl identifer * @param aclId the acl identifer
* @return the ACL Document identifier (<TENANT>!<ACLID>!ACL) * @return the ACL Document identifier (<TENANT>!<ACLID>!ACL)
*/ */
static String getAclDocumentId(String tenant, Long aclId) public static String getAclDocumentId(String tenant, Long aclId)
{ {
return getTenantId(tenant) + "!" + NumericEncoder.encode(aclId) + "!ACL"; return getTenantId(tenant) + "!" + NumericEncoder.encode(aclId) + "!ACL";
} }
@@ -291,7 +292,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
* @param aclChangeSetId the ACL changeset identifier. * @param aclChangeSetId the ACL changeset identifier.
* @return the ACL ChangeSet Document identifier (TRACKER!CHANGESET!<ACL_CHANGESET_ID>) * @return the ACL ChangeSet Document identifier (TRACKER!CHANGESET!<ACL_CHANGESET_ID>)
*/ */
static String getAclChangeSetDocumentId(Long aclChangeSetId) public static String getAclChangeSetDocumentId(Long aclChangeSetId)
{ {
return "TRACKER" + "!" + CHANGE_SET + "!" + NumericEncoder.encode(aclChangeSetId); return "TRACKER" + "!" + CHANGE_SET + "!" + NumericEncoder.encode(aclChangeSetId);
} }
@@ -304,7 +305,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
* @see #getAclChangeSetDocumentId(Long) * @see #getAclChangeSetDocumentId(Long)
* @return the numeric ACL changeset identifier. * @return the numeric ACL changeset identifier.
*/ */
static Long parseAclChangeSetId(String documentId) public static Long parseAclChangeSetId(String documentId)
{ {
return parseIdFromDocumentId(documentId); return parseIdFromDocumentId(documentId);
} }
@@ -316,7 +317,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
* @param documentId the document identifier. * @param documentId the document identifier.
* @return the numeric ACL changeset identifier. * @return the numeric ACL changeset identifier.
*/ */
static Long parseTransactionId(String documentId) public static Long parseTransactionId(String documentId)
{ {
return parseIdFromDocumentId(documentId); return parseIdFromDocumentId(documentId);
} }
@@ -368,7 +369,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
* @param txId the transaction identifier. * @param txId the transaction identifier.
* @return the Transaction Document identifier in the following format TRACKER!TX!<TX_ID> * @return the Transaction Document identifier in the following format TRACKER!TX!<TX_ID>
*/ */
static String getTransactionDocumentId(Long txId) public static String getTransactionDocumentId(Long txId)
{ {
// TODO - check and encode for ":" // TODO - check and encode for ":"
return "TRACKER" + return "TRACKER" +
@@ -502,7 +503,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
return qnameFilter; return qnameFilter;
} }
static Properties getCommonConfig() public static Properties getCommonConfig()
{ {
File resourceDirectory = getResourceDirectory(); File resourceDirectory = getResourceDirectory();
// If we ever need to filter out models in the future, then we must put a filter somewhere. // If we ever need to filter out models in the future, then we must put a filter somewhere.
@@ -531,7 +532,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
/** /**
* @return ClassLoader * @return ClassLoader
*/ */
private ClassLoader getResourceClassLoader() public ClassLoader getResourceClassLoader()
{ {
File f = getResourceDirectory(); File f = getResourceDirectory();
if (f.canRead() && f.isDirectory()) if (f.canRead() && f.isDirectory())
@@ -556,7 +557,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
} }
} }
static File getResourceDirectory() public static File getResourceDirectory()
{ {
return new File(SolrResourceLoader.locateSolrHome().toFile(), "conf"); return new File(SolrResourceLoader.locateSolrHome().toFile(), "conf");
} }
@@ -584,7 +585,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
return dictionaryComponent; return dictionaryComponent;
} }
IndexedField getIndexedFieldForContentPropertyMetadata(QName propertyQName, ContentFieldType type) public IndexedField getIndexedFieldForContentPropertyMetadata(QName propertyQName, ContentFieldType type)
{ {
IndexedField indexedField = new IndexedField(); IndexedField indexedField = new IndexedField();
PropertyDefinition propertyDefinition = getPropertyDefinition(propertyQName); PropertyDefinition propertyDefinition = getPropertyDefinition(propertyQName);
@@ -1112,7 +1113,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
else return dataType.getName().equals(DataTypeDefinition.NODE_REF); else return dataType.getName().equals(DataTypeDefinition.NODE_REF);
} }
private String getFieldForNonText(PropertyDefinition propertyDefinition) public String getFieldForNonText(PropertyDefinition propertyDefinition)
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
QName qName = propertyDefinition.getDataType().getName(); QName qName = propertyDefinition.getDataType().getName();
@@ -1167,12 +1168,12 @@ public class AlfrescoSolrDataModel implements QueryConstants
return builder.toString(); return builder.toString();
} }
private PropertyDefinition getPropertyDefinition(QName propertyQName) public PropertyDefinition getPropertyDefinition(QName propertyQName)
{ {
return getDictionaryService(CMISStrictDictionaryService.DEFAULT).getProperty(propertyQName); return getDictionaryService(CMISStrictDictionaryService.DEFAULT).getProperty(propertyQName);
} }
boolean putModel(M2Model model) public boolean putModel(M2Model model)
{ {
Set<String> errors = validateModel(model); Set<String> errors = validateModel(model);
if(errors.isEmpty()) if(errors.isEmpty())
@@ -1196,7 +1197,6 @@ public class AlfrescoSolrDataModel implements QueryConstants
{ {
// FIXME: this has no effect. The method should be changed (SEARCH-1482) // FIXME: this has no effect. The method should be changed (SEARCH-1482)
modelErrors.remove(modelQName); modelErrors.remove(modelQName);
dictionaryDAO.removeModel(modelQName); dictionaryDAO.removeModel(modelQName);
} }
@@ -1294,7 +1294,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
* @param alternativeDictionary - can be null; * @param alternativeDictionary - can be null;
* @return CMISDictionaryService * @return CMISDictionaryService
*/ */
private CMISDictionaryService getCMISDictionary(String alternativeDictionary, CmisVersion cmisVersion) public CMISDictionaryService getCMISDictionary(String alternativeDictionary, CmisVersion cmisVersion)
{ {
CMISDictionaryService cmisDictionary = null; CMISDictionaryService cmisDictionary = null;
@@ -1317,7 +1317,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
* *
* @return the Alfresco models associated with the current dictionary. * @return the Alfresco models associated with the current dictionary.
*/ */
List<AlfrescoModel> getAlfrescoModels() public List<AlfrescoModel> getAlfrescoModels()
{ {
return dictionaryDAO.getModels().stream() return dictionaryDAO.getModels().stream()
.map(qname -> { .map(qname -> {
@@ -1395,7 +1395,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
return new ContextAwareQuery(luceneQuery, Boolean.TRUE.equals(isFilter) ? null : searchParameters); return new ContextAwareQuery(luceneQuery, Boolean.TRUE.equals(isFilter) ? null : searchParameters);
} }
private LuceneQueryBuilderContext<Query, Sort, ParseException> getLuceneQueryBuilderContext(SearchParameters searchParameters, SolrQueryRequest req, String alternativeDictionary, FTSQueryParser.RerankPhase rerankPhase) public LuceneQueryBuilderContext<Query, Sort, ParseException> getLuceneQueryBuilderContext(SearchParameters searchParameters, SolrQueryRequest req, String alternativeDictionary, FTSQueryParser.RerankPhase rerankPhase)
{ {
return new Lucene4QueryBuilderContextSolrImpl( return new Lucene4QueryBuilderContextSolrImpl(
getDictionaryService(alternativeDictionary), getDictionaryService(alternativeDictionary),
@@ -1556,7 +1556,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
return solrSortField; return solrSortField;
} }
private String mapNonPropertyFields(String queryField) public String mapNonPropertyFields(String queryField)
{ {
switch(queryField) switch(queryField)
{ {
@@ -1574,7 +1574,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
* @param ending String * @param ending String
* @return ContentFieldType * @return ContentFieldType
*/ */
private ContentFieldType getTextField(String ending) public ContentFieldType getTextField(String ending)
{ {
switch(ending) switch(ending)
{ {