java/code/src/com/redhat/rhn/domain/action/script/test/ScriptRunActionTest.java | 2 +- java/code/src/com/redhat/rhn/domain/server/Server.java | 1 - java/code/src/com/redhat/rhn/frontend/action/systems/ExtraPackagesSystemsAction.java | 2 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java | 2 +- java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-)
New commits: commit add6b6c4784bfbce6cbba29a01cbaa93e6429a13 Author: Tomas Lestach tlestach@redhat.com Date: Mon Oct 29 09:29:41 2012 +0100
remove unnecessary casts
diff --git a/java/code/src/com/redhat/rhn/domain/action/script/test/ScriptRunActionTest.java b/java/code/src/com/redhat/rhn/domain/action/script/test/ScriptRunActionTest.java index 12aa072..158b29c 100644 --- a/java/code/src/com/redhat/rhn/domain/action/script/test/ScriptRunActionTest.java +++ b/java/code/src/com/redhat/rhn/domain/action/script/test/ScriptRunActionTest.java @@ -136,7 +136,7 @@ public class ScriptRunActionTest extends RhnBaseTestCase { ScriptRunAction scriptaction = (ScriptRunAction) a; assertEquals(1, scriptaction.getScriptActionDetails().getResults().size());
- ScriptResult lookupResult = (ScriptResult)scriptaction.getScriptActionDetails(). + ScriptResult lookupResult = scriptaction.getScriptActionDetails(). getResults().iterator().next(); assertEquals(startDate.getTime() / 1000, lookupResult.getStartDate().getTime() / 1000); diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/ExtraPackagesSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/ExtraPackagesSystemsAction.java index c009741..cc246fe 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/ExtraPackagesSystemsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/ExtraPackagesSystemsAction.java @@ -46,6 +46,6 @@ public class ExtraPackagesSystemsAction extends BaseSystemsAction {
protected DataResult<SystemOverview> getDataResult(User user, PageControl pc, ActionForm formIn) { - return (DataResult<SystemOverview>) SystemManager.getExtraPackagesSystems(user, pc); + return SystemManager.getExtraPackagesSystems(user, pc); } } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java index 5a6a21c..5655066 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java @@ -792,7 +792,7 @@ public class SystemHandlerTest extends BaseHandlerTestCase { assertTrue(sizeAfter > sizeBefore);
// Test - Note deleteMe = (Note) server.getNotes().iterator().next(); + Note deleteMe = server.getNotes().iterator().next(); result = handler.deleteNote(adminKey, server.getId().intValue(), deleteMe.getId().intValue());
diff --git a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java index 93ac610..d987cbc 100644 --- a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java @@ -994,7 +994,7 @@ public class SystemManagerTest extends RhnBaseTestCase { int sizeAfter = server.getNotes().size(); assertTrue(sizeAfter == (sizeBefore + 1));
- Note deleteMe = (Note) server.getNotes().iterator().next(); + Note deleteMe = server.getNotes().iterator().next();
// Test SystemManager.deleteNote(admin, server.getId(), deleteMe.getId());
commit 259d13377de2a545f2aeee7fe994f1382ec0ba88 Author: Tomas Lestach tlestach@redhat.com Date: Mon Oct 29 09:27:43 2012 +0100
removing @Override annotation from a method that isn't overriden
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java index 77de965..d71866f 100644 --- a/java/code/src/com/redhat/rhn/domain/server/Server.java +++ b/java/code/src/com/redhat/rhn/domain/server/Server.java @@ -402,7 +402,6 @@ public class Server extends BaseDomainHelper implements Identifiable { * * @return Long to get */ - @Override public Long getId() { return this.id; }