java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java | 4
+--
java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java | 13
+++++++---
2 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 61143cb4c7a25deb5bc447b578a706d96dd6e635
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue May 29 15:36:55 2012 +0200
A checkstyle fix.
Addressing:
./code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java:36:27:
Name 'IDENT_INDEX' must match pattern '^[a-z][a-zA-Z0-9]*$'.
./code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java:37:27:
Name 'INDEX_SEARCH' must match pattern '^[a-z][a-zA-Z0-9]*$'.
./code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java:38:27:
Name 'SYSTEM_LIST' must match pattern '^[a-z][a-zA-Z0-9]*$'.
./code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java:40:5:
Missing a Javadoc comment.
./code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java:49:27:
Name 'SEARCH_STRING' must match pattern '^[a-z][a-zA-Z0-9]*$'.
./code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java:50:27:
Name 'WHERE_TO_SEARCH' must match pattern '^[a-z][a-zA-Z0-9]*$'.
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java
b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java
index 831abe8..3a16605 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java
@@ -46,8 +46,8 @@ import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
*/
public class XccdfSearchAction extends RhnAction {
- private static String SEARCH_STRING = "search_string";
- private static String WHERE_TO_SEARCH = "whereToSearch";
+ private static final String SEARCH_STRING = "search_string";
+ private static final String WHERE_TO_SEARCH = "whereToSearch";
private static Logger log = Logger.getLogger(XccdfSearchAction.class);
/** {@inheritDoc} */
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java
b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java
index a153b55..ca28bd9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java
@@ -33,10 +33,17 @@ import com.redhat.rhn.manager.audit.ScapManager;
*/
public class XccdfSearchHelper extends RhnAction {
- private static String IDENT_INDEX = "xccdfIdent";
- private static String INDEX_SEARCH = "index.search";
- private static String SYSTEM_LIST = "system_list";
+ private static final String IDENT_INDEX = "xccdfIdent";
+ private static final String INDEX_SEARCH = "index.search";
+ private static final String SYSTEM_LIST = "system_list";
+ /**
+ * Perform search over XCCDF
+ * @param searchString A string to search within xccdf:Rules
+ * @param whereToSearch Where to search for scans, either ssm or all machines
+ * @param context A context of cuyrrent request
+ * @return a list of xccdf:rule-results
+ */
public static List performSearch(String searchString, String whereToSearch,
RequestContext context)
throws MalformedURLException, XmlRpcException, XmlRpcFault {
Show replies by date