diff --git a/logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/LDCmisService.java b/logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/LDCmisService.java index 9f46eed96..b245bd9c3 100644 --- a/logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/LDCmisService.java +++ b/logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/LDCmisService.java @@ -512,13 +512,8 @@ public ObjectList getContentChanges(String repositoryId, Holder changeLo validateSession(); - try { - ObjectList ret = getRepository().getContentChanges(changeLogToken, - maxItems != null ? (int) maxItems.doubleValue() : 2000); - return ret; - } catch (Exception e) { - throw e; - } + return getRepository().getContentChanges(changeLogToken, + maxItems != null ? (int) maxItems.doubleValue() : 2000); } @Override diff --git a/logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/ServiceFactory.java b/logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/ServiceFactory.java index 2463b6eeb..de9753143 100644 --- a/logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/ServiceFactory.java +++ b/logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/ServiceFactory.java @@ -32,7 +32,7 @@ public class ServiceFactory extends AbstractServiceFactory { private static final BigInteger DEFAULT_DEPTH_OBJECTS = BigInteger.valueOf(10); - private static final Logger log = LoggerFactory.getLogger(CmisService.class); + private static final Logger log = LoggerFactory.getLogger(ServiceFactory.class); public ServiceFactory() { super(); diff --git a/logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/TypeManager.java b/logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/TypeManager.java index 41ed48cee..4e150bbdd 100644 --- a/logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/TypeManager.java +++ b/logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/TypeManager.java @@ -97,8 +97,8 @@ public TypeManager() { * Creates the base types. */ private void setup() { - types = new HashMap(); - typesList = new ArrayList(); + types = new HashMap<>(); + typesList = new ArrayList<>(); // folder type FolderTypeDefinitionImpl folderType = new FolderTypeDefinitionImpl(); @@ -474,7 +474,7 @@ private void addTypeInteral(AbstractTypeDefinition type) { TypeDefinitionContainerImpl tdc = types.get(type.getParentTypeId()); if (tdc != null) { if (tdc.getChildren() == null) { - tdc.setChildren(new ArrayList()); + tdc.setChildren(new ArrayList<>()); } tdc.getChildren().add(tc); } @@ -500,7 +500,7 @@ private void addTypeInteral(AbstractTypeDefinition type) { public TypeDefinitionList getTypesChildren(CallContext context, String typeId, boolean includePropertyDefinitions, BigInteger maxItems, BigInteger skipCount) { TypeDefinitionContainer tc = types.get(typeId); - TypeDefinitionListImpl result = new TypeDefinitionListImpl(new ArrayList()); + TypeDefinitionListImpl result = new TypeDefinitionListImpl(new ArrayList<>()); if (typeId == null) { result.getList().add(copyTypeDefintion(types.get(FOLDER_TYPE_ID).getTypeDefinition())); result.getList().add(copyTypeDefintion(types.get(DOCUMENT_TYPE_ID).getTypeDefinition())); @@ -512,7 +512,7 @@ public TypeDefinitionList getTypesChildren(CallContext context, String typeId, b .map(c -> copyTypeDefintion(c.getTypeDefinition())).collect(Collectors.toList())); } - result.setHasMoreItems(tc != null ? result.getList().size() < tc.getChildren().size() : false); + result.setHasMoreItems(tc != null && result.getList().size() < tc.getChildren().size()); result.setNumItems(BigInteger.valueOf(tc != null ? tc.getChildren().size() : result.getList().size())); if (!includePropertyDefinitions) { @@ -546,7 +546,7 @@ public List getTypesDescendants(CallContext context, St } // set property definition flag to default value if not set - boolean ipd = (includePropertyDefinitions == null ? false : includePropertyDefinitions.booleanValue()); + boolean ipd = (includePropertyDefinitions != null && includePropertyDefinitions.booleanValue()); if (typeId == null) { result.add(getTypesDescendants(d, types.get(FOLDER_TYPE_ID), ipd)); @@ -583,7 +583,7 @@ private TypeDefinitionContainer getTypesDescendants(int depth, TypeDefinitionCon result.setTypeDefinition(type); if (depth != 0 && tc.getChildren() != null) { - result.setChildren(new ArrayList()); + result.setChildren(new ArrayList<>()); for (TypeDefinitionContainer tdc : tc.getChildren()) { result.getChildren() .add(getTypesDescendants(depth < 0 ? -1 : depth - 1, tdc, includePropertyDefinitions)); diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/HibernatePersistentObjectDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/HibernatePersistentObjectDAO.java index 4b74029f7..03fbe4cef 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/HibernatePersistentObjectDAO.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/HibernatePersistentObjectDAO.java @@ -109,7 +109,7 @@ public List findAllIds() { return findIdsByWhere("", "", null); } catch (Exception e) { log.error(e.getMessage(), e); - return new ArrayList(); + return new ArrayList<>(); } } @@ -118,7 +118,7 @@ public List findAllIds(long tenantId) { return findIdsByWhere(" " + ENTITY + ".tenantId=" + tenantId, "", null); } catch (Exception e) { log.error(e.getMessage(), e); - return new ArrayList(); + return new ArrayList<>(); } } @@ -217,7 +217,7 @@ protected void logQuery(String query) { @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public List findByQuery(String query, Object[] values, Integer max) throws PersistenceException { - List coll = new ArrayList(); + List coll = new ArrayList<>(); try { logQuery(query); Query queryObject = prepareQuery(query, values, max); @@ -231,7 +231,7 @@ public List findByQuery(String query, Object[] values, Integer max) throws Persi @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public List findByQuery(String query, Map parameters, Integer max) throws PersistenceException { - List coll = new ArrayList(); + List coll = new ArrayList<>(); try { logQuery(query); Query queryObject = prepareQuery(query, parameters, max); @@ -244,13 +244,13 @@ public List findByQuery(String query, Map parameters, Integer ma @Override public List findIdsByWhere(String where, String order, Integer max) throws PersistenceException { - return findIdsByWhere(where, new Object[0], order, max); + return findIdsByWhere(where, new HashMap<>(), order, max); } @Override - public List findIdsByWhere(String where, Object[] values, String order, Integer max) + public List findIdsByWhere(String where, Map parameters, String order, Integer max) throws PersistenceException { - List coll = new ArrayList(); + List coll = new ArrayList<>(); try { String sorting = StringUtils.isNotEmpty(order) && !order.toLowerCase().contains(ORDER_BY) ? ORDER_BY + " " + order @@ -259,7 +259,7 @@ public List findIdsByWhere(String where, Object[] values, String order, In + (StringUtils.isNotEmpty(where) ? AND + where + ") " : " ") + (StringUtils.isNotEmpty(sorting) ? sorting : " "); logQuery(query); - Query queryObject = prepareQueryForLong(query, values, max); + Query queryObject = prepareQueryForLong(query, parameters, max); coll = queryObject.list(); return coll; } catch (Exception e) { @@ -407,25 +407,6 @@ protected Query prepareQuery(String expression, Object[] values, Integ return queryObject; } - /** - * Utility method useful for preparing an Hibernate query for longs - * - * @param expression The expression for the query - * @param values The parameters values to be used (optional, if the query is - * parametric) - * @param max Optional maximum number of wanted results - * - * @return The Hibernate query - */ - protected Query prepareQueryForLong(String expression, Object[] values, Integer max) { - if (values != null) - for (int i = 0; i < values.length; i++) - expression = expression.replace("?" + (i + 1), PARAM + (i + 1)); - Query queryObject = sessionFactory.getCurrentSession().createQuery(expression, Long.class); - applyParamsAndLimit(values, max, queryObject); - return queryObject; - } - /** * Applies the params * @@ -435,7 +416,7 @@ protected Query prepareQueryForLong(String expression, Object[] values, In * * @deprecated */ - @Deprecated(since = "8.9") + @Deprecated(since = "8.8") private void applyParamsAndLimit(Object[] values, Integer max, @SuppressWarnings("rawtypes") Query queryObject) { if (values != null && values.length > 0) @@ -462,6 +443,23 @@ protected Query prepareQuery(String expression, Map va return queryObject; } + /** + * Utility method useful for preparing an Hibernate query for returning a + * long + * + * @param expression The expression for the query + * @param values The parameters values to be used (optional, if the query is + * parametric) + * @param max Optional maximum number of wanted results + * + * @return The Hibernate query + */ + protected Query prepareQueryForLong(String expression, Map values, Integer max) { + Query queryObject = sessionFactory.getCurrentSession().createQuery(expression, Long.class); + applyParamsAndLimit(values, max, queryObject); + return queryObject; + } + /** * Utility method useful for preparing an Hibernate query for objects of * this type diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/History.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/History.java index d510dcc5b..78e3245b8 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/History.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/History.java @@ -97,7 +97,7 @@ public void setFileVersion(String fileVersion) { // collector private boolean notifyEvent = true; - public static String ASPECT = "saveHistory"; + public static final String ASPECT = "saveHistory"; private String ip; @@ -290,8 +290,8 @@ public int getIsNew() { return isNew; } - public void setIsNew(int _new) { - this.isNew = _new; + public void setIsNew(int nnew) { + this.isNew = nnew; } public String getFilename() { @@ -425,13 +425,7 @@ public String getColor() { public void setColor(String color) { this.color = color; } - - @Override - public int compareTo(History other) { - return getDate().compareTo(other.getDate()); - } - - + protected void copyAttributesFrom(History source) { setTenantId(source.getTenantId()); setDate(source.getDate()); @@ -465,6 +459,24 @@ protected void copyAttributesFrom(History source) { @Override public String toString() { - return getId() +" - " + event; + return getId() + " - " + event; + } + + @Override + public int compareTo(History other) { + return getDate().compareTo(other.getDate()); + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof History)) + return false; + History other = (History) obj; + return other.getId() == this.getId(); + } + + @Override + public int hashCode() { + return Long.valueOf(getId()).hashCode(); } } \ No newline at end of file diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/PersistentObject.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/PersistentObject.java index a4678c388..60cde1069 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/PersistentObject.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/PersistentObject.java @@ -92,6 +92,7 @@ public void setRecordVersion(long recordVersion) { this.recordVersion = recordVersion; } + @Override public boolean equals(Object obj) { if (!(obj instanceof PersistentObject)) return false; @@ -99,8 +100,8 @@ public boolean equals(Object obj) { return other.getId() == this.getId(); } + @Override public int hashCode() { return Long.valueOf(getId()).hashCode(); } - } \ No newline at end of file diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/PersistentObjectDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/PersistentObjectDAO.java index 8945c7dff..f94272e29 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/PersistentObjectDAO.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/PersistentObjectDAO.java @@ -114,7 +114,7 @@ public interface PersistentObjectDAO { * * @deprecated */ - @Deprecated(since = "8.9") + @Deprecated(since = "8.8") public List findByWhere(String where, Object[] values, String order, Integer max) throws PersistenceException; /** @@ -145,6 +145,7 @@ public List findByWhere(String where, Map parameters, String * * @throws PersistenceException raised in case of errors in the database */ + @Deprecated(since = "8.8") public List findByObjectQuery(String query, Object[] values, Integer max) throws PersistenceException; /** @@ -175,7 +176,7 @@ public List findByObjectQuery(String query, Map parameters, I * * @deprecated */ - @Deprecated(since = "8.9") + @Deprecated(since = "8.8") public List findByQuery(String query, Object[] values, Integer max) throws PersistenceException; /** @@ -213,6 +214,7 @@ public List findByQuery(String query, Map parameters, In * @param where The where clause expression (for positional parameters, * please use JPA-style: ?1, ?2 ...) * @param values Parameters used in the where expression + * @param parameters The map of the parameters * @param order The order clause expression * @param max Maximum results number (optional) * @@ -220,7 +222,7 @@ public List findByQuery(String query, Map parameters, In * * @throws PersistenceException raised in case of errors in the database */ - public List findIdsByWhere(String where, Object[] values, String order, Integer max) + public List findIdsByWhere(String where, Map parameters, String order, Integer max) throws PersistenceException; /** diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/RunLevel.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/RunLevel.java index 29387029d..331e1159e 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/RunLevel.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/RunLevel.java @@ -107,7 +107,7 @@ public static List getAspects() { PluginRegistry registry = PluginRegistry.getInstance(); Collection exts = registry.getExtensions("logicaldoc-core", "Aspect"); - List aspects = new ArrayList(); + List aspects = new ArrayList<>(); for (Extension ext : exts) aspects.add(ext.getParameter("code").valueAsString()); Collections.sort(aspects); diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/SystemInfo.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/SystemInfo.java index d166b3e95..7967195c2 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/SystemInfo.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/SystemInfo.java @@ -110,7 +110,7 @@ public static SystemInfo get(long tenantId) { */ if (info.getFeatures() == null || info.getFeatures().length == 0) try { - List features = new ArrayList(); + List features = new ArrayList<>(); PluginRegistry registry = PluginRegistry.getInstance(); Collection exts = registry.getExtensions("logicaldoc-core", "Feature"); for (Extension extension : exts) { diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/automation/CollectionTool.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/automation/CollectionTool.java index 707d80254..12552a07a 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/automation/CollectionTool.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/automation/CollectionTool.java @@ -29,7 +29,7 @@ public class CollectionTool { */ public List toList(Object[] array) { if (array == null) - return new ArrayList(); + return new ArrayList<>(); else return Arrays.asList(array); } diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/AbstractDocument.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/AbstractDocument.java index 2683366b1..a02739060 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/AbstractDocument.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/AbstractDocument.java @@ -989,8 +989,8 @@ public void copyAttributes(AbstractDocument docVO) { setWorkflowStatusDisplay(docVO.getWorkflowStatusDisplay()); setColor(docVO.getColor()); - setAttributes(new HashMap()); - setTags(new HashSet()); + setAttributes(new HashMap<>()); + setTags(new HashSet<>()); try { for (Entry entry : docVO.getAttributes().entrySet()) diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentComparator.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentComparator.java index 49fb4c464..27b2b59b6 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentComparator.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentComparator.java @@ -19,84 +19,84 @@ public abstract class DocumentComparator implements Comparator private DocumentComparator() { }; - private static DocumentComparator ID_SORT = new DocumentComparator() { + private final static DocumentComparator ID_SORT = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { return Long.valueOf(d1.getId()).compareTo(d2.getId()); } }; - private static DocumentComparator FILENAME_SORT_CS = new DocumentComparator() { + private final static DocumentComparator FILENAME_SORT_CS = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { return d1.getFileName().compareTo(d2.getFileName()); } }; - private static DocumentComparator FILENAME_SORT_CI = new DocumentComparator() { + private final static DocumentComparator FILENAME_SORT_CI = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { return d1.getFileName().toLowerCase().compareTo(d2.getFileName().toLowerCase()); } }; - private static DocumentComparator FILESIZE_SORT = new DocumentComparator() { + private final static DocumentComparator FILESIZE_SORT = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { return Long.valueOf(d1.getFileSize()).compareTo(d2.getFileSize()); } }; - private static DocumentComparator VERSION_SORT = new DocumentComparator() { + private final static DocumentComparator VERSION_SORT = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { return d1.getVersion().compareTo(d2.getVersion()); } }; - private static DocumentComparator FILEVERSION_SORT = new DocumentComparator() { + private final static DocumentComparator FILEVERSION_SORT = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { return d1.getFileVersion().compareTo(d2.getFileVersion()); } }; - private static DocumentComparator LASTMODIFIED_SORT = new DocumentComparator() { + private final static DocumentComparator LASTMODIFIED_SORT = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { return d1.getLastModified().compareTo(d2.getLastModified()); } }; - private static DocumentComparator PUBLISHED_SORT = new DocumentComparator() { + private final static DocumentComparator PUBLISHED_SORT = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { return d1.getDate().compareTo(d2.getDate()); } }; - private static DocumentComparator CREATED_SORT = new DocumentComparator() { + private final static DocumentComparator CREATED_SORT = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { return d1.getCreation().compareTo(d2.getCreation()); } }; - private static DocumentComparator CUSTOMID_SORT = new DocumentComparator() { + private final static DocumentComparator CUSTOMID_SORT = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { return d1.getCustomId().compareTo(d2.getCustomId()); } }; - private static DocumentComparator TYPE_SORT = new DocumentComparator() { + private final static DocumentComparator TYPE_SORT = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { return d1.getType().compareTo(d2.getType()); } }; - private static DocumentComparator COMMENT_SORT_CS = new DocumentComparator() { + private final static DocumentComparator COMMENT_SORT_CS = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { String val1 = d1.getComment(); @@ -112,7 +112,7 @@ else if (val2 == null) } }; - private static DocumentComparator COMMENT_SORT_CI = new DocumentComparator() { + private final static DocumentComparator COMMENT_SORT_CI = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { String val1 = d1.getComment(); @@ -128,7 +128,7 @@ else if (val2 == null) } }; - private static DocumentComparator STARTPUB_SORT = new DocumentComparator() { + private final static DocumentComparator STARTPUB_SORT = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { Date val1 = d1.getStartPublishing(); @@ -144,7 +144,7 @@ else if (val2 == null) } }; - private static DocumentComparator STOPPUB_SORT = new DocumentComparator() { + private final static DocumentComparator STOPPUB_SORT = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { Date val1 = d1.getStopPublishing(); @@ -160,7 +160,7 @@ else if (val2 == null) } }; - private static DocumentComparator WFSTATUS_SORT_CS = new DocumentComparator() { + private final static DocumentComparator WFSTATUS_SORT_CS = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { String val1 = d1.getWorkflowStatus(); @@ -176,7 +176,7 @@ else if (val2 == null) } }; - private static DocumentComparator WFSTATUS_SORT_CI = new DocumentComparator() { + private final static DocumentComparator WFSTATUS_SORT_CI = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { String val1 = d1.getWorkflowStatus(); @@ -192,14 +192,14 @@ else if (val2 == null) } }; - private static DocumentComparator PUBSTATUS_SORT = new DocumentComparator() { + private final static DocumentComparator PUBSTATUS_SORT = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { return Integer.valueOf(d1.getPublished()).compareTo(d2.getPublished()); } }; - private static DocumentComparator TEMPLATE_NAME_SORT_CS = new DocumentComparator() { + private final static DocumentComparator TEMPLATE_NAME_SORT_CS = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { if (d1.getTemplate() != null && d2.getTemplate() != null) @@ -209,7 +209,7 @@ public int compare(AbstractDocument d1, AbstractDocument d2) { } }; - private static DocumentComparator TEMPLATE_NAME_SORT_CI = new DocumentComparator() { + private final static DocumentComparator TEMPLATE_NAME_SORT_CI = new DocumentComparator() { @Override public int compare(AbstractDocument d1, AbstractDocument d2) { if (d1.getTemplate() != null && d2.getTemplate() != null) @@ -219,7 +219,7 @@ public int compare(AbstractDocument d1, AbstractDocument d2) { } }; - private static DocumentComparator descending(final Comparator other) { + private final static DocumentComparator descending(final Comparator other) { return new DocumentComparator() { public int compare(AbstractDocument d1, AbstractDocument d2) { return -1 * other.compare(d1, d2); @@ -227,7 +227,7 @@ public int compare(AbstractDocument d1, AbstractDocument d2) { }; } - private static DocumentComparator newComparatorForExtendedAttribute(final String attribute, boolean caseSensitive) { + private final static DocumentComparator newComparatorForExtendedAttribute(final String attribute, boolean caseSensitive) { return new DocumentComparator() { @SuppressWarnings({ "rawtypes", "unchecked" }) public int compare(AbstractDocument d1, AbstractDocument d2) { @@ -253,7 +253,7 @@ else if (val2 == null) * Map of comparators for legacy fields, Key is fieldname-CS or * fieldName-CI, value is the comparator */ - private static Map legacyComparators = new HashMap<>(); + private final static Map legacyComparators = new HashMap<>(); static { legacyComparators.put("fileName-CS", FILENAME_SORT_CS); diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderDAO.java index 0d87576d0..0fc377a7d 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderDAO.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderDAO.java @@ -649,7 +649,7 @@ public List findByName(Folder parent, String name, Long tenantId, boolea @SuppressWarnings("unchecked") List ids = queryForList(query.toString(), Long.class); - List folders = new ArrayList(); + List folders = new ArrayList<>(); for (Long id : ids) folders.add(findById(id)); return folders; diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/websockets/WebSocketListener.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/websockets/WebSocketListener.java index 0a6c77f9d..a7428d740 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/websockets/WebSocketListener.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/websockets/WebSocketListener.java @@ -64,7 +64,7 @@ public class WebSocketListener extends WebSocketListenerAdapter { private boolean rememberHistory(WebsocketMessage event) { Queue fifo = fifos.get(event.getEvent()); if (fifo == null) { - fifo = new LimitedQueue(1000); + fifo = new LimitedQueue<>(1000); fifos.put(event.getEvent(), fifo); } diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_en.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_en.properties index 42e4b55db..55f47d5bb 100644 --- a/logicaldoc-i18n/src/main/resources/i18n/messages_en.properties +++ b/logicaldoc-i18n/src/main/resources/i18n/messages_en.properties @@ -2950,4 +2950,6 @@ prefilledfieldshint = You may pre-fill some fields to help the responders prefillfileds = Pre-fill fields extract = Extract onerrormarkunindexable = On error, mark unindexable -onerrormarkunindexablehint = In case of error, the document gets marked as unindexable \ No newline at end of file +onerrormarkunindexablehint = In case of error, the document gets marked as unindexable +whendocumentprocessing = When the document is being processed +afterdocumentprocessed = After the document has been processed \ No newline at end of file diff --git a/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/resource/DavResourceImpl.java b/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/resource/DavResourceImpl.java index d08d7b474..5be37a841 100644 --- a/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/resource/DavResourceImpl.java +++ b/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/resource/DavResourceImpl.java @@ -304,7 +304,7 @@ private void addPermissionsProperty(DavPropertyName name, Namespace nameSpace) { if (!isCollection() && !resource.isFolder()) { val = "RDNVW"; } - DefaultDavProperty defaultDavProperty = new DefaultDavProperty("permissions", val, + DefaultDavProperty defaultDavProperty = new DefaultDavProperty<>("permissions", val, nameSpace); properties.add(defaultDavProperty); } @@ -312,7 +312,7 @@ private void addPermissionsProperty(DavPropertyName name, Namespace nameSpace) { private void addSizeProperty(DavPropertyName name, Namespace nameSpace) { if (name.getName().equals("size") && !isCollection() && !resource.isFolder()) { - DefaultDavProperty defaultDavProperty = new DefaultDavProperty("size", + DefaultDavProperty defaultDavProperty = new DefaultDavProperty<>("size", resource.getContentLength(), nameSpace); properties.add(defaultDavProperty); } @@ -324,7 +324,7 @@ private void addIdProperty(Namespace nameSpace) { val = "d-" + resource.getID(); } - DefaultDavProperty idProp = new DefaultDavProperty("id", val, nameSpace); + DefaultDavProperty idProp = new DefaultDavProperty<>("id", val, nameSpace); properties.add(idProp); }