Skip to content

Commit 1f51b95

Browse files
author
Gerd Behrmann
committed
webadmin: Avoid use of raw types
This is not the result of automatic fixing, although the process of generifying dCache was greatly aided by IntelliJ. Target: trunk Require-book: no Require-notes: no Acked-by: Paul Millar <paul.millar@desy.de> Patch: http://rb.dcache.org/r/4969/
1 parent de65b38 commit 1f51b95

File tree

21 files changed

+85
-87
lines changed

21 files changed

+85
-87
lines changed

‎modules/webadmin/src/main/java/org/dcache/webadmin/controller/util/AlarmTableProvider.java

Lines changed: 23 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
5959
*/
6060
package org.dcache.webadmin.controller.util;
6161

62+
import java.io.Serializable;
6263
import java.util.ArrayList;
6364
import java.util.Comparator;
6465
import java.util.Date;
@@ -191,6 +192,12 @@ public void update(IAlarmDAO access) throws DAOException {
191192
@Override
192193
protected Comparator<AlarmEntry> getComparator() {
193194
return new Comparator<AlarmEntry>() {
195+
196+
private <T extends Comparable<T>> int compare(int dir, T a, T b)
197+
{
198+
return (a == null) ? dir : dir * a.compareTo(b);
199+
}
200+
194201
@Override
195202
public int compare(AlarmEntry alarm0, AlarmEntry alarm1) {
196203
SortParam sort = getSort();
@@ -204,44 +211,24 @@ public int compare(AlarmEntry alarm0, AlarmEntry alarm1) {
204211
property = sort.getProperty();
205212
}
206213

207-
Comparable c0;
208-
Comparable c1;
209214
switch (property) {
210-
case "date":
211-
c0 = alarm0.getDate();
212-
c1 = alarm1.getDate();
213-
break;
214-
case "severity":
215-
c0 = alarm0.getSeverity();
216-
c1 = alarm1.getSeverity();
217-
break;
218-
case "type":
219-
c0 = alarm0.getType();
220-
c1 = alarm1.getType();
221-
break;
222-
case "count":
223-
c0 = alarm0.getCount();
224-
c1 = alarm1.getCount();
225-
break;
226-
case "host":
227-
c0 = alarm0.getHost();
228-
c1 = alarm1.getHost();
229-
break;
230-
case "domain":
231-
c0 = alarm0.getDomain();
232-
c1 = alarm1.getDomain();
233-
break;
234-
case "service":
235-
c0 = alarm0.getService();
236-
c1 = alarm1.getService();
237-
break;
238-
default:
239-
return 0;
240-
}
241-
if (c0 == null) {
242-
return dir;
215+
case "date":
216+
return compare(dir, alarm0.getDate(), alarm1.getDate());
217+
case "severity":
218+
return compare(dir, alarm0.getSeverity(), alarm1.getSeverity());
219+
case "type":
220+
return compare(dir, alarm0.getType(), alarm1.getType());
221+
case "count":
222+
return compare(dir, alarm0.getCount(), alarm1.getCount());
223+
case "host":
224+
return compare(dir, alarm0.getHost(), alarm1.getHost());
225+
case "domain":
226+
return compare(dir, alarm0.getDomain(), alarm1.getDomain());
227+
case "service":
228+
return compare(dir, alarm0.getService(), alarm1.getService());
229+
default:
230+
return 0;
243231
}
244-
return dir * c0.compareTo(c1);
245232
}
246233
};
247234
}

‎modules/webadmin/src/main/java/org/dcache/webadmin/model/dataaccess/communication/CellMessageGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ interface CellMessageRequest<M> {
2525

2626
public CellPath getDestination();
2727

28-
public void setAnswer(M answer);
28+
public void setAnswer(Serializable answer);
2929

3030
public M getAnswer();
3131
}

‎modules/webadmin/src/main/java/org/dcache/webadmin/model/dataaccess/communication/CommandSenderFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
*/
77
public interface CommandSenderFactory {
88

9-
public CommandSender createCommandSender(CellMessageGenerator messageGenerator);
9+
public CommandSender createCommandSender(CellMessageGenerator<?> messageGenerator);
1010
}

‎modules/webadmin/src/main/java/org/dcache/webadmin/model/dataaccess/communication/impl/CellCommandSender.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,10 @@ private void processAnswered() {
7474
*/
7575
private class CellMessageCallback extends AbstractMessageCallback<Serializable>
7676
{
77-
private CellMessageRequest _messageRequest;
77+
private CellMessageRequest<? extends Serializable> _messageRequest;
7878

79-
public CellMessageCallback(CellMessageRequest messageRequest) {
79+
public CellMessageCallback(
80+
CellMessageRequest<? extends Serializable> messageRequest) {
8081
_messageRequest = messageRequest;
8182
// considered sending as not successful until replied
8283
_messageRequest.setSuccessful(false);

‎modules/webadmin/src/main/java/org/dcache/webadmin/model/dataaccess/communication/impl/CellCommandSenderFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class CellCommandSenderFactory implements CommandSenderFactory {
1818
private CellStub _poolCellStub;
1919

2020
@Override
21-
public CommandSender createCommandSender(CellMessageGenerator messageGenerator) {
21+
public CommandSender createCommandSender(CellMessageGenerator<?> messageGenerator) {
2222
CellCommandSender commandSender = new CellCommandSender(messageGenerator);
2323
commandSender.setCellStub(_poolCellStub);
2424
return commandSender;

‎modules/webadmin/src/main/java/org/dcache/webadmin/model/dataaccess/communication/impl/InfoGetSerialisedDataMessageGenerator.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import dmg.cells.nucleus.CellPath;
44
import dmg.cells.nucleus.SerializationException;
5+
6+
import java.io.Serializable;
57
import java.util.Iterator;
68
import java.util.List;
79
import java.util.Set;
@@ -106,8 +108,8 @@ public CellPath getDestination() {
106108
}
107109

108110
@Override
109-
public void setAnswer(InfoGetSerialisedDataMessage answer) {
110-
_answer = answer;
111+
public void setAnswer(Serializable answer) {
112+
_answer = (InfoGetSerialisedDataMessage) answer;
111113
}
112114

113115
@Override

‎modules/webadmin/src/main/java/org/dcache/webadmin/model/dataaccess/communication/impl/PoolModifyModeMessageGenerator.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import diskCacheV111.pools.PoolV2Mode;
44
import diskCacheV111.vehicles.PoolModifyModeMessage;
55
import dmg.cells.nucleus.CellPath;
6+
7+
import java.io.Serializable;
68
import java.util.HashSet;
79
import java.util.Iterator;
810
import java.util.Set;
@@ -92,7 +94,7 @@ public void setSuccessful(boolean successful) {
9294
}
9395

9496
@Override
95-
public void setAnswer(PoolModifyModeMessage answer) {
97+
public void setAnswer(Serializable answer) {
9698
// currently no interest in answer since it is not used
9799
}
98100

‎modules/webadmin/src/main/java/org/dcache/webadmin/model/dataaccess/communication/impl/PoolMoverKillMessageGenerator.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import diskCacheV111.vehicles.PoolMoverKillMessage;
44
import dmg.cells.nucleus.CellPath;
5+
6+
import java.io.Serializable;
57
import java.util.HashSet;
68
import java.util.Iterator;
79
import java.util.Set;
@@ -88,7 +90,7 @@ public CellPath getDestination() {
8890
}
8991

9092
@Override
91-
public void setAnswer(PoolMoverKillMessage answer) {
93+
public void setAnswer(Serializable answer) {
9294
// currently no interest in answer since it is not used
9395
}
9496

‎modules/webadmin/src/main/java/org/dcache/webadmin/model/dataaccess/communication/impl/StringCommandMessageGenerator.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package org.dcache.webadmin.model.dataaccess.communication.impl;
22

33
import dmg.cells.nucleus.CellPath;
4+
5+
import java.io.Serializable;
46
import java.util.HashSet;
57
import java.util.Iterator;
68
import java.util.Set;
@@ -84,8 +86,8 @@ public CellPath getDestination() {
8486
}
8587

8688
@Override
87-
public void setAnswer(String answer) {
88-
_answer = answer;
89+
public void setAnswer(Serializable answer) {
90+
_answer = (String) answer;
8991
}
9092

9193
@Override

‎modules/webadmin/src/main/java/org/dcache/webadmin/view/WebAdminInterface.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.Collections;
66
import java.util.List;
77

8+
import org.apache.wicket.Component;
89
import org.apache.wicket.Page;
910
import org.apache.wicket.Session;
1011
import org.apache.wicket.authorization.strategies.CompoundAuthorizationStrategy;
@@ -73,7 +74,8 @@ public class WebAdminInterface extends WebApplication {
7374
public static final String MISSING_RESOURCE_KEY = "missing.resource";
7475

7576
private static final long LOGIN_CELLSTUB_TIMEOUT = 5000;
76-
private static final List<Class> ADMIN_PAGES = new ArrayList<Class>(
77+
private static final List<Class<? extends Component>> ADMIN_PAGES =
78+
new ArrayList<Class<? extends Component>>(
7779
Arrays.asList(PoolAdmin.class, CellAdmin.class, AlarmsPage.class));
7880
private static final Logger _log = LoggerFactory.getLogger(WebAdminInterface.class);
7981

@@ -109,7 +111,7 @@ public Integer getAdminGid() {
109111
return _adminGid;
110112
}
111113

112-
public List<Class> getAdminOnlyPages() {
114+
public List<Class<? extends Component>> getAdminOnlyPages() {
113115
return Collections.unmodifiableList(ADMIN_PAGES);
114116
}
115117

@@ -310,7 +312,7 @@ protected void init() {
310312
}
311313

312314
private void markAdminOnlyPages() {
313-
for (final Class adminPage : ADMIN_PAGES) {
315+
for (final Class<? extends Component> adminPage : ADMIN_PAGES) {
314316
MetaDataRoleAuthorizationStrategy.authorize(adminPage, Role.ADMIN);
315317
}
316318
}

0 commit comments

Comments
 (0)