removed code smells

car031 · car031 · commit a3708cfdf00c · 2025-02-19T10:03:59.000+01:00
diff --git a/logicaldoc-android/pom.xml b/logicaldoc-android/pom.xml
@@ -45,13 +45,6 @@
 			<type>jar</type>
 			<scope>provided</scope>
 		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>com.logicaldoc</groupId>-->
-<!--			<artifactId>logicaldoc-i18n</artifactId>-->
-<!--			<version>${project.version}</version>-->
-<!--			<type>jar</type>-->
-<!--			<scope>provided</scope>-->
-<!--		</dependency>-->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
diff --git a/logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/CmisPlugin.java b/logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/CmisPlugin.java
@@ -5,8 +5,6 @@
 
 import org.apache.chemistry.opencmis.server.impl.CmisRepositoryContextListener;
 import org.apache.chemistry.opencmis.server.shared.BasicAuthCallContextHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.logicaldoc.util.config.ContextProperties;
 import com.logicaldoc.util.config.WebConfigurator;
@@ -20,8 +18,6 @@
  * @since 6.5.1
  */
 public class CmisPlugin extends LogicalDOCPlugin {
-	
-	private static final Logger log = LoggerFactory.getLogger(CmisPlugin.class);
 
 	private static final String SERVLET_NAME = "Cmis";
 
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/automation/Automation.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/automation/Automation.java
@@ -303,7 +303,7 @@ private void evaluate(String expression, Map<String, Object> clientDictionary, W
 		try {
 			// Better to use a mutable shallow copy because we may receive an
 			// unmodifiable client dictionary
-			Map<String, Object> shallowCopy = new HashMap<String, Object>(clientDictionary);
+			Map<String, Object> shallowCopy = new HashMap<>(clientDictionary);
 			VelocityContext context = prepareContext(prepareDictionary(shallowCopy));
 			Velocity.evaluate(context, writer, StringUtils.isNotEmpty(logTag) ? logTag : "ScriptEngine", expression);
 		} catch (Exception e) {
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/CatchAllParser.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/parser/CatchAllParser.java
@@ -1,7 +1,5 @@
 package com.logicaldoc.core.parser;
 
-import static com.logicaldoc.core.parser.AbstractParser.log;
-
 import java.io.File;
 import java.io.InputStream;
 
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/searchengine/FulltextSearch.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/searchengine/FulltextSearch.java
@@ -1,7 +1,5 @@
 package com.logicaldoc.core.searchengine;
 
-import static com.logicaldoc.core.searchengine.Search.log;
-
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/settings/StoresPanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/settings/StoresPanel.java
@@ -23,7 +23,6 @@
 import com.smartgwt.client.util.SC;
 import com.smartgwt.client.widgets.Canvas;
 import com.smartgwt.client.widgets.form.fields.SelectItem;
-import com.smartgwt.client.widgets.grid.CellFormatter;
 import com.smartgwt.client.widgets.grid.ListGrid;
 import com.smartgwt.client.widgets.grid.ListGridField;
 import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -140,17 +139,13 @@ protected Canvas getExpansionComponent(final ListGridRecord rec) {
 		ListGridField write = new ListGridField(WRITE, " ", 30);
 		write.setCanSort(false);
 		write.setCanFilter(false);
-		write.setCellFormatter(new CellFormatter() {
-
-			@Override
-			public String format(Object value, ListGridRecord rec, int rowNum, int colNum) {
-				String content = "";
-				if (Boolean.TRUE.equals(rec.getAttributeAsBoolean(WRITE))) {
-					content = "<div style='display: flex; text-align: center; justify-content: center;'>"
-							+ AwesomeFactory.getIconButtonHTML("database", null, "default", null, null) + "</div>";
-				}
-				return content;
+		write.setCellFormatter((value, rec, rowNum, colNum) -> {
+			String content = "";
+			if (Boolean.TRUE.equals(rec.getAttributeAsBoolean(WRITE))) {
+				content = "<div style='display: flex; text-align: center; justify-content: center;'>"
+						+ AwesomeFactory.getIconButtonHTML("database", null, "default", null, null) + "</div>";
 			}
+			return content;
 		});
 
 		storesGrid.setFields(id, write, name, type, path);
@@ -350,7 +345,7 @@ private List<GUIParameter> collectSettings() {
 						new GUIParameter(STORE + storeId + ".dir", storeRecord.getAttributeAsString("path").trim()));
 				settings.add(
 						new GUIParameter(STORE + storeId + ".type", storeRecord.getAttributeAsString("type").trim()));
-				if (storeRecord.getAttributeAsBoolean(WRITE)) {
+				if (Boolean.TRUE.equals(storeRecord.getAttributeAsBoolean(WRITE))) {
 					settings.add(new GUIParameter("store.write", storeId));
 				}
 
diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/settings/protocols/ProtocolsPanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/settings/protocols/ProtocolsPanel.java
@@ -5,8 +5,8 @@
 import java.util.Map;
 
 import com.google.gwt.core.client.GWT;
-import com.logicaldoc.gui.common.client.Feature;
 import com.logicaldoc.gui.common.client.DefaultAsyncCallback;
+import com.logicaldoc.gui.common.client.Feature;
 import com.logicaldoc.gui.common.client.Session;
 import com.logicaldoc.gui.common.client.beans.GUIParameter;
 import com.logicaldoc.gui.common.client.i18n.I18N;
@@ -18,7 +18,6 @@
 import com.smartgwt.client.types.TitleOrientation;
 import com.smartgwt.client.util.SC;
 import com.smartgwt.client.widgets.IButton;
-import com.smartgwt.client.widgets.events.ClickEvent;
 import com.smartgwt.client.widgets.form.DynamicForm;
 import com.smartgwt.client.widgets.form.ValuesManager;
 import com.smartgwt.client.widgets.form.fields.IntegerItem;
@@ -50,6 +49,8 @@ public class ProtocolsPanel extends AdminPanel {
 
 	private GUIParameter wdDepth = null;
 
+	private GUIParameter wdCache = null;
+
 	private GUIParameter ftpEnabled = null;
 
 	private GUIParameter ftpPort = null;
@@ -163,8 +164,13 @@ private void init(List<GUIParameter> settings) {
 		wdDepthItem.setMin(0);
 		wdDepthItem.setMax(Integer.MAX_VALUE);
 
+		// Cache status
+		ToggleItem wdCacheItem = ItemFactory.newToggleItem("wdCache", "usecache", Boolean.valueOf(wdCache.getValue()));
+		wdCacheItem.setRequired(true);
+		wdCacheItem.setDisabled(!Session.get().isDefaultTenant());
+
 		if (Session.get().isDefaultTenant())
-			webDavForm.setItems(wdUrl, wdbUrl, wdEnabledItem, wdDepthItem);
+			webDavForm.setItems(wdUrl, wdbUrl, wdEnabledItem, wdDepthItem, wdCacheItem);
 		else
 			webDavForm.setItems(wdUrl, wdbUrl, wdEnabledItem);
 		webDav.setPane(webDavForm);
@@ -246,7 +252,7 @@ private void init(List<GUIParameter> settings) {
 	private void addSaveButton() {
 		IButton save = new IButton();
 		save.setTitle(I18N.message("save"));
-		save.addClickHandler((ClickEvent event) -> onSave());
+		save.addClickHandler(click -> onSave());
 
 		addMember(save);
 		if (Session.get().isDemo()) {
@@ -267,14 +273,12 @@ private void onSave() {
 			webservicesPanel.save();
 
 			ProtocolsPanel.this.cmisEnabled.setValue(values.get("cmisEnabled").toString());
-
 			ProtocolsPanel.this.cmisChangelog.setValue(values.get("cmisChangelog").toString());
-
 			ProtocolsPanel.this.cmisMaxItems.setValue(values.get("cmisMaxItems").toString());
 
 			ProtocolsPanel.this.wdEnabled.setValue(values.get("wdEnabled").toString());
-
 			ProtocolsPanel.this.wdDepth.setValue(values.get("wdDepth").toString());
+			ProtocolsPanel.this.wdCache.setValue(values.get("wdCache").toString());
 
 			ProtocolsPanel.this.ftpEnabled.setValue(values.get("ftpEnabled").toString());
 			ProtocolsPanel.this.ftpPort.setValue(values.get("ftpPort").toString());
@@ -289,9 +293,12 @@ private void onSave() {
 		params.addAll(webservicesPanel.getSettings());
 		params.add(ProtocolsPanel.this.wdEnabled);
 		params.add(ProtocolsPanel.this.wdDepth);
+		params.add(ProtocolsPanel.this.wdCache);
+
 		params.add(ProtocolsPanel.this.cmisEnabled);
 		params.add(ProtocolsPanel.this.cmisChangelog);
 		params.add(ProtocolsPanel.this.cmisMaxItems);
+
 		params.add(ProtocolsPanel.this.ftpEnabled);
 		params.add(ProtocolsPanel.this.ftpPort);
 		params.add(ProtocolsPanel.this.ftpSsl);
@@ -345,6 +352,8 @@ else if (parameter.getName().equals("webdav.enabled"))
 				wdEnabled = parameter;
 			else if (parameter.getName().equals("webdav.depth"))
 				wdDepth = parameter;
+			else if (parameter.getName().equals("webdav.cache.enabled"))
+				wdCache = parameter;
 			else if (parameter.getName().equals("ftp.enabled"))
 				ftpEnabled = parameter;
 			else if (parameter.getName().equals("ftp.port"))
@@ -361,7 +370,7 @@ else if (parameter.getName().equals("ftp.keystore.password"))
 				ftpKeystorePassword = parameter;
 		}
 	}
-	
+
 	@Override
 	public boolean equals(Object other) {
 		return super.equals(other);
diff --git a/logicaldoc-util/src/main/java/com/logicaldoc/util/http/BaseHttpClientResponseHandler.java b/logicaldoc-util/src/main/java/com/logicaldoc/util/http/BaseHttpClientResponseHandler.java
@@ -8,8 +8,6 @@
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.ParseException;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * An extension of the standard HttpClientReponseHandler with utility methods
@@ -21,8 +19,6 @@
  */
 public abstract class BaseHttpClientResponseHandler<T> extends AbstractHttpClientResponseHandler<T> {
 
-	private static final Logger log = LoggerFactory.getLogger(BaseHttpClientResponseHandler.class);
-
 	private static final String UTF_8 = "UTF-8";
 
 	public static String getResponseBody(ClassicHttpResponse response) throws IOException {
diff --git a/logicaldoc-util/src/main/java/com/logicaldoc/util/http/FileHttpClientResponseHandler.java b/logicaldoc-util/src/main/java/com/logicaldoc/util/http/FileHttpClientResponseHandler.java
@@ -7,8 +7,6 @@
 import java.io.IOException;
 
 import org.apache.hc.core5.http.HttpEntity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * A HTTP response handler that writes the response into a given file
@@ -18,8 +16,6 @@
  */
 public class FileHttpClientResponseHandler extends BaseHttpClientResponseHandler<String> {
 
-	private static final Logger log = LoggerFactory.getLogger(FileHttpClientResponseHandler.class);
-
 	private File file;
 
 	public FileHttpClientResponseHandler(File file) {
diff --git a/logicaldoc-util/src/main/java/com/logicaldoc/util/http/StreamHttpClientResponseHandler.java b/logicaldoc-util/src/main/java/com/logicaldoc/util/http/StreamHttpClientResponseHandler.java
@@ -5,8 +5,6 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.hc.core5.http.HttpEntity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * A HTTP response handler that writes the response into a given output stream
@@ -16,8 +14,6 @@
  */
 public class StreamHttpClientResponseHandler extends BaseHttpClientResponseHandler<String> {
 
-	private static final Logger log = LoggerFactory.getLogger(StreamHttpClientResponseHandler.class);
-
 	private OutputStream stream;
 
 	public StreamHttpClientResponseHandler(OutputStream stream) {
diff --git a/logicaldoc-util/src/main/java/com/logicaldoc/util/http/StringHttpClientResponseHandler.java b/logicaldoc-util/src/main/java/com/logicaldoc/util/http/StringHttpClientResponseHandler.java
@@ -5,8 +5,6 @@
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.ParseException;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * A HTTP response handler that treats the response as a text content
@@ -17,8 +15,6 @@
  */
 public class StringHttpClientResponseHandler extends BaseHttpClientResponseHandler<String> {
 
-	private static final Logger log = LoggerFactory.getLogger(StringHttpClientResponseHandler.class);
-
 	private static final String UTF_8 = "UTF-8";
 
 	public StringHttpClientResponseHandler() {
diff --git a/logicaldoc-util/src/main/java/com/logicaldoc/util/io/JarUtil.java b/logicaldoc-util/src/main/java/com/logicaldoc/util/io/JarUtil.java
@@ -11,8 +11,6 @@
 import java.util.jar.JarFile;
 
 import org.apache.commons.io.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.logicaldoc.util.Context;
 
@@ -24,8 +22,6 @@
  */
 public class JarUtil {
 
-	private static final Logger log = LoggerFactory.getLogger(JarUtil.class);
-
 	/**
 	 * Maximum number of entries in the compressed archive, config parameter
 	 * zip.maxentires
diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/filter/xss/XssRequestWrapper.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/filter/xss/XssRequestWrapper.java
@@ -6,8 +6,6 @@
 import javax.servlet.http.HttpServletRequestWrapper;
 
 import org.owasp.esapi.ESAPI;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * This wrapper implements the checks for avoiding the Cross Site Scripting
@@ -27,8 +25,6 @@
  */
 public class XssRequestWrapper extends HttpServletRequestWrapper {
 
-	private static final Logger log = LoggerFactory.getLogger(XssRequestWrapper.class);
-
 	public XssRequestWrapper(HttpServletRequest servletRequest) {
 		super(servletRequest);
 	}
diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/service/SettingServiceImpl.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/service/SettingServiceImpl.java
@@ -223,8 +223,8 @@ public List<GUIParameter> loadProtocolSettings() throws ServerException {
 		ContextProperties conf = Context.get().getProperties();
 		List<GUIParameter> params = new ArrayList<>();
 		for (Object key : conf.keySet())
-			if (key.toString().startsWith("webservice.") || key.toString().startsWith("webdav")
-					|| key.toString().startsWith("cmis") || key.toString().startsWith("ftp."))
+			if (key.toString().startsWith("webservice.") || key.toString().startsWith("webdav.")
+					|| key.toString().startsWith("cmis.") || key.toString().startsWith("ftp."))
 				params.add(new GUIParameter(key.toString(), conf.getProperty(key.toString())));
 
 		return params;
diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/service/TemplateServiceImpl.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/service/TemplateServiceImpl.java
@@ -404,7 +404,7 @@ List<GUIAttribute> prepareGUIAttributes(Template template, ExtensibleObject exte
 
 		AttributeSetDAO setDao = Context.get(AttributeSetDAO.class);
 		Map<String, Attribute> attrs = template.getAttributes();
-		if (template == null || attrs == null || attrs.isEmpty())
+		if (attrs == null || attrs.isEmpty())
 			return attributes;
 
 		try {
diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/websockets/WebsocketTool.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/websockets/WebsocketTool.java
@@ -3,8 +3,6 @@
 import java.util.Random;
 
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.logicaldoc.core.automation.AutomationDictionary;
 import com.logicaldoc.core.security.Session;
@@ -20,8 +18,6 @@
 @AutomationDictionary
 public class WebsocketTool {
 
-	private static final Logger log = LoggerFactory.getLogger(WebsocketTool.class);
-
 	protected static final Random random = new Random();
 
 	/**
diff --git a/logicaldoc-webapp/src/main/resources/context.properties b/logicaldoc-webapp/src/main/resources/context.properties
@@ -486,8 +486,9 @@ webservice.call.record.payload = false
 webservice.interceptor = com.logicaldoc.webservice.WebserviceInterceptor
 webservice.basicauth.enabled = true
 
-webdav.enabled=true
-webdav.depth=1
+webdav.enabled = true
+webdav.depth = 1
+webdav.cache.enabled = false
 
 proxy.host=
 proxy.password=
diff --git a/logicaldoc-webdav/src/test/java/com/logicaldoc/webdav/cache/WDCacheTest.java b/logicaldoc-webdav/src/test/java/com/logicaldoc/webdav/cache/WDCacheTest.java
