Skip to content

Commit a6daa4f

Browse files
car031car031
committed
removed code smells
1 parent 32c89e8 commit a6daa4f

File tree

17 files changed

+165
-74
lines changed

17 files changed

+165
-74
lines changed

‎logicaldoc-core/src/main/java/com/logicaldoc/core/HibernateHistoryDAO.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public abstract class HibernateHistoryDAO<T extends History> extends HibernatePe
2727
private ContextProperties config;
2828

2929
// A cache of tenant names to minimize the DB accesses
30-
private static Map<Long, String> tenantNames = new HashMap<>();
30+
private static final Map<Long, String> tenantNames = new HashMap<>();
3131

3232
protected HibernateHistoryDAO(Class<T> historyClass) {
3333
super(historyClass);
@@ -55,7 +55,7 @@ public void store(T history) throws PersistenceException {
5555
if ("all".equals(allowedEvents) || allowedEvents.contains(history.getEvent()))
5656
super.store(history);
5757

58-
EventCollector.get().newEvent((History) history);
58+
EventCollector.get().newEvent(history);
5959
}
6060

6161
protected String getTenantName(T history) throws PersistenceException {

‎logicaldoc-core/src/main/java/com/logicaldoc/core/searchengine/SearchOptions.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void setTemplate(Long template) {
9595
*
9696
* @param type the type of search
9797
*/
98-
public SearchOptions(int type) {
98+
protected SearchOptions(int type) {
9999
this.type = type;
100100
}
101101

@@ -281,6 +281,7 @@ public int hashCode() {
281281
public String toString() {
282282
return this.getClass().getSimpleName().replace("Options", "")
283283
+ new ReflectionToStringBuilder(this, ToStringStyle.NO_CLASS_NAME_STYLE) {
284+
@Override
284285
protected boolean accept(Field field) {
285286
try {
286287
Object value = field.get(getObject());
@@ -289,9 +290,8 @@ protected boolean accept(Field field) {
289290
&& !field.getName().equals("description") && !field.getName().equals("transaction")
290291
&& value != null && StringUtils.isNotEmpty(value.toString())
291292
&& (!field.getType().isArray() || Array.getLength(value) > 0)
292-
&& (!Collection.class.isAssignableFrom(field.getType())
293-
|| Boolean.FALSE.equals(value.getClass().getDeclaredMethod("isEmpty")
294-
.invoke(value, new Object[0])));
293+
&& (!Collection.class.isAssignableFrom(field.getType()) || Boolean.FALSE
294+
.equals(value.getClass().getDeclaredMethod("isEmpty").invoke(value)));
295295
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
296296
| NoSuchMethodException | SecurityException e) {
297297
return false;

‎logicaldoc-core/src/main/java/com/logicaldoc/core/searchengine/folder/FolderCriterion.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,11 @@ public void setDoubleValue(Double doubleValue) {
274274
public void setExtendedAttribute(boolean extendedAttribute) {
275275
this.extendedAttribute = extendedAttribute;
276276
}
277-
277+
278278
@Override
279279
public String toString() {
280280
return new ReflectionToStringBuilder(this, ToStringStyle.NO_CLASS_NAME_STYLE) {
281+
@Override
281282
protected boolean accept(Field field) {
282283
try {
283284
Object value = field.get(getObject());

‎logicaldoc-core/src/test/java/com/logicaldoc/core/searchengine/FulltextSearchTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import java.util.List;
88
import java.util.Set;
99

10-
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
1110
import org.junit.Before;
1211
import org.junit.Test;
1312
import org.slf4j.Logger;

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/util/EventSelectorOptions.java‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
package com.logicaldoc.gui.common.client.util;
2+
3+
public class EventSelectorOptions {
4+
private boolean folder;
5+
6+
private boolean workflow;
7+
8+
private boolean user;
9+
10+
private boolean importfolder;
11+
12+
private boolean ocr;
13+
14+
private boolean webservice;
15+
16+
private boolean allOption;
17+
18+
public EventSelectorOptions(boolean folder, boolean workflow, boolean user, boolean importfolder, boolean ocr,
19+
boolean webservice, boolean allOption) {
20+
this.folder = folder;
21+
this.workflow = workflow;
22+
this.user = user;
23+
this.importfolder = importfolder;
24+
this.ocr = ocr;
25+
this.webservice = webservice;
26+
this.allOption = allOption;
27+
}
28+
29+
public boolean isFolder() {
30+
return folder;
31+
}
32+
33+
public void setFolder(boolean folder) {
34+
this.folder = folder;
35+
}
36+
37+
public boolean isWorkflow() {
38+
return workflow;
39+
}
40+
41+
public void setWorkflow(boolean workflow) {
42+
this.workflow = workflow;
43+
}
44+
45+
public boolean isUser() {
46+
return user;
47+
}
48+
49+
public void setUser(boolean user) {
50+
this.user = user;
51+
}
52+
53+
public boolean isImportfolder() {
54+
return importfolder;
55+
}
56+
57+
public void setImportfolder(boolean importfolder) {
58+
this.importfolder = importfolder;
59+
}
60+
61+
public boolean isOcr() {
62+
return ocr;
63+
}
64+
65+
public void setOcr(boolean ocr) {
66+
this.ocr = ocr;
67+
}
68+
69+
public boolean isWebservice() {
70+
return webservice;
71+
}
72+
73+
public void setWebservice(boolean webservice) {
74+
this.webservice = webservice;
75+
}
76+
77+
public boolean isAllOption() {
78+
return allOption;
79+
}
80+
81+
public void setAllOption(boolean allOption) {
82+
this.allOption = allOption;
83+
}
84+
}

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/util/ItemFactory.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,14 +1138,14 @@ public static SelectItem newFolderSecurityOption(String name) {
11381138
return securityOption;
11391139
}
11401140

1141-
public static SelectItem newEventsSelector(String name, String title, final ChangedHandler handler, boolean folder,
1142-
boolean workflow, boolean user, boolean importfolder, boolean ocr, boolean webservice, boolean allOption) {
1141+
public static SelectItem newEventsSelector(String name, String title, final ChangedHandler handler,
1142+
EventSelectorOptions options) {
11431143
final SelectItem select = newMultipleSelector(originalItemName(name), title);
11441144
select.setWidth(350);
11451145
select.setHeight(250);
11461146
select.setMultipleAppearance(MultipleAppearance.GRID);
11471147
select.setMultiple(true);
1148-
select.setOptionDataSource(new EventsDS(folder, workflow, user, importfolder, ocr, webservice, allOption));
1148+
select.setOptionDataSource(new EventsDS(options.isFolder(), options.isWorkflow(), options.isUser(), options.isImportfolder(), options.isOcr(), options.isWebservice(), options.isAllOption()));
11491149
select.setValueField("code");
11501150
select.setDisplayField(LABEL);
11511151
if (handler != null)
@@ -1164,12 +1164,11 @@ public static SelectItem newEventsSelector(String name, String title, final Chan
11641164
return select;
11651165
}
11661166

1167-
public static SelectItem newEventSelector(String name, String title, final ChangedHandler handler, boolean folder,
1168-
boolean workflow, boolean user, boolean importfolder, boolean ocr, boolean webservice, boolean allOption) {
1167+
public static SelectItem newEventSelector(String name, String title, final ChangedHandler handler, EventSelectorOptions options) {
11691168
final SelectItem select = newSelectItem(originalItemName(name), title);
11701169
select.setWidth(350);
11711170
select.setMultiple(false);
1172-
select.setOptionDataSource(new EventsDS(folder, workflow, user, importfolder, ocr, webservice, allOption));
1171+
select.setOptionDataSource(new EventsDS(options.isFolder(), options.isWorkflow(), options.isUser(), options.isImportfolder(), options.isOcr(), options.isWebservice(), options.isAllOption()));
11731172
select.setValueField("code");
11741173
select.setDisplayField(LABEL);
11751174
if (handler != null)

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/AutomationTriggerDialog.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.logicaldoc.gui.common.client.beans.GUIAutomationTrigger;
66
import com.logicaldoc.gui.common.client.i18n.I18N;
77
import com.logicaldoc.gui.common.client.log.GuiLog;
8+
import com.logicaldoc.gui.common.client.util.EventSelectorOptions;
89
import com.logicaldoc.gui.common.client.util.ItemFactory;
910
import com.logicaldoc.gui.frontend.client.services.AutomationService;
1011
import com.smartgwt.client.types.HeaderControls;
@@ -106,8 +107,7 @@ public AutomationTriggerDialog(GUIAutomationTrigger trigger, FolderAutomationPan
106107
form1.setNumCols(1);
107108
form1.setValuesManager(vm);
108109

109-
SelectItem events = ItemFactory.newEventsSelector(EVENTS, I18N.message("triggeron"), null, true, true, true,
110-
true, true, true, false);
110+
SelectItem events = ItemFactory.newEventsSelector(EVENTS, I18N.message("triggeron"), null, new EventSelectorOptions(true, true, true, true, true, true, false));
111111
events.setHeight(210);
112112
events.setHeight(250);
113113
events.setEndRow(true);

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/google/drive/DriveEditor.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
*/
3333
public class DriveEditor extends Window {
3434

35+
private static final String EDIT_HL = "/edit?hl=";
36+
3537
private HTMLFlow html = new HTMLFlow();
3638

3739
private VLayout layout = null;
@@ -92,13 +94,13 @@ public void onSuccess(Void result) {
9294
* Reloads a preview.
9395
*/
9496
private void reloadBody() {
95-
String url = "https://docs.google.com/document/d/" + document.getExtResId() + "/edit?hl="
97+
String url = "https://docs.google.com/document/d/" + document.getExtResId() + EDIT_HL
9698
+ Session.get().getUser().getLanguage();
9799
if (Util.isSpreadsheetFile(document.getFileName()))
98-
url = "https://docs.google.com/spreadsheets/d/" + document.getExtResId() + "/edit?hl="
100+
url = "https://docs.google.com/spreadsheets/d/" + document.getExtResId() + EDIT_HL
99101
+ Session.get().getUser().getLanguage();
100102
if (Util.isPresentationFile(document.getFileName()))
101-
url = "https://docs.google.com/presentation/d/" + document.getExtResId() + "/edit?hl="
103+
url = "https://docs.google.com/presentation/d/" + document.getExtResId() + EDIT_HL
102104
+ Session.get().getUser().getLanguage();
103105

104106
String iframe = "<iframe src='" + url + "' style='border: 0px solid white; width:" + (getWidth() - 18)

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/reports/LastChangesReport.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.logicaldoc.gui.common.client.i18n.I18N;
1414
import com.logicaldoc.gui.common.client.log.GuiLog;
1515
import com.logicaldoc.gui.common.client.util.DocUtil;
16+
import com.logicaldoc.gui.common.client.util.EventSelectorOptions;
1617
import com.logicaldoc.gui.common.client.util.GridUtil;
1718
import com.logicaldoc.gui.common.client.util.ItemFactory;
1819
import com.logicaldoc.gui.common.client.util.LD;
@@ -189,8 +190,7 @@ public void onDraw() {
189190
eventForm.setColWidths(1, "*");
190191

191192
// Event
192-
SelectItem event = ItemFactory.newEventsSelector(EVENT, I18N.message(EVENT), null, true, true, true, true,
193-
true, false, false);
193+
SelectItem event = ItemFactory.newEventsSelector(EVENT, I18N.message(EVENT), null, new EventSelectorOptions(true, true, true, true, true, false, false));
194194
event.setColSpan(2);
195195
event.setEndRow(true);
196196

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/settings/AuditingPanel.java‎

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.logicaldoc.gui.common.client.beans.GUIParameter;
1010
import com.logicaldoc.gui.common.client.i18n.I18N;
1111
import com.logicaldoc.gui.common.client.log.GuiLog;
12+
import com.logicaldoc.gui.common.client.util.EventSelectorOptions;
1213
import com.logicaldoc.gui.common.client.util.ItemFactory;
1314
import com.logicaldoc.gui.common.client.util.Util;
1415
import com.logicaldoc.gui.frontend.client.administration.AdminPanel;
@@ -71,9 +72,10 @@ private void initGUI(List<GUIParameter> parameters) {
7172
form.setTitleOrientation(TitleOrientation.TOP);
7273
form.setWrapItemTitles(false);
7374

74-
final String eventsParameterName = Session.get().getTenantName() + ".history.events";
75+
String eventsParameterName = Session.get().getTenantName() + ".history.events";
7576
final SelectItem eventsSelector = ItemFactory.newEventsSelector(eventsParameterName,
76-
I18N.message("recordedevents"), null, true, true, true, true, true, true, true);
77+
I18N.message("recordedevents"), null,
78+
new EventSelectorOptions(true, true, true, true, true, true, true));
7779
eventsSelector.setColSpan(2);
7880
eventsSelector.setEndRow(true);
7981

@@ -156,36 +158,40 @@ private void initGUI(List<GUIParameter> parameters) {
156158

157159
IButton save = new IButton(I18N.message("save"));
158160
save.setMinWidth(80);
159-
save.addClickHandler(event -> {
160-
if (vm.validate()) {
161-
List<GUIParameter> settings = new ArrayList<>();
162-
final String eventsValue = vm.getValueAsString(eventsParameterName);
163-
settings.add(new GUIParameter(eventsParameterName,
164-
eventsValue != null && eventsValue.contains("all") ? "all" : eventsValue));
165-
settings.add(new GUIParameter(HISTORY_DOCUMENT_TTL, vm.getValueAsString(HISTORY_DOCUMENT_TTL)));
166-
settings.add(new GUIParameter(HISTORY_FOLDER_TTL, vm.getValueAsString(HISTORY_FOLDER_TTL)));
167-
settings.add(new GUIParameter(HISTORY_USER_TTL, vm.getValueAsString(HISTORY_USER_TTL)));
168-
settings.add(new GUIParameter(HISTORY_IMPORTFOLDER_TTL, vm.getValueAsString(HISTORY_IMPORTFOLDER_TTL)));
169-
settings.add(new GUIParameter(HISTORY_WORKFLOW_TTL, vm.getValueAsString(HISTORY_WORKFLOW_TTL)));
170-
settings.add(new GUIParameter(HISTORY_OCR_TTL, vm.getValueAsString(HISTORY_OCR_TTL)));
171-
settings.add(new GUIParameter(WEBSERVICE_CALL_TTL, vm.getValueAsString(WEBSERVICE_CALL_TTL)));
172-
173-
SettingService.Instance.get().saveSettings(settings, new AsyncCallback<Void>() {
174-
175-
@Override
176-
public void onFailure(Throwable caught) {
177-
GuiLog.serverError(caught);
178-
}
179-
180-
@Override
181-
public void onSuccess(Void ret) {
182-
GuiLog.info(I18N.message("settingssaved"), null);
183-
}
184-
});
185-
}
186-
});
161+
save.addClickHandler(event -> onSave(vm));
187162

188163
body.setMembers(form);
189164
addMember(save);
190165
}
166+
167+
private void onSave(ValuesManager vm) {
168+
if (Boolean.TRUE.equals(vm.validate())) {
169+
List<GUIParameter> settings = new ArrayList<>();
170+
171+
String eventsParameterName = Session.get().getTenantName() + ".history.events";
172+
final String eventsValue = vm.getValueAsString(eventsParameterName);
173+
settings.add(new GUIParameter(eventsParameterName,
174+
eventsValue != null && eventsValue.contains("all") ? "all" : eventsValue));
175+
settings.add(new GUIParameter(HISTORY_DOCUMENT_TTL, vm.getValueAsString(HISTORY_DOCUMENT_TTL)));
176+
settings.add(new GUIParameter(HISTORY_FOLDER_TTL, vm.getValueAsString(HISTORY_FOLDER_TTL)));
177+
settings.add(new GUIParameter(HISTORY_USER_TTL, vm.getValueAsString(HISTORY_USER_TTL)));
178+
settings.add(new GUIParameter(HISTORY_IMPORTFOLDER_TTL, vm.getValueAsString(HISTORY_IMPORTFOLDER_TTL)));
179+
settings.add(new GUIParameter(HISTORY_WORKFLOW_TTL, vm.getValueAsString(HISTORY_WORKFLOW_TTL)));
180+
settings.add(new GUIParameter(HISTORY_OCR_TTL, vm.getValueAsString(HISTORY_OCR_TTL)));
181+
settings.add(new GUIParameter(WEBSERVICE_CALL_TTL, vm.getValueAsString(WEBSERVICE_CALL_TTL)));
182+
183+
SettingService.Instance.get().saveSettings(settings, new AsyncCallback<Void>() {
184+
185+
@Override
186+
public void onFailure(Throwable caught) {
187+
GuiLog.serverError(caught);
188+
}
189+
190+
@Override
191+
public void onSuccess(Void ret) {
192+
GuiLog.info(I18N.message("settingssaved"), null);
193+
}
194+
});
195+
}
196+
}
191197
}

0 commit comments

Comments
 (0)