java/code/src/com/redhat/rhn/common/util/test/ServletUtilsTest.java
| 14 +++-------
java/code/src/com/redhat/rhn/frontend/action/rhnset/SetItemSelectionAction.java
| 4 --
java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
| 2 -
java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
| 2 -
java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java
| 4 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java
| 2 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
| 3 --
java/code/src/com/redhat/rhn/taskomatic/task/test/DailySummaryTest.java
| 4 --
java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java
| 3 --
9 files changed, 14 insertions(+), 24 deletions(-)
New commits:
commit bc0f1dfe1ca5c7c9910e8c44a2711570f90bb6ae
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 30 10:12:41 2010 +0200
591291 - fix also mergeErrata with given start and end date
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index 92767ef..4253701 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -1806,12 +1806,11 @@ public class ChannelSoftwareHandler extends BaseHandler {
throw new PermissionCheckFailureException();
}
- Set<Errata> toErrata = mergeTo.getErratas();
List<Errata> fromErrata = ErrataFactory.lookupByChannelBetweenDates(
loggedInUser.getOrg(), mergeFrom, startDate, endDate);
Set<Errata> mergedErrata =
- mergeErrataToChannel(loggedInUser, mergeFrom.getErratas(), mergeTo);
+ mergeErrataToChannel(loggedInUser, new HashSet<Errata>(fromErrata),
mergeTo);
return mergedErrata.toArray();
}
commit 6ddc1ee7b8e2569f434662463924f6ce97c72a5c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 30 10:07:35 2010 +0200
remove exceptions from method definitions that aren't thrown
diff --git a/java/code/src/com/redhat/rhn/common/util/test/ServletUtilsTest.java
b/java/code/src/com/redhat/rhn/common/util/test/ServletUtilsTest.java
index 5e8cbf2..19e8516 100644
--- a/java/code/src/com/redhat/rhn/common/util/test/ServletUtilsTest.java
+++ b/java/code/src/com/redhat/rhn/common/util/test/ServletUtilsTest.java
@@ -119,7 +119,7 @@ public class ServletUtilsTest extends MockObjectTestCase {
assertEquals(expectedParams, actualParams);
}
- public void testPathWithParamsValueUrlEncoding() throws UnsupportedEncodingException
{
+ public void testPathWithParamsValueUrlEncoding() {
Map params = new HashMap();
params.put("key", "some; value&");
String result = ServletUtils.pathWithParams("/foo", params);
@@ -133,16 +133,14 @@ public class ServletUtilsTest extends MockObjectTestCase {
assertEquals("/foo", result);
}
- public void testPathWithParamsArrayValueUrlEncoding()
- throws UnsupportedEncodingException {
+ public void testPathWithParamsArrayValueUrlEncoding() {
Map params = new HashMap();
params.put("key", new Object[] {"value;",
"value&", "$", "normal"});
String result = ServletUtils.pathWithParams("/foo", params);
assertEquals("/foo?key=value%3B&key=value%26&key=%24&key=normal",
result);
}
- public void testPathWithParamsListValue()
- throws UnsupportedEncodingException {
+ public void testPathWithParamsListValue() {
Map params = new HashMap();
List values = new ArrayList();
values.add("value;");
@@ -155,16 +153,14 @@ public class ServletUtilsTest extends MockObjectTestCase {
}
- public void testPathWithParamsKeyUrlEncoding()
- throws UnsupportedEncodingException {
+ public void testPathWithParamsKeyUrlEncoding() {
Map params = new HashMap();
params.put("a;", "somevalue");
String result = ServletUtils.pathWithParams("/foo", params);
assertEquals("/foo?a%3B=somevalue", result);
}
- public void testPathWithParamsKeyArrayUrlEncoding()
- throws UnsupportedEncodingException {
+ public void testPathWithParamsKeyArrayUrlEncoding() {
Map params = new HashMap();
params.put("a;", new Object[] {"1", "2",
"3"});
String result = ServletUtils.pathWithParams("/foo", params);
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnset/SetItemSelectionAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnset/SetItemSelectionAction.java
index 02f074f..a6233cd 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnset/SetItemSelectionAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnset/SetItemSelectionAction.java
@@ -26,7 +26,6 @@ import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import java.io.IOException;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
@@ -107,8 +106,7 @@ public class SetItemSelectionAction extends RhnAction {
// Write an responseText with the current count from the set
- private void writeResponse(HttpServletResponse resp, int setSize, String setLabel)
- throws IOException {
+ private void writeResponse(HttpServletResponse resp, int setSize, String setLabel) {
StringBuffer responseText = new StringBuffer();
LocalizationService ls = LocalizationService.getInstance();
if (RhnSetDecl.SYSTEMS.getLabel().equals(setLabel)) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
index 7113f84..e58807a 100644
--- a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
@@ -120,7 +120,7 @@ public class ConfigChannelTag extends TagSupport {
/**
* Checks to see if no invalid values are specified
*/
- private boolean checkType() throws JspException {
+ private boolean checkType() {
try {
ConfigChannelType.lookup(type);
return true;
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
index 51a126b..38061aa 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
@@ -889,7 +889,7 @@ public class ListDisplayTag extends BodyTagSupport {
buf.append(input.render() + "\n");
}
- private void renderViewAllLink(JspWriter out) throws IOException {
+ private void renderViewAllLink(JspWriter out) {
/*
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java
index 6f9d2b9..2222bce 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java
@@ -380,7 +380,7 @@ public class SelectableColumnTag extends TagSupport {
ListTagUtil.write(pageContext, "\" />\n");
}
- private boolean isSelected() throws JspException {
+ private boolean isSelected() {
if (!StringUtils.isBlank(selectExpr)) {
return selectExpr.equalsIgnoreCase("true");
}
@@ -394,7 +394,7 @@ public class SelectableColumnTag extends TagSupport {
return selections != null && selections.containsKey(valueExpr);
}
- private boolean isDisabled() throws JspException {
+ private boolean isDisabled() {
if (disabledExpr != null &&
disabledExpr.equalsIgnoreCase("true")) {
return true;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java
index 24d52f8..a60444c 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java
@@ -69,7 +69,7 @@ public class XmlRpcServlet extends HttpServlet {
private void passControl(HttpServletRequest request,
HttpServletResponse response)
- throws ServletException, IOException {
+ throws IOException {
response.sendRedirect("/rhn/apidoc/index.jsp");
}
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/test/DailySummaryTest.java
b/java/code/src/com/redhat/rhn/taskomatic/task/test/DailySummaryTest.java
index a957665..375a4a1 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/test/DailySummaryTest.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/test/DailySummaryTest.java
@@ -20,8 +20,6 @@ import com.redhat.rhn.taskomatic.task.DailySummary;
import com.redhat.rhn.testing.RhnBaseTestCase;
import com.redhat.rhn.testing.UserTestUtils;
-import org.quartz.JobExecutionException;
-
import java.util.HashMap;
import java.util.Map;
@@ -76,7 +74,7 @@ public class DailySummaryTest extends RhnBaseTestCase {
return;
}
- public void aTestExcecute() throws JobExecutionException {
+ public void aTestExcecute() {
// using jesusr_redhat orgid for this test. Run only on hosted.
// TODO: how do we create good test data for something like this?
return;
diff --git a/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java
b/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java
index 52f2780..5cc8325 100644
--- a/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java
+++ b/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java
@@ -27,7 +27,6 @@ import org.hibernate.HibernateException;
import org.hibernate.Session;
import java.io.File;
-import java.io.IOException;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.text.DateFormat;
@@ -268,7 +267,7 @@ public abstract class RhnBaseTestCase extends TestCase {
log.setLevel(Level.ERROR);
}
- protected static void createDirIfNotExists(File dir) throws IOException {
+ protected static void createDirIfNotExists(File dir) {
String error =
"Could not create the following directory:[" + dir.getPath() +
"] . Please create that directory before proceeding with the
tests";