removed code smells

Author: car031

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/account/ApiKeys.java

@@ -53,13 +53,15 @@ private void initGUI() {
 				keyName -> SecurityService.Instance.get().createApiKey(keyName, new DefaultAsyncCallback<>() {
 					@Override
 					public void onSuccess(String apikey) {
+						list.refresh(new ApiKeysDS());
 						StaticTextItem item = ItemFactory.newStaticTextItem("apikey", "apikey", apikey);
 						item.setIcons(new CopyTextFormItemIcon(apikey, "copytext"));
 						LD.askForValue("saveyourkey", "saveyourkeymessage", apikey, item, value -> {
 							list.refresh(new ApiKeysDS());
 							Util.copyText(apikey);
 							destroy();
 						});
+						
 					}
 				})));
 

logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/WebDAVPlugin.java

@@ -38,7 +38,7 @@ public void install() throws PluginException {
 			ContextProperties pbean = new ContextProperties();
 			pbean.setProperty("webdav.enabled", "true");
 			pbean.setProperty("webdav.depth", "1");
-			pbean.setProperty("webdav.foldersize.enabled", "true");
+			pbean.setProperty("webdav.cache.enabled", "false");
 			pbean.write();
 		} catch (IOException e) {
 			log.error(e.getMessage(), e);

logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/cache/WDCache.java

@@ -0,0 +1,127 @@
+package com.logicaldoc.webdav.cache;
+
+import java.sql.SQLException;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+
+import com.logicaldoc.core.folder.Folder;
+
+/**
+ * A cache for the WebDAV module
+ * 
+ * @author Alessandro Gasparini - LogicalDOC
+ * @since 9.1.1
+ */
+public class WebdavCache {
+
+	private static final Logger log = LoggerFactory.getLogger(WebdavCache.class);
+
+	private DataSource dataSource;
+
+	private JdbcTemplate jdbcTemplate;
+
+	private static WebdavCache myself;
+
+	public WebdavCache() throws SQLException {
+		dataSource = createDataSource();
+		jdbcTemplate = getTemplate(dataSource);
+	}
+
+	public static WebdavCache getInstance() {
+		if (myself == null)
+			try {
+				myself = new WebdavCache();
+			} catch (SQLException e) {
+				log.error(e.getMessage(), e);
+			}
+		return myself;
+	}
+
+	private DataSource createDataSource() {
+		return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL).addScript("classpath:WDCache.sql")
+				.build();
+	}
+
+	private JdbcTemplate getTemplate(DataSource dataSource) {
+		return new JdbcTemplate(dataSource);
+	}
+
+	public int addFolder(WebdavCacheFolder cf) {
+		int result = jdbcTemplate.update("UPDATE mycache SET path = ?, size = ? WHERE ID = ?", cf.getId(), cf.getPath(),
+				cf.getSize());
+		if (result == 0)
+			result = jdbcTemplate.update("INSERT INTO mycache VALUES (?, ?, ?)", cf.getId(), cf.getPath(),
+					cf.getSize());
+		return result;
+	}
+
+	public WebdavCacheFolder getFolder(long id) {
+		String query = "SELECT * FROM mycache WHERE ID = ?";
+		return jdbcTemplate.queryForObject(query, (rowSet, rowNum) -> new WebdavCacheFolder(rowSet.getLong("ID"),
+				rowSet.getString("path"), rowSet.getLong("size")), id);
+	}
+
+	public long getFolderSize(long id) {
+		try {
+			return jdbcTemplate != null
+					? jdbcTemplate.queryForObject("SELECT size FROM mycache WHERE ID = " + id, Long.class)
+					: 0L;
+		} catch (NullPointerException | DataAccessException e) {
+			return 0L;
+		}
+	}
+
+	public long getTreeSize(long id) {
+		try {
+			return jdbcTemplate != null
+					? jdbcTemplate.queryForObject("SELECT SUM(size) FROM mycache WHERE path LIKE '%" + id + "%'",
+							Long.class)
+					: 0L;
+		} catch (NullPointerException | DataAccessException e) {
+			return 0;
+		}
+	}
+
+	public int countElements() {
+		try {
+			return jdbcTemplate != null ? jdbcTemplate.queryForObject("SELECT COUNT(*) FROM mycache", Integer.class)
+					: 0;
+		} catch (NullPointerException | DataAccessException e) {
+			return 0;
+		}
+	}
+
+	public int setFolderPath(Folder folder) {
+		if (folder != null && !StringUtils.isEmpty(folder.getPath())) {
+			int result = jdbcTemplate.update("UPDATE mycache SET path = ? WHERE ID = ?", folder.getPath(),
+					folder.getId());
+			if (result == 0) {
+				result = jdbcTemplate.update("INSERT INTO mycache VALUES (?, ?, ?)", folder.getId(), folder.getPath(),
+						0);
+			}
+			return result;
+		} else {
+			return 0;
+		}
+	}
+
+	public String getFolderPath(long folderID) {
+		try {
+			return jdbcTemplate.queryForObject("SELECT path FROM mycache WHERE ID = " + folderID, String.class);
+		} catch (NullPointerException | DataAccessException e) {
+			return null;
+		}
+	}
+
+	public int truncate() {
+		return jdbcTemplate.update("DELETE FROM mycache");
+	}
+}

logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/cache/WDCacheFolder.java

@@ -0,0 +1,50 @@
+package com.logicaldoc.webdav.cache;
+
+/**
+ * An entry in the webdav cache
+ * 
+ * @author Alessandro Gasparini - LogicalDOC
+ * @since 9.1.1
+ */
+public class WebdavCacheFolder {
+
+	private long id;
+
+	private String path;
+
+	private long size;
+
+	public WebdavCacheFolder() {
+		super();
+	}
+
+	public WebdavCacheFolder(long folderId, String path, long folderSize) {
+		this.id = folderId;
+		this.path = path;
+		this.size = folderSize;
+	}
+
+	public long getId() {
+		return id;
+	}
+
+	public String getPath() {
+		return path;
+	}
+
+	public long getSize() {
+		return size;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public void setPath(String path) {
+		this.path = path;
+	}
+
+	public void setSize(long size) {
+		this.size = size;
+	}
+}

logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/cache/WDCacheFolderMapper.java

@@ -1,8 +1,6 @@
 package com.logicaldoc.webdav.context;
 
 import org.apache.jackrabbit.server.io.IOListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.logicaldoc.webdav.resource.model.Resource;
 
@@ -15,8 +13,6 @@
  */
 public abstract class AbstractExportContext implements ExportContext {
 
-	private static final Logger log = LoggerFactory.getLogger(AbstractExportContext.class);
-
 	private final Resource resource;
 
 	private final boolean hasStream;
@@ -27,7 +23,7 @@ protected AbstractExportContext(Resource resource, boolean hasStream) {
 		this.resource = resource;
 		this.hasStream = hasStream;
 	}
-	
+
 	@Override
 	public IOListener getIOListener() {
 		return null;