diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentEvent.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentEvent.java index 9bc4660d9..060e570b9 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentEvent.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentEvent.java @@ -57,6 +57,7 @@ public enum DocumentEvent { this.event = event; } + @Override public String toString() { return this.event; } diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/Version.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/Version.java index 5cec8e59b..f285475b2 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/Version.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/Version.java @@ -176,10 +176,12 @@ public void setFolderName(String folderName) { this.folderName = folderName; } + @Override public Long getTemplateId() { return templateId; } + @Override public void setTemplateId(Long templateId) { this.templateId = templateId; } @@ -277,18 +279,22 @@ public void setEvent(String event) { this.event = event; } + @Override public String getCreator() { return creator; } + @Override public void setCreator(String creator) { this.creator = creator; } + @Override public long getCreatorId() { return creatorId; } + @Override public void setCreatorId(long creatorId) { this.creatorId = creatorId; } diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/dao/HibernateDocumentDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/dao/HibernateDocumentDAO.java index 6f86dc481..f487e4a98 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/dao/HibernateDocumentDAO.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/dao/HibernateDocumentDAO.java @@ -813,14 +813,13 @@ public List findDeletedDocs() throws PersistenceException { @SuppressWarnings("rawtypes") RowMapper docMapper = new BeanPropertyRowMapper() { + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { - Document doc = new Document(); doc.setId(rs.getLong(1)); doc.setCustomId(rs.getString(2)); doc.setLastModified(rs.getDate(3)); doc.setFileName(rs.getString(4)); - return doc; } }; @@ -910,6 +909,7 @@ public void makeImmutable(long docId, DocumentHistory transaction) throws Persis store(doc, transaction); } + @Override public void deleteAll(Collection documents, DocumentHistory transaction) throws PersistenceException { deleteAll(documents, PersistentObject.DELETED_CODE_DEFAULT, transaction); } @@ -993,6 +993,7 @@ public List findDeleted(long userId, Integer maxHits) throws Persisten @SuppressWarnings("rawtypes") RowMapper docMapper = new BeanPropertyRowMapper() { + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { Document doc = new Document(); doc.setId(rs.getLong(1)); @@ -1104,7 +1105,8 @@ public void cleanUnexistingUniqueTags() throws PersistenceException { // tags no more existing in the ld_tag table or that belong to // deleted documents - deleteStatement.append(" ld_uniquetag.ld_tag NOT IN ( SELECT DISTINCT t.ld_tag FROM ld_tag t JOIN ld_document d ON d.ld_id = t.ld_docid WHERE ld_uniquetag.ld_tenantid = t.ld_tenantid AND ld_uniquetag.ld_tag = t.ld_tag AND d.ld_deleted = 0 ) "); + deleteStatement.append( + " ld_uniquetag.ld_tag NOT IN ( SELECT DISTINCT t.ld_tag FROM ld_tag t JOIN ld_document d ON d.ld_id = t.ld_docid WHERE ld_uniquetag.ld_tenantid = t.ld_tenantid AND ld_uniquetag.ld_tag = t.ld_tag AND d.ld_deleted = 0 ) "); // tags no more existing in the ld_foldertag table or that belong to // deleted folders @@ -1330,6 +1332,7 @@ public Document findByPath(String path, long tenantId) throws PersistenceExcepti return null; } + @SuppressWarnings("unchecked") @Override public List findDuplicatedDigests(Long tenantId, Long folderId) throws PersistenceException { // First of all, find all duplicates digests. @@ -1349,10 +1352,8 @@ public List findDuplicatedDigests(Long tenantId, Long folderId) throws P } digestQuery.append(" and ld_docref is null and ld_digest is not null group by ld_digest having count(*) > 1"); - return query(digestQuery.toString(), null, new RowMapper() { - public String mapRow(ResultSet rs, int rowNum) throws SQLException { - return rs.getString(1); - } + return query(digestQuery.toString(), null, (rs, rowNum) -> { + return rs.getString(1); }, null); } diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/dao/HibernateRatingDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/dao/HibernateRatingDAO.java index c154f84f8..96806bb0b 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/dao/HibernateRatingDAO.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/dao/HibernateRatingDAO.java @@ -84,6 +84,7 @@ public Rating findVotesByDocId(long docId) { @SuppressWarnings("rawtypes") RowMapper ratingMapper = new BeanPropertyRowMapper() { + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { Rating rating = new Rating(); diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/Folder.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/Folder.java index 388972ad5..b2f11b653 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/Folder.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/Folder.java @@ -218,6 +218,7 @@ public boolean isAlias() { return type == TYPE_ALIAS; } + @Override public long getId() { return id; } @@ -235,6 +236,7 @@ public void clearFolderGroups() { folderGroups = new HashSet<>(); } + @Override public void setId(long id) { this.id = id; } diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/FolderEvent.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/FolderEvent.java index 87833f9f3..83173aae4 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/FolderEvent.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/FolderEvent.java @@ -33,6 +33,7 @@ public enum FolderEvent { this.event = event; } + @Override public String toString() { return this.event; } diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/AbiWordParser.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/AbiWordParser.java index 00f6483a5..036b72a27 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/AbiWordParser.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/AbiWordParser.java @@ -51,6 +51,8 @@ public String getContent() { return tmp; } + + @Override public void startElement(String namespaceURI, String localName, String rawName, Attributes atts) throws SAXException { if (rawName.startsWith("p")) { @@ -58,12 +60,14 @@ public void startElement(String namespaceURI, String localName, String rawName, } } + @Override public void characters(char[] ch, int start, int length) throws SAXException { if (appendChar) { content.append(ch, start, length).append(" "); } } + @Override public void endElement(java.lang.String namespaceURI, java.lang.String localName, java.lang.String qName) throws SAXException { appendChar = false; diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/ExtractorHandler.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/ExtractorHandler.java index 9cfa7bd98..edc9f579f 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/ExtractorHandler.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/ExtractorHandler.java @@ -10,127 +10,128 @@ import org.xml.sax.helpers.DefaultHandler; /** - * Utility class for extracting text content from an XML document. - * An instance of this class is a SAX event handler that extracts - * character data and attribute values from the SAX events and writes - * the extracted content to a given {@link Writer}. + * Utility class for extracting text content from an XML document. An instance + * of this class is a SAX event handler that extracts character data and + * attribute values from the SAX events and writes the extracted content to a + * given {@link Writer}. *

- * Any whitespace sequences are imploded into a single space character - * and consecutive attribute values and character data are delimited - * using spaces. + * Any whitespace sequences are imploded into a single space character and + * consecutive attribute values and character data are delimited using spaces. *

- * This class also implements the {@link ErrorHandler} interface by - * ignoring all errors and warnings. This is useful in avoiding the - * default console output or other error logging of many XML parsers. + * This class also implements the {@link ErrorHandler} interface by ignoring all + * errors and warnings. This is useful in avoiding the default console output or + * other error logging of many XML parsers. * * @see XMLParser * @since 4.5.2 */ class ExtractorHandler extends DefaultHandler implements ErrorHandler { - /** - * Separator that is written between consecutive text and attribute values. - */ - private static final char SPACE_CHAR = ' '; + /** + * Separator that is written between consecutive text and attribute values. + */ + private static final char SPACE_CHAR = ' '; - /** - * The writer to which the selected text content is written. - */ - private final Writer writer; + /** + * The writer to which the selected text content is written. + */ + private final Writer writer; - /** - * Flag for outputting a space before the next character to be outputted. - * Used to implode all whitespace sequences and to separate consecutive - * attribute values and text elements. - */ - private boolean space; + /** + * Flag for outputting a space before the next character to be outputted. + * Used to implode all whitespace sequences and to separate consecutive + * attribute values and text elements. + */ + private boolean space; - /** - * Creates an extractor handler that writes text content to the given - * writer. - * - * @param writer writer to which the XML text content is written - */ - public ExtractorHandler(Writer writer) { - this.writer = writer; - this.space = false; - } + /** + * Creates an extractor handler that writes text content to the given + * writer. + * + * @param writer writer to which the XML text content is written + */ + public ExtractorHandler(Writer writer) { + this.writer = writer; + this.space = false; + } - //------------------------------------------------------< DefaultHandler > + // ------------------------------------------------------< DefaultHandler > - /** - * Writes attribute values to the underlying writer. - * - * @param uri ignored - * @param local ignored - * @param name ignored - * @param attributes attributes, whose values to extract - * @throws SAXException on IO errors - */ - public void startElement( - String uri, String local, String name, Attributes attributes) - throws SAXException { - for (int i = 0; i < attributes.getLength(); i++) { - String value = attributes.getValue(i); - characters(value.toCharArray(), 0, value.length()); - } - } + /** + * Writes attribute values to the underlying writer. + * + * @param uri ignored + * @param local ignored + * @param name ignored + * @param attributes attributes, whose values to extract + * @throws SAXException on IO errors + */ + @Override + public void startElement(String uri, String local, String name, Attributes attributes) throws SAXException { + for (int i = 0; i < attributes.getLength(); i++) { + String value = attributes.getValue(i); + characters(value.toCharArray(), 0, value.length()); + } + } - /** - * Writes the given characters to the underlying writer. - * - * @param ch character array that contains the characters to be written - * @param start start index within the array - * @param length number of characters to write - * @throws SAXException on IO errors - */ - public void characters(char[] ch, int start, int length) - throws SAXException { - try { - for (int i = 0; i < length; i++) { - if (Character.isSpaceChar(ch[start + i])) { - space = true; - } else { - if (space) { - writer.write(SPACE_CHAR); - space = false; - } - writer.write(ch[start + i]); - } - } - space = true; - } catch (IOException e) { - throw new SAXException(e.getMessage()); - } - } + /** + * Writes the given characters to the underlying writer. + * + * @param ch character array that contains the characters to be written + * @param start start index within the array + * @param length number of characters to write + * @throws SAXException on IO errors + */ + @Override + public void characters(char[] ch, int start, int length) throws SAXException { + try { + for (int i = 0; i < length; i++) { + if (Character.isSpaceChar(ch[start + i])) { + space = true; + } else { + if (space) { + writer.write(SPACE_CHAR); + space = false; + } + writer.write(ch[start + i]); + } + } + space = true; + } catch (IOException e) { + throw new SAXException(e.getMessage()); + } + } - //--------------------------------------------------------< ErrorHandler > + // --------------------------------------------------------< ErrorHandler > - /** - * Ignored. - * - * @param exception ignored - */ - public void warning(SAXParseException exception) { - // Noting to do - } + /** + * Ignored. + * + * @param exception ignored + */ + @Override + public void warning(SAXParseException exception) { + // Noting to do + } - /** - * Ignored. - * - * @param exception ignored - */ - public void error(SAXParseException exception) { - // Noting to do - } + /** + * Ignored. + * + * @param exception ignored + */ + @Override + public void error(SAXParseException exception) { + // Noting to do + } - /** - * Ignored. - * - * @param exception ignored - */ - public void fatalError(SAXParseException exception) { - // Noting to do - } + /** + * Ignored. + * + * @param exception ignored + */ + @Override + public void fatalError(SAXParseException exception) { + // Noting to do + } } diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/OpenOfficeParser.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/OpenOfficeParser.java index 45d25aec5..a624d7d8d 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/OpenOfficeParser.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/OpenOfficeParser.java @@ -85,6 +85,7 @@ public void characters(char[] ch, int start, int length) throws SAXException { } } +@Override public void endElement(java.lang.String namespaceURI, java.lang.String localName, java.lang.String qName) throws SAXException { appendChar = false; @@ -133,6 +134,7 @@ public void characters(char[] ch, int start, int length) throws SAXException { // Nothing to do } + @Override public void endElement(java.lang.String namespaceURI, java.lang.String localName, java.lang.String qName) throws SAXException { // Nothing to do @@ -168,6 +170,7 @@ public void characters(char[] ch, int start, int length) throws SAXException { // Nothing to do } + @Override public void endElement(java.lang.String namespaceURI, java.lang.String localName, java.lang.String qName) throws SAXException { // Nothing to do diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/XMLParser.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/XMLParser.java index 838a87cba..7350695d5 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/XMLParser.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/XMLParser.java @@ -68,6 +68,7 @@ public InputSource resolveEntity(String publicId, String systemId) throws SAXExc // we prevent the parser from closing it by catching the close() // call and explicitly close the stream in a finally block. InputSource source = new InputSource(new FilterInputStream(input) { + @Override public void close() { // Nothing to do } diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/wordperfect/WPStringExtractor.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/wordperfect/WPStringExtractor.java index c9501cd8b..031e88711 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/wordperfect/WPStringExtractor.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/wordperfect/WPStringExtractor.java @@ -35,6 +35,7 @@ public class WPStringExtractor extends StringExtractor { /** * Wraps the specified InputStream in a WPFilterInputStream and passes it to the super class. */ + @Override public String extract(InputStream stream) throws IOException { WPFilterInputStream wpfis = new WPFilterInputStream(stream); String text = super.extract(wpfis); @@ -43,6 +44,7 @@ public String extract(InputStream stream) throws IOException { } // overrides StringExtractor.isTextCharacter + @Override protected boolean isTextCharacter(int charNumber) { boolean xxx = super.isTextCharacter(charNumber) || charNumber >= 0xC0 && charNumber <= 0xFF @@ -55,6 +57,7 @@ protected boolean isTextCharacter(int charNumber) { } // overrides StringExtractor.isStartLine + @Override protected boolean isStartLine(String lineLowerCase) { for (int i = 0; i < EXACT_START_LINES.length; i++) { if (lineLowerCase.equals(EXACT_START_LINES[i])) { @@ -65,6 +68,7 @@ protected boolean isStartLine(String lineLowerCase) { } // overrides StringExtractor.isValidLine + @Override protected boolean isValidLine(String lineLowerCase) { for (int i = 0; i < EXACT_EXCLUDES.length; i++) { if (lineLowerCase.equals(EXACT_EXCLUDES[i])) { diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/Group.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/Group.java index d04f37ba6..57cb159c9 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/Group.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/Group.java @@ -101,6 +101,7 @@ public void clearUsers() { users = new HashSet<>(); } + @Override public String toString() { return getName(); } diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/Menu.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/Menu.java index 6a116be00..2692dddf3 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/Menu.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/Menu.java @@ -102,6 +102,7 @@ public class Menu extends PersistentObject implements Comparable

{ private Set menuGroups = new HashSet<>(); + @Override public long getId() { return id; } @@ -127,6 +128,7 @@ public void clearMenuGroups() { menuGroups = new HashSet<>(); } + @Override public void setId(long id) { this.id = id; } diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/Session.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/Session.java index 9a0ea4985..cdfc85e31 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/Session.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/Session.java @@ -92,7 +92,7 @@ public class Session extends PersistentObject implements Comparable { * Represents a dictionary of custom informations a client may save in the * session */ - private transient Map dictionary = new ConcurrentHashMap<>(); + private transient Map dictionary = new ConcurrentHashMap<>(); private transient List logs = new ArrayList<>(); @@ -117,7 +117,7 @@ public Date getLastRenew() { */ protected int getTimeout() { int timeout = 30; - ContextProperties config = Context.get().getProperties(); + ContextProperties config = Context.get().getProperties(); if (config.getInt(getTenantName() + ".session.timeout") > 0) timeout = config.getInt(getTenantName() + ".session.timeout"); return timeout; @@ -185,10 +185,10 @@ private Session() { Session(User user, String password, String key, Client client) { super(); - + if (user == null) throw new IllegalArgumentException("user cannot be null"); - + this.sid = UUID.randomUUID().toString(); this.tenantId = user.getTenantId(); this.user = user; @@ -201,7 +201,7 @@ private Session() { TenantDAO tenantDAO = (TenantDAO) Context.get().getBean(TenantDAO.class); this.tenantName = tenantDAO.getTenantName(tenantId); - + UserHistory history = saveUserHistory(user, client); /* @@ -327,6 +327,7 @@ public long getUserId() { return user.getId(); } + @Override public long getTenantId() { return tenantId; } @@ -420,6 +421,7 @@ public User getUser() { return user; } + @Override public void setTenantId(long tenantId) { this.tenantId = tenantId; } diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/User.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/User.java index cb955d110..bb1e96c63 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/User.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/User.java @@ -465,6 +465,8 @@ public void reset() { workingTimes = new HashSet<>(); } + + @Override public String toString() { return getUsername(); } diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/UserEvent.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/UserEvent.java index 55c39313c..4c0e69410 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/UserEvent.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/UserEvent.java @@ -28,6 +28,7 @@ public enum UserEvent { this.event = event; } + @Override public String toString() { return this.event; } diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/dao/HibernateGroupDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/dao/HibernateGroupDAO.java index 9ef2b66fb..6b536dc7c 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/dao/HibernateGroupDAO.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/dao/HibernateGroupDAO.java @@ -35,6 +35,7 @@ public void setMenuDAO(MenuDAO menuDAO) { this.menuDAO = menuDAO; } + @Override public void delete(long groupId, int code) throws PersistenceException { if (code == 0) throw new IllegalArgumentException("code cannot be 0"); diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/stats/StatsCollector.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/stats/StatsCollector.java index a57c57a3b..f09efa75a 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/stats/StatsCollector.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/stats/StatsCollector.java @@ -839,10 +839,12 @@ public void setGenericDAO(GenericDAO genericDAO) { this.genericDAO = genericDAO; } + @Override public ContextProperties getConfig() { return config; } + @Override public void setConfig(ContextProperties config) { this.config = config; } diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/transfer/InMemoryZipImport.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/transfer/InMemoryZipImport.java index a4f71d3bb..298be8044 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/transfer/InMemoryZipImport.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/transfer/InMemoryZipImport.java @@ -37,6 +37,8 @@ public InMemoryZipImport(Document docVo, String charset) { super(docVo, charset); } + + @Override public void process(File zipsource, Folder parent, long userId, String sessionId) { this.zipFile = zipsource; this.sessionId = sessionId; diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIFolder.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIFolder.java index bfd54db30..040e4f3c3 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIFolder.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIFolder.java @@ -115,10 +115,13 @@ public GUIFolder(long id) { this.id = id; } + + @Override public long getId() { return id; } + @Override public void setId(long id) { this.id = id; } diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIStamp.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIStamp.java index b593b57b7..7c2e089ae 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIStamp.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIStamp.java @@ -80,10 +80,12 @@ public GUIStamp(long id) { this.id = id; } + @Override public long getId() { return id; } - + + @Override public void setId(long id) { this.id = id; } diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIVersion.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIVersion.java index bd2f3db6a..394e45368 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIVersion.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIVersion.java @@ -33,10 +33,12 @@ public void setDocId(long docId) { this.docId = docId; } + @Override public String getComment() { return comment; } + @Override public void setComment(String comment) { this.comment = comment; } @@ -57,10 +59,12 @@ public void setVersionDate(Date versionDate) { this.versionDate = versionDate; } + @Override public int getSigned() { return signed; } + @Override public void setSigned(int signed) { this.signed = signed; } @@ -72,4 +76,4 @@ public String getErrorText() { public void setErrorText(String errorText) { this.errorText = errorText; } -} +} \ No newline at end of file diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/dialogs/AbstractEmailDialog.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/dialogs/AbstractEmailDialog.java index 71b91579a..6933b1e31 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/dialogs/AbstractEmailDialog.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/dialogs/AbstractEmailDialog.java @@ -89,6 +89,8 @@ protected void prepareEmail(GUIEmail mail) { // Nothing to do } + + @Override public void onDraw() { SectionStack recipientsStack = prepareRecipientsGrid(); diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/widgets/DropSpotPopup.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/widgets/DropSpotPopup.java index 293cc375d..073722775 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/widgets/DropSpotPopup.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/widgets/DropSpotPopup.java @@ -74,6 +74,7 @@ public void onSuccess(Void result) { /** * Triggers the load of the last uploaded files */ + @Override public void close() { FolderNavigator.get().reload(); destroy(); diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/widgets/preview/PreviewPanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/widgets/preview/PreviewPanel.java index 26dc12235..727eec8b5 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/widgets/preview/PreviewPanel.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/widgets/preview/PreviewPanel.java @@ -132,6 +132,7 @@ private void doResize() { } } + @Override public synchronized void redraw() { redrawing = true; try { diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/DocumentCapturePanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/DocumentCapturePanel.java index 95d42bb5d..2295f2dc4 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/DocumentCapturePanel.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/DocumentCapturePanel.java @@ -137,6 +137,7 @@ public void onSuccess(GUIDocument result) { } @SuppressWarnings("unchecked") + @Override public boolean validate() { Map values = (Map) vm.getValues(); vm.validate(); diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/EmailDialog.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/EmailDialog.java index 0d7b4e1f8..28ca5adfb 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/EmailDialog.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/EmailDialog.java @@ -130,6 +130,7 @@ protected void prepareEmail(GUIEmail mail) { mail.setDocIds(docIds); } + @Override public void onDraw() { super.onDraw(); diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/PublishingPanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/PublishingPanel.java index ab326f3c3..779263856 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/PublishingPanel.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/PublishingPanel.java @@ -100,6 +100,7 @@ private void refresh() { } @SuppressWarnings("unchecked") + @Override public boolean validate() { Map values = (Map) vm.getValues(); vm.validate(); diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/update/UpdateNotificationPanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/update/UpdateNotificationPanel.java index fdf440c04..fd1bebada 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/update/UpdateNotificationPanel.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/update/UpdateNotificationPanel.java @@ -75,6 +75,7 @@ private void prepareForm() { form.setItems(usersItem, message); } + @Override public boolean validate() { vm.validate(); diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/update/UpdateStandardPropertiesPanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/update/UpdateStandardPropertiesPanel.java index d7f2bbf18..d2e1cfd49 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/update/UpdateStandardPropertiesPanel.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/update/UpdateStandardPropertiesPanel.java @@ -200,6 +200,7 @@ private void addTagsFromInput(String input, final DataSource ds) { } @SuppressWarnings("unchecked") + @Override public boolean validate() { Map values = (Map) vm.getValues(); vm.validate(); diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderCapturePanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderCapturePanel.java index a50831b89..ac2e5d321 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderCapturePanel.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderCapturePanel.java @@ -98,6 +98,7 @@ public void onSuccess(Void v) { } @SuppressWarnings("unchecked") + @Override public boolean validate() { Map values = (Map) vm.getValues(); vm.validate(); diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderExtendedPropertiesPanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderExtendedPropertiesPanel.java index 757cfc42c..00e6d34da 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderExtendedPropertiesPanel.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderExtendedPropertiesPanel.java @@ -14,8 +14,6 @@ import com.smartgwt.client.widgets.form.fields.ButtonItem; import com.smartgwt.client.widgets.form.fields.RadioGroupItem; import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; -import com.smartgwt.client.widgets.form.fields.events.ClickEvent; -import com.smartgwt.client.widgets.form.fields.events.ClickHandler; /** * Shows folder's optional template metadata @@ -45,21 +43,21 @@ public FolderExtendedPropertiesPanel(GUIFolder folder, ChangedHandler changedHan applyMetadata.setEndRow(true); applyMetadata.setDisabled(!folder.isWrite()); applyMetadata.setColSpan(1); - applyMetadata.addClickHandler( event -> { - LD.contactingServer(); - FolderService.Instance.get().applyMetadata(folder.getId(), new AsyncCallback() { + applyMetadata.addClickHandler(event -> { + LD.contactingServer(); + FolderService.Instance.get().applyMetadata(folder.getId(), new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - LD.clearPrompt(); - GuiLog.serverError(caught); - } + @Override + public void onFailure(Throwable caught) { + LD.clearPrompt(); + GuiLog.serverError(caught); + } - @Override - public void onSuccess(Void v) { - LD.clearPrompt(); - } - }); + @Override + public void onSuccess(Void v) { + LD.clearPrompt(); + } + }); }); form1 = new DynamicForm(); @@ -73,6 +71,7 @@ public void onSuccess(Void v) { setMembers(form1, propertiesPanel); } + @Override public boolean validate() { if (propertiesPanel.validate() && form1.validate()) { folder.setTemplateLocked("yes".equals(form1.getValueAsString("locked")) ? 1 : 0); diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderInterfacePanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderInterfacePanel.java index c2eb44a76..59bbe007d 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderInterfacePanel.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderInterfacePanel.java @@ -188,6 +188,7 @@ private FormItemIcon prepareSaveCurrentLayout() { return saveCurrentLayout; } + @Override public boolean validate() { vm.validate(); if (Boolean.FALSE.equals(vm.hasErrors())) { diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderStandardPropertiesPanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderStandardPropertiesPanel.java index d8aa708d5..5bb0beb8d 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderStandardPropertiesPanel.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderStandardPropertiesPanel.java @@ -464,6 +464,7 @@ public void onSuccess(Void v) { items.add(applyTags); } + @Override public boolean validate() { vm.validate(); if (Boolean.TRUE.equals(vm.hasErrors())) diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/copy/FolderCopyExtendedPropertiesPanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/copy/FolderCopyExtendedPropertiesPanel.java index 71817b3f8..89ec4bba0 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/copy/FolderCopyExtendedPropertiesPanel.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/copy/FolderCopyExtendedPropertiesPanel.java @@ -39,6 +39,7 @@ public FolderCopyExtendedPropertiesPanel(GUIFolder folder) { setMembers(form1, propertiesPanel); } + @Override public boolean validate() { if (propertiesPanel.validate() && form1.validate()) { folder.setTemplateLocked("yes".equals(form1.getValueAsString("locked")) ? 1 : 0); diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/copy/FolderCopyStandardPropertiesPanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/copy/FolderCopyStandardPropertiesPanel.java index b30b270fb..221614918 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/copy/FolderCopyStandardPropertiesPanel.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/copy/FolderCopyStandardPropertiesPanel.java @@ -207,6 +207,7 @@ private void addTagFromInput(final TagsDS ds, String input) { SC.warn(I18N.message("sometagaddedbecauseinvalid")); } + @Override public boolean validate() { vm.validate(); if (Boolean.FALSE.equals(vm.hasErrors())) { diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/zonalocr/ZonalOCRTemplatesPanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/zonalocr/ZonalOCRTemplatesPanel.java index abb6bcc0d..fd98dc811 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/zonalocr/ZonalOCRTemplatesPanel.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/zonalocr/ZonalOCRTemplatesPanel.java @@ -362,6 +362,7 @@ public void setSelectedOcrTemplate(GUIOCRTemplate selectedOcrTemplate) { AdminScreen.get().setContent(new ZonalOCRPanel(selectedDocumentTemplate, selectedOcrTemplate)); } + @Override public GUIOCRTemplate getSelectedOcrTemplate() { return selectedOcrTemplate; } diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/settings/comparators/ComparatorAssociationsDialog.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/settings/comparators/ComparatorAssociationsDialog.java index c04c71f43..16700b579 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/settings/comparators/ComparatorAssociationsDialog.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/settings/comparators/ComparatorAssociationsDialog.java @@ -69,6 +69,7 @@ protected void prepareSelectItem() { selectItem = ItemFactory.newComparatorSelector(); } + @Override public void onDraw() { refresh(); } diff --git a/logicaldoc-i18n/src/test/java/com/logicaldoc/i18n/OrderedProperties.java b/logicaldoc-i18n/src/test/java/com/logicaldoc/i18n/OrderedProperties.java index 4138c9bc7..2d99e158b 100644 --- a/logicaldoc-i18n/src/test/java/com/logicaldoc/i18n/OrderedProperties.java +++ b/logicaldoc-i18n/src/test/java/com/logicaldoc/i18n/OrderedProperties.java @@ -27,12 +27,12 @@ public class OrderedProperties extends Properties { * @param header a textual header for the top of the file * @exception IOException when things go wrong */ + @Override public void store(OutputStream out, String header) throws IOException { Vector keys = new Vector(); - for (Enumeration e = this.propertyNames(); e.hasMoreElements();) { + for (Enumeration e = this.propertyNames(); e.hasMoreElements();) keys.addElement((String) (e.nextElement())); - } // sort them Collections.sort(keys); diff --git a/logicaldoc-util/src/main/java/com/logicaldoc/util/config/OrderedProperties.java b/logicaldoc-util/src/main/java/com/logicaldoc/util/config/OrderedProperties.java index 2e61caf9e..e81d10fc3 100644 --- a/logicaldoc-util/src/main/java/com/logicaldoc/util/config/OrderedProperties.java +++ b/logicaldoc-util/src/main/java/com/logicaldoc/util/config/OrderedProperties.java @@ -34,6 +34,7 @@ public synchronized Enumeration keys() { * @param header a textual header for the top of the file * @exception IOException when things go wrong */ + @Override public void store(OutputStream out, String header) throws IOException { List keys = getKeys(); diff --git a/logicaldoc-util/src/main/java/com/logicaldoc/util/exec/Worker.java b/logicaldoc-util/src/main/java/com/logicaldoc/util/exec/Worker.java index cc1a32d81..0f2b9bb0d 100644 --- a/logicaldoc-util/src/main/java/com/logicaldoc/util/exec/Worker.java +++ b/logicaldoc-util/src/main/java/com/logicaldoc/util/exec/Worker.java @@ -15,6 +15,7 @@ public Worker(Process process) { this.process = process; } + @Override public void run() { try { exit = process.waitFor(); diff --git a/logicaldoc-util/src/main/java/com/logicaldoc/util/http/FileBodyCounter.java b/logicaldoc-util/src/main/java/com/logicaldoc/util/http/FileBodyCounter.java index 8ecea42a7..7a61df643 100644 --- a/logicaldoc-util/src/main/java/com/logicaldoc/util/http/FileBodyCounter.java +++ b/logicaldoc-util/src/main/java/com/logicaldoc/util/http/FileBodyCounter.java @@ -38,6 +38,7 @@ public void writeTo(OutputStream out) throws IOException { super.writeTo(new FilterOutputStream(out) { // Other write() methods omitted for brevity. // Implement for better performance + @Override public void write(int b) throws IOException { byteCount++; super.write(b); diff --git a/logicaldoc-util/src/main/java/com/logicaldoc/util/io/AutoDeleteInputStream.java b/logicaldoc-util/src/main/java/com/logicaldoc/util/io/AutoDeleteInputStream.java index a55ef0db7..c22d20102 100644 --- a/logicaldoc-util/src/main/java/com/logicaldoc/util/io/AutoDeleteInputStream.java +++ b/logicaldoc-util/src/main/java/com/logicaldoc/util/io/AutoDeleteInputStream.java @@ -37,44 +37,54 @@ public int hashCode() { return wrappedStream.hashCode(); } + @Override public int read(byte[] b) throws IOException { return wrappedStream.read(b); } + @Override public boolean equals(Object obj) { return wrappedStream.equals(obj); } + @Override public int read(byte[] b, int off, int len) throws IOException { return wrappedStream.read(b, off, len); } + @Override public long skip(long n) throws IOException { return wrappedStream.skip(n); } + @Override public String toString() { return wrappedStream.toString(); } + @Override public int available() throws IOException { return wrappedStream.available(); } + @Override public void close() throws IOException { wrappedStream.close(); if (file != null) FileUtil.strongDelete(file); } + @Override public synchronized void mark(int readlimit) { wrappedStream.mark(readlimit); } + @Override public synchronized void reset() throws IOException { wrappedStream.reset(); } + @Override public boolean markSupported() { return wrappedStream.markSupported(); } diff --git a/logicaldoc-util/src/main/java/com/logicaldoc/util/io/AutoDeleteZipInputStream.java b/logicaldoc-util/src/main/java/com/logicaldoc/util/io/AutoDeleteZipInputStream.java index 693b13394..f57585693 100644 --- a/logicaldoc-util/src/main/java/com/logicaldoc/util/io/AutoDeleteZipInputStream.java +++ b/logicaldoc-util/src/main/java/com/logicaldoc/util/io/AutoDeleteZipInputStream.java @@ -18,6 +18,7 @@ public AutoDeleteZipInputStream(net.lingala.zip4j.io.inputstream.ZipInputStream this.zipFile = zipFile; } + @Override public void close() throws IOException { wrapped.close(); if (zipFile != null) diff --git a/logicaldoc-util/src/main/java/com/logicaldoc/util/io/StringOutputStream.java b/logicaldoc-util/src/main/java/com/logicaldoc/util/io/StringOutputStream.java index 099f1379b..93469c420 100644 --- a/logicaldoc-util/src/main/java/com/logicaldoc/util/io/StringOutputStream.java +++ b/logicaldoc-util/src/main/java/com/logicaldoc/util/io/StringOutputStream.java @@ -20,14 +20,17 @@ public StringOutputStream(StringBuilder sb) { this.sb = sb; } + @Override public void close() throws IOException { sb = new StringBuilder(); } + @Override public void flush() throws IOException { // Nothing to do } + @Override public void write(byte[] b) throws IOException { sb.append(new String(b)); } @@ -36,6 +39,7 @@ public void write(byte b) throws IOException { sb.append((char) b); } + @Override public void write(int i) throws IOException { sb.append((char) i); } diff --git a/logicaldoc-util/src/main/java/com/logicaldoc/util/io/ZipInputStream.java b/logicaldoc-util/src/main/java/com/logicaldoc/util/io/ZipInputStream.java index 4b91396fb..9be52b282 100644 --- a/logicaldoc-util/src/main/java/com/logicaldoc/util/io/ZipInputStream.java +++ b/logicaldoc-util/src/main/java/com/logicaldoc/util/io/ZipInputStream.java @@ -18,18 +18,22 @@ public ZipInputStream(net.lingala.zip4j.io.inputstream.ZipInputStream wrapped) { this.wrapped = wrapped; } + @Override public int available() throws IOException { return wrapped.available(); } + @Override public void close() throws IOException { wrapped.close(); } + @Override public int hashCode() { return wrapped.hashCode(); } + @Override public boolean equals(Object obj) { return wrapped.equals(obj); } @@ -39,18 +43,22 @@ public synchronized void mark(int readlimit) { wrapped.mark(readlimit); } + @Override public boolean markSupported() { return wrapped.markSupported(); } + @Override public int read() throws IOException { return wrapped.read(); } + @Override public int read(byte[] b, int off, int len) throws IOException { return wrapped.read(b, off, len); } + @Override public int read(byte[] b) throws IOException { return wrapped.read(b); } @@ -60,10 +68,12 @@ public synchronized void reset() throws IOException { wrapped.reset(); } + @Override public long skip(long n) throws IOException { return wrapped.skip(n); } + @Override public String toString() { return wrapped.toString(); } diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/AvatarServlet.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/AvatarServlet.java index 47ddfcdd4..00c5c29ec 100644 --- a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/AvatarServlet.java +++ b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/AvatarServlet.java @@ -52,6 +52,7 @@ public AvatarServlet() { * @throws ServletException if an error occurred * @throws IOException if an error occurred */ + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { try { String id = request.getParameter(USER_ID); diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/DisplayServlet.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/DisplayServlet.java index d4e3bae6c..5617cf19e 100644 --- a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/DisplayServlet.java +++ b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/DisplayServlet.java @@ -45,6 +45,7 @@ public DisplayServlet() { /** * Redirects the request to the proper frontend URL */ + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) { String docId = request.getParameter(DOC_ID); String folderId = request.getParameter(FOLDER_ID); diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/DownloadAttachmentServlet.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/DownloadAttachmentServlet.java index 397b9011f..d93edd189 100644 --- a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/DownloadAttachmentServlet.java +++ b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/DownloadAttachmentServlet.java @@ -52,6 +52,7 @@ public class DownloadAttachmentServlet extends HttpServlet { * @param request the request send by the client to the server * @param response the response send by the server to the client */ + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) { try { Session session = ServletUtil.validateSession(request); diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/DownloadServlet.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/DownloadServlet.java index 7dd788de3..c880b9618 100644 --- a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/DownloadServlet.java +++ b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/DownloadServlet.java @@ -50,6 +50,7 @@ public class DownloadServlet extends HttpServlet { * @param request the request send by the client to the server * @param response the response send by the server to the client */ + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) { try { Session session = ServletUtil.validateSession(request); diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/ExportZip.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/ExportZip.java index 63b983540..6226122f3 100644 --- a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/ExportZip.java +++ b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/ExportZip.java @@ -47,6 +47,7 @@ public ExportZip() { super(); } + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { try { Session session = ServletUtil.validateSession(request); @@ -164,6 +165,7 @@ private String getLevel(HttpServletRequest request) { * @throws ServletException if an error occurred * @throws IOException if an error occurred */ + @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { try { response.setContentType("text/html"); diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/LogDownload.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/LogDownload.java index 5ec5f01a1..917610ad6 100644 --- a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/LogDownload.java +++ b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/LogDownload.java @@ -44,6 +44,7 @@ public class LogDownload extends HttpServlet { protected static Logger log = LoggerFactory.getLogger(LogDownload.class); + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { try { ServletUtil.checkMenu(request, Menu.LOGS); @@ -112,9 +113,10 @@ private void downloadLogFile(HttpServletResponse response, String appender, File * Prepare all the support resources in one single zip: all the logs, the * context.properties, the snapshot of the env variables. * - * @throws IOException error creting a temporary file + * @throws IOException error creting a temporary file */ - private File prepareAllSupportResources(HttpServletRequest request, HttpServletResponse response) throws IOException { + private File prepareAllSupportResources(HttpServletRequest request, HttpServletResponse response) + throws IOException { File tmp = FileUtil.createTempFile("logs", ".zip"); try (ZipOutputStream out = new ZipOutputStream(new FileOutputStream(tmp));) { @@ -181,14 +183,13 @@ private void writeTomcatLogs(ZipOutputStream out, File webappDescriptor) throws File logsDir = new File(webappDescriptor.getPath() + "/logs"); File[] files = logsDir.listFiles(); for (File file : files) { - if (file.isDirectory() || (!file.getName().toLowerCase().endsWith(".log") - && !file.getName().toLowerCase().endsWith(".out") - && !file.getName().toLowerCase().endsWith(".txt"))) + if (file.isDirectory() + || (!file.getName().toLowerCase().endsWith(".log") && !file.getName().toLowerCase().endsWith(".out") + && !file.getName().toLowerCase().endsWith(".txt"))) continue; // store just the logs of today - if (file.getName().toLowerCase().endsWith(".out") - || file.getName().toLowerCase().endsWith(today + ".log") + if (file.getName().toLowerCase().endsWith(".out") || file.getName().toLowerCase().endsWith(today + ".log") || file.getName().toLowerCase().endsWith(today + ".txt")) writeEntry(out, "tomcat/" + file.getName(), file); } @@ -229,6 +230,7 @@ public void writeEntry(ZipOutputStream out, String entry, File file) throws File } } + @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { try { doGet(request, response); diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/PswRecovery.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/PswRecovery.java index 342890ea9..b9b812c4d 100644 --- a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/PswRecovery.java +++ b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/PswRecovery.java @@ -61,6 +61,7 @@ public PswRecovery() { * @throws ServletException if an error occurred * @throws IOException if an error occurred */ + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { try { HttpSession session = request.getSession(); @@ -164,6 +165,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro * @throws ServletException if an error occurred * @throws IOException if an error occurred */ + @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { try { response.setContentType("text/html"); diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/ThumbnailServlet.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/ThumbnailServlet.java index ec30613d0..079784c38 100644 --- a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/ThumbnailServlet.java +++ b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/ThumbnailServlet.java @@ -64,6 +64,7 @@ public ThumbnailServlet() { * @param request the request send by the client to the server * @param response the response send by the server to the client */ + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) { String suffix = request.getParameter(SUFFIX); diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/stat/StatChartServlet.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/stat/StatChartServlet.java index 4704814d9..a199963dd 100644 --- a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/stat/StatChartServlet.java +++ b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/stat/StatChartServlet.java @@ -38,6 +38,7 @@ public class StatChartServlet extends HttpServlet { protected static Logger log = LoggerFactory.getLogger(StatChartServlet.class); + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) { File chartFile = null; diff --git a/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/context/ExportContextImpl.java b/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/context/ExportContextImpl.java index c89637f1a..fdc350f2d 100644 --- a/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/context/ExportContextImpl.java +++ b/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/context/ExportContextImpl.java @@ -106,6 +106,7 @@ public void setProperty(Object propertyName, Object propertyValue) { } @SuppressWarnings("rawtypes") + @Override public void informCompleted(boolean success) { checkCompleted(); completed = true; diff --git a/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/resource/DeltaVResourceImpl.java b/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/resource/DeltaVResourceImpl.java index 2bcc61738..7c3462583 100644 --- a/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/resource/DeltaVResourceImpl.java +++ b/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/resource/DeltaVResourceImpl.java @@ -63,6 +63,7 @@ public DeltaVResourceImpl(DavResourceLocator locator, DavResourceFactory factory initSupportedReports(); } + @Override public String getComplianceClass() { return DavCompliance.concatComplianceClasses(new String[] { DavCompliance._1_, DavCompliance.VERSION_CONTROL, DavCompliance.VERSION_HISTORY, DavCompliance.LABEL }); @@ -149,6 +150,7 @@ protected void initSupportedReports() { } } + @Override protected void initProperties() { if (!propsInitialized) { super.initProperties(); diff --git a/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/resource/VersionControlledResourceImpl.java b/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/resource/VersionControlledResourceImpl.java index d0668828a..ea8303a21 100644 --- a/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/resource/VersionControlledResourceImpl.java +++ b/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/resource/VersionControlledResourceImpl.java @@ -92,6 +92,7 @@ public VersionControlledResourceImpl(DavResourceLocator locator, DavResourceFact * * @see org.apache.jackrabbit.webdav.DavResource#getSupportedMethods() */ + @Override public String getSupportedMethods() { StringBuilder sb = new StringBuilder(super.getSupportedMethods()); // Versioning support @@ -249,6 +250,7 @@ public VersionHistoryResource getVersionHistory() throws DavException { * @see SupportedReportSetProperty * @see DeltaVResourceImpl#initSupportedReports() */ + @Override protected void initSupportedReports() { super.initSupportedReports(); if (exists()) { @@ -263,6 +265,7 @@ protected void initSupportedReports() { * * @see DavResourceImpl#initProperties() */ + @Override protected void initProperties() { if (!propsInitialized) { @@ -327,6 +330,7 @@ protected DavResourceLocator getLocatorFromResource(Resource resource) { * @throws org.apache.jackrabbit.webdav.DavException error in the DAV * communication */ + @Override protected DavResource createResourceFromLocator(DavResourceLocator loc) throws DavException { DavResource res = getFactory().createResource(loc, getSession()); return res; diff --git a/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/version/VersionHistoryResourceImpl.java b/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/version/VersionHistoryResourceImpl.java index 20f810659..ebc522e26 100644 --- a/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/version/VersionHistoryResourceImpl.java +++ b/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/version/VersionHistoryResourceImpl.java @@ -42,36 +42,44 @@ public VersionHistoryResourceImpl(DavResourceLocator locator, DavResourceFactory super(locator, factory, session, config, resource); } + @Override public DavResourceIterator getMembers() { return new DavResourceIteratorImpl(new ArrayList<>()); } + @Override public void addMember(DavResource member, InputContext inputContext) throws DavException { throw new DavException(HttpServletResponse.SC_FORBIDDEN); } + @Override public void removeMember(DavResource member) throws DavException { throw new UnsupportedOperationException(); } + @Override public void setProperty(DavProperty property) throws DavException { throw new DavException(HttpServletResponse.SC_FORBIDDEN); } + @Override public void removeProperty(DavPropertyName propertyName) throws DavException { throw new DavException(HttpServletResponse.SC_FORBIDDEN); } + @Override public MultiStatusResponse alterProperties(DavPropertySet setProperties, DavPropertyNameSet removePropertyNames) throws DavException { throw new DavException(HttpServletResponse.SC_FORBIDDEN); } @SuppressWarnings("rawtypes") + @Override public MultiStatusResponse alterProperties(List changeList) throws DavException { throw new DavException(HttpServletResponse.SC_FORBIDDEN); } + @Override public VersionResource[] getVersions() throws DavException { List resourceVersions = resourceService.getHistory(resource); @@ -88,6 +96,7 @@ public VersionResource[] getVersions() throws DavException { } + @Override protected void initProperties() { if (!propsInitialized) { super.initProperties(); diff --git a/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/version/VersionResourceImpl.java b/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/version/VersionResourceImpl.java index 09569d0ad..378804006 100644 --- a/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/version/VersionResourceImpl.java +++ b/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/version/VersionResourceImpl.java @@ -52,49 +52,59 @@ public VersionResourceImpl(DavResourceLocator locator, DavResourceFactory factor } + @Override public DavResourceIterator getMembers() { return new DavResourceIteratorImpl(Collections.emptyList()); } + @Override public void addMember(DavResource member, InputContext inputContext) throws DavException { throw new DavException(HttpServletResponse.SC_FORBIDDEN); } + @Override public void removeMember(DavResource member) throws DavException { throw new DavException(HttpServletResponse.SC_FORBIDDEN); } + @Override public void setProperty(DavProperty property) throws DavException { throw new DavException(HttpServletResponse.SC_FORBIDDEN); } + @Override public void removeProperty(DavPropertyName propertyName) throws DavException { throw new DavException(HttpServletResponse.SC_FORBIDDEN); } + @Override public MultiStatusResponse alterProperties(DavPropertySet setProperties, DavPropertyNameSet removePropertyNames) throws DavException { throw new DavException(HttpServletResponse.SC_FORBIDDEN); } @SuppressWarnings("rawtypes") + @Override public MultiStatusResponse alterProperties(List changeList) throws DavException { throw new DavException(HttpServletResponse.SC_FORBIDDEN); } + @Override public void label(LabelInfo labelInfo) throws DavException { // Nothing to do } + @Override public VersionHistoryResource getVersionHistory() throws DavException { return null; } - @SuppressWarnings("unused") + @SuppressWarnings("unused")s private VersionHistory getVersionHistoryItem() throws RepositoryException { return null; } + @Override protected void initSupportedReports() { super.initSupportedReports(); if (exists()) { @@ -102,6 +112,7 @@ protected void initSupportedReports() { } } + @Override protected void initProperties() { if (!propsInitialized) { @@ -139,4 +150,4 @@ public String getSupportedMethods() { return sb.toString(); } -} +} \ No newline at end of file diff --git a/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/web/WebdavServlet.java b/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/web/WebdavServlet.java index 068af41b0..e12a8d9a2 100644 --- a/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/web/WebdavServlet.java +++ b/logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/web/WebdavServlet.java @@ -50,6 +50,7 @@ public class WebdavServlet extends AbstractWebdavServlet { private static ResourceConfig config; + @Override public void init() { String resourcePathPrefix = getInitParameter(INIT_PARAM_RESOURCE_PATH_PREFIX); if (resourcePathPrefix == null) { @@ -123,6 +124,7 @@ public ResourceConfig getResourceConfig() { return config; } + @Override public void service(HttpServletRequest request, HttpServletResponse response) { ContextProperties settings = Context.get().getProperties(); diff --git a/logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/WebserviceChartServlet.java b/logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/WebserviceChartServlet.java index 711044102..51b5ee4de 100644 --- a/logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/WebserviceChartServlet.java +++ b/logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/WebserviceChartServlet.java @@ -64,6 +64,7 @@ public WebserviceChartServlet() { * @throws ServletException if an error occurred * @throws IOException if an error occurred */ + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { File chartFile = null; try { @@ -86,7 +87,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro tenantId = Long.parseLong(request.getParameter("tenantId")); chartFile = FileUtil.createTempFile("chart", ".png"); - + /** * Retrieve the sequences and order them by date */ @@ -100,8 +101,8 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro cal.add(Calendar.MONTH, -i); String month = dfNumber.format(cal.getTime()); String monthName = dfName.format(cal.getTime()); - dataset.addValue(dao.getCurrentValue(WebserviceInterceptor.WSCALL_HYPHEN + month, 0L, tenantId), "calls", - monthName); + dataset.addValue(dao.getCurrentValue(WebserviceInterceptor.WSCALL_HYPHEN + month, 0L, tenantId), + "calls", monthName); } JFreeChart chart = ChartFactory.createBarChart("", null, null, dataset, PlotOrientation.VERTICAL, false, diff --git a/logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/WebserviceServlet.java b/logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/WebserviceServlet.java index c2c75eee3..0defe7826 100644 --- a/logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/WebserviceServlet.java +++ b/logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/WebserviceServlet.java @@ -19,6 +19,7 @@ public class WebserviceServlet extends CXFServlet { private static final long serialVersionUID = 1L; + @Override public void service(HttpServletRequest request, HttpServletResponse response) { try { // Check if the service is enabled diff --git a/logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/rest/endpoint/RestAuthService.java b/logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/rest/endpoint/RestAuthService.java index 83322d4dd..d9f774849 100644 --- a/logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/rest/endpoint/RestAuthService.java +++ b/logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/rest/endpoint/RestAuthService.java @@ -32,6 +32,7 @@ public class RestAuthService extends SoapAuthService implements AuthService { private static Logger log = LoggerFactory.getLogger(RestAuthService.class); @Context + @Override public void setMessageContext(MessageContext messageContext) { // https://docs.oracle.com/cd/E13222_01/wls/docs92/webserv/annotations.html // https://jersey.java.net/documentation/latest/jaxrs-resources.html#d0e2790 @@ -41,6 +42,7 @@ public void setMessageContext(MessageContext messageContext) { @GET @Path("/login") + @Override public String login(@QueryParam("u") String username, @QueryParam("pw") String password) throws AuthenticationException { return super.login(username, password); } @@ -49,6 +51,7 @@ public String login(@QueryParam("u") String username, @QueryParam("pw") String p @Path("/loginForm") @Operation(operationId = "loginForm", summary = "Login with POST", description = "Login with the credentials in a form POST") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) + @Override public String loginForm(@FormParam("username") String username, @FormParam("password") String password) { return super.login(username, password); } @@ -56,13 +59,15 @@ public String loginForm(@FormParam("username") String username, @FormParam("pass @POST @Path("/login") @Operation(operationId = "loginPostJSON", summary = "Login with POST in JSON format", description = "Login posting the credentials in JSON format") - @Consumes(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @Override public String loginPostJSON(WSCredentials cred) { return super.login(cred.getUsername(), cred.getPassword()); } @DELETE @Path("/logout") + @Override public void logout(@QueryParam("sid") String sid) { log.debug("logout({})", sid); if (sid != null) @@ -72,6 +77,7 @@ public void logout(@QueryParam("sid") String sid) { @GET @Path("/getSid") @Produces({ MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN }) + @Override public String getSid() { return getCurrentSessionId(); } @@ -83,6 +89,7 @@ public String getSid() { */ @GET @Path("/renew") + @Override public void renew(@QueryParam("sid") String sid) { super.renew(sid); }