save single cell value in converters settings

Author: car031

logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateDocumentDAO.java

@@ -307,12 +307,7 @@ public void store(Document doc, final DocumentHistory transaction) throws Persis
 			/*
 			 * Check maximum number of documents per folder
 			 */
-			long maxDocsPerFolder = config.getLong("maxdocsperfolder", -1L);
-			if (doc.getId() == 0L && maxDocsPerFolder > 0) {
-				long count = folderDAO.countDocs(doc.getFolder().getId());
-				if (count >= maxDocsPerFolder)
-					throw new TooManyDocumentsException(doc.getFolder(), maxDocsPerFolder);
-			}
+			checkMaxDocsPerFolder(doc);
 
 			log.debug("Invoke listeners before store");
 			Map<String, Object> dictionary = new HashMap<>();
@@ -357,6 +352,15 @@ public void store(Document doc, final DocumentHistory transaction) throws Persis
 		}
 	}
 
+	private void checkMaxDocsPerFolder(Document document) throws PersistenceException {
+		long maxDocsPerFolder = config.getLong("maxdocsperfolder", -1L);
+		if (document.getId() == 0L && maxDocsPerFolder > 0) {
+			long count = folderDAO.countDocs(document.getFolder().getId());
+			if (count >= maxDocsPerFolder)
+				throw new TooManyDocumentsException(document.getFolder(), maxDocsPerFolder);
+		}
+	}
+
 	private void setType(Document doc) {
 		if (StringUtils.isEmpty(doc.getType()) && doc.getFileName().contains("."))
 			doc.setType(FileUtil.getExtension(doc.getFileName()).toLowerCase());

logicaldoc-core/src/main/java/com/logicaldoc/core/folder/FolderDAO.java

@@ -448,8 +448,10 @@ public Folder create(Folder parent, Folder folderVO, boolean inheritSecurity, Fo
 	 * @param tenantId The tenant
 	 * 
 	 * @return Collection of aliases
+	 * 
+	 * @throws PersistenceException error at data layer
 	 */
-	public List<Folder> findAliases(Long foldRef, long tenantId);
+	public List<Folder> findAliases(Long foldRef, long tenantId) throws PersistenceException;
 
 	/**
 	 * Creates the folder for the specified path. All unexisting nodes specified
@@ -636,8 +638,10 @@ public Folder copy(Folder source, Folder target, String newName, boolean folders
 	 * @param maxHits Optional defines the max number of returned hits
 	 * 
 	 * @return The folders list
+	 * 
+	 * @throws PersistenceException error at data layer
 	 */
-	public List<Folder> findDeleted(long userId, Integer maxHits);
+	public List<Folder> findDeleted(long userId, Integer maxHits) throws PersistenceException;
 
 	/**
 	 * Checks if a folder with the given folderId is parent of the folder with
@@ -732,8 +736,10 @@ public void updateSecurityRef(long folderId, long rightsFolderId, FolderHistory
 	 * @param computeDeleted if the deleted folders have to be taken int account
 	 * 
 	 * @return the number of folders
+	 * 
+	 * @throws PersistenceException error at data layer
 	 */
-	public int count(boolean computeDeleted);
+	public int count(boolean computeDeleted) throws PersistenceException;
 
 	/**
 	 * Retrieves all the workspaces in the system, that are the first-level
@@ -772,17 +778,21 @@ public void updateSecurityRef(long folderId, long rightsFolderId, FolderHistory
 	 * @param rootId identifier of the root folder
 	 * 
 	 * @return the number of documents contained in the tree
+	 * 
+	 * @throws PersistenceException error at data layer
 	 */
-	public long countDocsInTree(long rootId);
+	public long countDocsInTree(long rootId) throws PersistenceException;
 
 	/**
 	 * Counts the number of documents inside a given folder
 	 * 
 	 * @param folderId identifier of the folder
 	 * 
 	 * @return the number of documents contained in the folder
+	 * 
+	 * @throws PersistenceException error at data layer
 	 */
-	public long countDocs(long folderId);
+	public long countDocs(long folderId) throws PersistenceException;
 
 	/**
 	 * Counts the number of documents inside a given folder's tree (direct and
@@ -792,17 +802,21 @@ public void updateSecurityRef(long folderId, long rightsFolderId, FolderHistory
 	 * 
 	 * @return sum of the sizes of the documents contained in the tree expressed
 	 *         in bytes
+	 * 
+	 * @throws PersistenceException error at data layer
 	 */
-	public long computeTreeSize(long rootId);
+	public long computeTreeSize(long rootId) throws PersistenceException;
 
 	/**
 	 * Retrieves the alphabetically ordered list of all the folder's tags
 	 * 
 	 * @param folderId identifier of the folder
 	 * 
 	 * @return list of tags
+	 * 
+	 * @throws PersistenceException error at data layer
 	 */
-	public List<String> findTags(long folderId);
+	public List<String> findTags(long folderId) throws PersistenceException;
 
 	/**
 	 * Merges the contents of two folders

logicaldoc-core/src/test/java/com/logicaldoc/core/folder/HibernateFolderDAOTest.java

@@ -135,7 +135,7 @@ public void testCreatePath() throws Exception {
 	}
 
 	@Test
-	public void testCount() {
+	public void testCount() throws PersistenceException {
 		int docCount = testSubject.count(false);
 		int docCountDelete = testSubject.count(true);
 		assertEquals(4, docCount);
@@ -189,7 +189,7 @@ public void testCountDocs() throws PersistenceException {
 		long count = testSubject.countDocs(6L);
 		assertEquals(4, count);
 	}
-	
+
 	@Test
 	public void testComputeTreeSize() throws PersistenceException {
 		/*
@@ -774,7 +774,7 @@ public void testFindById() throws PersistenceException {
 	}
 
 	@Test
-	public void testFindDeleted() {
+	public void testFindDeleted() throws PersistenceException {
 		// Try with a folder id
 		List<Folder> folders = testSubject.findDeleted(3, 100);
 		assertEquals(2, folders.size());
@@ -1080,7 +1080,7 @@ public void testFindFolderIdByUserIdInPath() throws PersistenceException {
 	}
 
 	@Test
-	public void testFindTags() {
+	public void testFindTags() throws PersistenceException {
 		List<String> tags = testSubject.findTags(1200);
 		assertEquals(2, tags.size());
 		assertTrue(tags.contains("ftag1"));
@@ -1316,7 +1316,7 @@ public void testUpdateSecurityRef() throws PersistenceException {
 
 		// The root has its own policies
 		testSubject.updateSecurityRef(1200L, 5L, transaction);
-		
+
 		folder = testSubject.findById(1200L);
 		assertEquals(5L, folder.getSecurityRef().longValue());
 		folder = testSubject.findById(1201L);

logicaldoc-core/src/test/java/com/logicaldoc/core/folder/HibernateFolderHistoryDAOTest.java

@@ -120,7 +120,6 @@ public void testCreateFolderHistory() throws PersistenceException {
 		Assert.assertEquals(3, histories.size());
 	}
 
-	@SuppressWarnings("deprecation")
 	@Test
 	public void testStore() throws PersistenceException {
 		FolderHistory history = new FolderHistory();

logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIAttendee.java

@@ -54,8 +54,6 @@ public boolean equals(Object obj) {
 		GUIAttendee other = (GUIAttendee) obj;
 		if (notify != other.notify)
 			return false;
-		if (required != other.required)
-			return false;
-		return true;
+		return required == other.required;
 	}
 }

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/settings/comparators/ComparatorsPanel.java

@@ -31,7 +31,6 @@
 import com.smartgwt.client.widgets.layout.VLayout;
 import com.smartgwt.client.widgets.menu.Menu;
 import com.smartgwt.client.widgets.menu.MenuItem;
-import com.smartgwt.client.widgets.toolbar.ToolStrip;
 import com.smartgwt.client.widgets.toolbar.ToolStripButton;
 
 /**

logicaldoc-webapp/src/main/java/com/logicaldoc/web/data/TagsDataServlet.java

@@ -75,7 +75,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response,
 		writer.write("</list>");
 	}
 
-	private void enrichMapWithFolderTags(Long folderId, HashMap<String, Long> tagsMap, List<String> words) {
+	private void enrichMapWithFolderTags(Long folderId, HashMap<String, Long> tagsMap, List<String> words) throws PersistenceException {
 		FolderDAO fDao = Context.get(FolderDAO.class);
 		if (folderId != null) {
 			List<String> tags = fDao.findTags(folderId);