reword groups-definitions as group-definitions
change some method names that said "groups definitions"
to say "group definitions".
diff --git a/src/com/google/enterprise/adaptor/DocIdSender.java b/src/com/google/enterprise/adaptor/DocIdSender.java
index 41b5b1e..2f7f830 100644
--- a/src/com/google/enterprise/adaptor/DocIdSender.java
+++ b/src/com/google/enterprise/adaptor/DocIdSender.java
@@ -302,7 +302,7 @@
boolean caseSensitive, ExceptionHandler handler)
throws InterruptedException {
String groupsDefXml
- = fileMaker.makeGroupsDefinitionsXml(defs, caseSensitive);
+ = fileMaker.makeGroupDefinitionsXml(defs, caseSensitive);
boolean keepGoing = true;
boolean success = false;
log.log(Level.INFO, "pushing groups");
diff --git a/src/com/google/enterprise/adaptor/GsaFeedFileMaker.java b/src/com/google/enterprise/adaptor/GsaFeedFileMaker.java
index 2543b88..37a329d 100644
--- a/src/com/google/enterprise/adaptor/GsaFeedFileMaker.java
+++ b/src/com/google/enterprise/adaptor/GsaFeedFileMaker.java
@@ -318,7 +318,7 @@
/** Adds all the groups' definitions into body. */
private <T extends Collection<Principal>> void
- constructGroupsDefinitionsFileBody(Document doc, Element root,
+ constructGroupDefinitionsFileBody(Document doc, Element root,
Collection<Map.Entry<GroupPrincipal, T>> items,
boolean caseSensitiveMembers) {
for (Map.Entry<GroupPrincipal, T> group : items) {
@@ -329,28 +329,28 @@
/** Puts all groups' definitions into document. */
private <T extends Collection<Principal>> void
- constructGroupsDefinitionsFeedFile(Document doc,
+ constructGroupDefinitionsFeedFile(Document doc,
Collection<Map.Entry<GroupPrincipal, T>> items,
boolean caseSensitiveMembers) {
Element root = doc.createElement("xmlgroups");
doc.appendChild(root);
Comment comment = doc.createComment("GSA EasyConnector");
root.appendChild(comment);
- constructGroupsDefinitionsFileBody(doc, root, items, caseSensitiveMembers);
+ constructGroupDefinitionsFileBody(doc, root, items, caseSensitiveMembers);
}
// This and all the methods it calls with things from 'items' requires the
// parameter T even though ? would normally suffice. See comment in
// DocIdSender to learn about the Java limitation causing the need for T.
/** Makes feed file with groups and their definitions. */
- public <T extends Collection<Principal>> String makeGroupsDefinitionsXml(
+ public <T extends Collection<Principal>> String makeGroupDefinitionsXml(
Collection<Map.Entry<GroupPrincipal, T>> items,
boolean caseSensitiveMembers) {
try {
DocumentBuilderFactory dbfac = DocumentBuilderFactory.newInstance();
DocumentBuilder docBuilder = dbfac.newDocumentBuilder();
Document doc = docBuilder.newDocument();
- constructGroupsDefinitionsFeedFile(doc, items, caseSensitiveMembers);
+ constructGroupDefinitionsFeedFile(doc, items, caseSensitiveMembers);
String xmlString = documentToString(doc);
return xmlString;
} catch (TransformerConfigurationException tce) {
diff --git a/test/com/google/enterprise/adaptor/DocIdSenderTest.java b/test/com/google/enterprise/adaptor/DocIdSenderTest.java
index b219a44..0a04cf0 100644
--- a/test/com/google/enterprise/adaptor/DocIdSenderTest.java
+++ b/test/com/google/enterprise/adaptor/DocIdSenderTest.java
@@ -347,7 +347,7 @@
}
@Override
- public <T extends Collection<Principal>> String makeGroupsDefinitionsXml(
+ public <T extends Collection<Principal>> String makeGroupDefinitionsXml(
Collection<Map.Entry<GroupPrincipal, T>> items,
boolean caseSensitiveMembers) {
groupses.add(new ArrayList<Map.Entry<GroupPrincipal, T>>(items));
diff --git a/test/com/google/enterprise/adaptor/GsaFeedFileMakerTest.java b/test/com/google/enterprise/adaptor/GsaFeedFileMakerTest.java
index 060429e..7eefa33 100644
--- a/test/com/google/enterprise/adaptor/GsaFeedFileMakerTest.java
+++ b/test/com/google/enterprise/adaptor/GsaFeedFileMakerTest.java
@@ -328,21 +328,21 @@
}
@Test
- public void testEmptyGroupsDefinitions() {
+ public void testEmptyGroupDefinitions() {
String golden =
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+ "<!DOCTYPE xmlgroups PUBLIC \"-//Google//DTD GSA Feeds//EN\" \"\">\n"
+ "<xmlgroups>\n"
+ "<!--GSA EasyConnector-->\n"
+ "</xmlgroups>\n";
- String xml = meker.makeGroupsDefinitionsXml(
+ String xml = meker.makeGroupDefinitionsXml(
new TreeMap<GroupPrincipal, List<Principal>>().entrySet(), true);
xml = xml.replaceAll("\r\n", "\n");
assertEquals(golden, xml);
}
@Test
- public void testSimpleGroupsDefinitions() {
+ public void testSimpleGroupDefinitions() {
String golden =
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+ "<!DOCTYPE xmlgroups PUBLIC \"-//Google//DTD GSA Feeds//EN\" \"\">\n"
@@ -364,13 +364,13 @@
List<Principal> members = new ArrayList<Principal>();
members.add(new UserPrincipal("MacLeod\\Duncan"));
groupDefs.put(new GroupPrincipal("immortals"), members);
- String xml = meker.makeGroupsDefinitionsXml(groupDefs.entrySet(), false);
+ String xml = meker.makeGroupDefinitionsXml(groupDefs.entrySet(), false);
xml = xml.replaceAll("\r\n", "\n");
assertEquals(golden, xml);
}
@Test
- public void testMultipleGroupsDefinitions() {
+ public void testMultipleGroupDefinitions() {
String golden =
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+ "<!DOCTYPE xmlgroups PUBLIC \"-//Google//DTD GSA Feeds//EN\" \"\">\n"
@@ -417,13 +417,13 @@
members2.add(new UserPrincipal("splat"));
members2.add(new UserPrincipal("plump"));
groupDefs.put(new GroupPrincipal("sounds"), members2);
- String xml = meker.makeGroupsDefinitionsXml(groupDefs.entrySet(), false);
+ String xml = meker.makeGroupDefinitionsXml(groupDefs.entrySet(), false);
xml = xml.replaceAll("\r\n", "\n");
assertEquals(golden, xml);
}
@Test
- public void testNestedGroupsDefinitions() {
+ public void testNestedGroupDefinitions() {
String golden =
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+ "<!DOCTYPE xmlgroups PUBLIC \"-//Google//DTD GSA Feeds//EN\" \"\">\n"
@@ -451,13 +451,13 @@
members.add(new UserPrincipal("MacLeod\\Duncan", "goodguys"));
members.add(new GroupPrincipal("badguys", "3vil"));
groupDefs.put(new GroupPrincipal("immortals"), members);
- String xml = meker.makeGroupsDefinitionsXml(groupDefs.entrySet(), true);
+ String xml = meker.makeGroupDefinitionsXml(groupDefs.entrySet(), true);
xml = xml.replaceAll("\r\n", "\n");
assertEquals(golden, xml);
}
@Test
- public void testGroupsDefinitionsAclTransform() {
+ public void testGroupDefinitionsAclTransform() {
String golden =
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+ "<!DOCTYPE xmlgroups PUBLIC \"-//Google//DTD GSA Feeds//EN\" \"\">\n"
@@ -485,7 +485,7 @@
new AclTransform.MatchData(null, "immortals", null, null),
new AclTransform.MatchData(null, "Clan MacLeod", null, null))));
meker = new GsaFeedFileMaker(encoder, aclTransform);
- String xml = meker.makeGroupsDefinitionsXml(groupDefs.entrySet(), false);
+ String xml = meker.makeGroupDefinitionsXml(groupDefs.entrySet(), false);
xml = xml.replaceAll("\r\n", "\n");
assertEquals(golden, xml);
}
