opendev/gerrit
Code Issues Proposed changes

Fixed a typo in the name of the ParamertizedString class.

Browse Source 
Renamed ParamertizedString to ParameterizedString and also
ParamertizedStringTest to ParameterizedStringTest.

Change-Id: I1d6998b279b37e04e0d5db69ee271c9e7e621517
This commit is contained in:
Sasa Zivkov
2011-07-15 13:35:23 +02:00
parent c0e1e4e6db
commit 74ca597a8a
8 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-common/src/main/java/com/google/gerrit/common/data/GitwebLink.java
View File

@@ -37,7 +37,7 @@ public class GitwebLink {
} }
public String toRevision(final Project.NameKey project, final PatchSet ps) { public String toRevision(final Project.NameKey project, final PatchSet ps) {
ParamertizedString pattern = new ParamertizedString(type.getRevision()); ParameterizedString pattern = new ParameterizedString(type.getRevision());
final Map<String, String> p = new HashMap<String, String>(); final Map<String, String> p = new HashMap<String, String>();
p.put("project", URL.encodeQueryString(project.get())); p.put("project", URL.encodeQueryString(project.get()));
@@ -46,7 +46,7 @@ public class GitwebLink {
} }
public String toProject(final Project.NameKey project) { public String toProject(final Project.NameKey project) {
ParamertizedString pattern = new ParamertizedString(type.getProject()); ParameterizedString pattern = new ParameterizedString(type.getProject());
final Map<String, String> p = new HashMap<String, String>(); final Map<String, String> p = new HashMap<String, String>();
p.put("project", URL.encodeQueryString(project.get())); p.put("project", URL.encodeQueryString(project.get()));
@@ -54,7 +54,7 @@ public class GitwebLink {
} }
public String toBranch(final Branch.NameKey branch) { public String toBranch(final Branch.NameKey branch) {
ParamertizedString pattern = new ParamertizedString(type.getBranch()); ParameterizedString pattern = new ParameterizedString(type.getBranch());
final Map<String, String> p = new HashMap<String, String>(); final Map<String, String> p = new HashMap<String, String>();
p.put("project", URL.encodeQueryString(branch.getParentKey().get())); p.put("project", URL.encodeQueryString(branch.getParentKey().get()));

14
gerrit-common/src/main/java/com/google/gerrit/common/data/ParamertizedString.java → gerrit-common/src/main/java/com/google/gerrit/common/data/ParameterizedString.java
View File

@@ -21,10 +21,10 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** Performs replacements on strings such as <code>Hello ${user}</code>. */ /** Performs replacements on strings such as <code>Hello ${user}</code>. */
public class ParamertizedString { public class ParameterizedString {
/** Obtain a string which has no parameters and always produces the value. */ /** Obtain a string which has no parameters and always produces the value. */
public static ParamertizedString asis(final String constant) { public static ParameterizedString asis(final String constant) {
return new ParamertizedString(new Constant(constant)); return new ParameterizedString(new Constant(constant));
} }
private final String pattern; private final String pattern;
@@ -32,18 +32,18 @@ public class ParamertizedString {
private final List<Format> patternOps; private final List<Format> patternOps;
private final List<Parameter> parameters; private final List<Parameter> parameters;
protected ParamertizedString() { protected ParameterizedString() {
this(new Constant("")); this(new Constant(""));
} }
private ParamertizedString(final Constant c) { private ParameterizedString(final Constant c) {
pattern = c.text; pattern = c.text;
rawPattern = c.text; rawPattern = c.text;
patternOps = Collections.<Format> singletonList(c); patternOps = Collections.<Format> singletonList(c);
parameters = Collections.emptyList(); parameters = Collections.emptyList();
} }
public ParamertizedString(final String pattern) { public ParameterizedString(final String pattern) {
final StringBuilder raw = new StringBuilder(); final StringBuilder raw = new StringBuilder();
final List<Parameter> prs = new ArrayList<Parameter>(4); final List<Parameter> prs = new ArrayList<Parameter>(4);
final List<Format> ops = new ArrayList<Format>(4); final List<Format> ops = new ArrayList<Format>(4);
@@ -152,7 +152,7 @@ public class ParamertizedString {
@Override @Override
public String toString() { public String toString() {
return ParamertizedString.this.replace(params); return ParameterizedString.this.replace(params);
} }
} }

22
gerrit-common/src/test/java/com/google/gerrit/common/data/ParamertizedStringTest.java → gerrit-common/src/test/java/com/google/gerrit/common/data/ParameterizedStringTest.java
View File

@@ -19,9 +19,9 @@ import junit.framework.TestCase;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class ParamertizedStringTest extends TestCase { public class ParameterizedStringTest extends TestCase {
public void testEmptyString() { public void testEmptyString() {
final ParamertizedString p = new ParamertizedString(""); final ParameterizedString p = new ParameterizedString("");
assertEquals("", p.getPattern()); assertEquals("", p.getPattern());
assertEquals("", p.getRawPattern()); assertEquals("", p.getRawPattern());
assertTrue(p.getParameterNames().isEmpty()); assertTrue(p.getParameterNames().isEmpty());
@@ -33,7 +33,7 @@ public class ParamertizedStringTest extends TestCase {
} }
public void testAsis1() { public void testAsis1() {
final ParamertizedString p = ParamertizedString.asis("${bar}c"); final ParameterizedString p = ParameterizedString.asis("${bar}c");
assertEquals("${bar}c", p.getPattern()); assertEquals("${bar}c", p.getPattern());
assertEquals("${bar}c", p.getRawPattern()); assertEquals("${bar}c", p.getRawPattern());
assertTrue(p.getParameterNames().isEmpty()); assertTrue(p.getParameterNames().isEmpty());
@@ -46,7 +46,7 @@ public class ParamertizedStringTest extends TestCase {
} }
public void testReplace1() { public void testReplace1() {
final ParamertizedString p = new ParamertizedString("${bar}c"); final ParameterizedString p = new ParameterizedString("${bar}c");
assertEquals("${bar}c", p.getPattern()); assertEquals("${bar}c", p.getPattern());
assertEquals("{0}c", p.getRawPattern()); assertEquals("{0}c", p.getRawPattern());
assertEquals(1, p.getParameterNames().size()); assertEquals(1, p.getParameterNames().size());
@@ -61,7 +61,7 @@ public class ParamertizedStringTest extends TestCase {
} }
public void testReplace2() { public void testReplace2() {
final ParamertizedString p = new ParamertizedString("a${bar}c"); final ParameterizedString p = new ParameterizedString("a${bar}c");
assertEquals("a${bar}c", p.getPattern()); assertEquals("a${bar}c", p.getPattern());
assertEquals("a{0}c", p.getRawPattern()); assertEquals("a{0}c", p.getRawPattern());
assertEquals(1, p.getParameterNames().size()); assertEquals(1, p.getParameterNames().size());
@@ -76,7 +76,7 @@ public class ParamertizedStringTest extends TestCase {
} }
public void testReplace3() { public void testReplace3() {
final ParamertizedString p = new ParamertizedString("a${bar}"); final ParameterizedString p = new ParameterizedString("a${bar}");
assertEquals("a${bar}", p.getPattern()); assertEquals("a${bar}", p.getPattern());
assertEquals("a{0}", p.getRawPattern()); assertEquals("a{0}", p.getRawPattern());
assertEquals(1, p.getParameterNames().size()); assertEquals(1, p.getParameterNames().size());
@@ -91,7 +91,7 @@ public class ParamertizedStringTest extends TestCase {
} }
public void testReplace4() { public void testReplace4() {
final ParamertizedString p = new ParamertizedString("a${bar}c"); final ParameterizedString p = new ParameterizedString("a${bar}c");
assertEquals("a${bar}c", p.getPattern()); assertEquals("a${bar}c", p.getPattern());
assertEquals("a{0}c", p.getRawPattern()); assertEquals("a{0}c", p.getRawPattern());
assertEquals(1, p.getParameterNames().size()); assertEquals(1, p.getParameterNames().size());
@@ -105,7 +105,7 @@ public class ParamertizedStringTest extends TestCase {
} }
public void testReplaceToLowerCase() { public void testReplaceToLowerCase() {
final ParamertizedString p = new ParamertizedString("${a.toLowerCase}"); final ParameterizedString p = new ParameterizedString("${a.toLowerCase}");
assertEquals(1, p.getParameterNames().size()); assertEquals(1, p.getParameterNames().size());
assertTrue(p.getParameterNames().contains("a")); assertTrue(p.getParameterNames().contains("a"));
@@ -125,7 +125,7 @@ public class ParamertizedStringTest extends TestCase {
} }
public void testReplaceToUpperCase() { public void testReplaceToUpperCase() {
final ParamertizedString p = new ParamertizedString("${a.toUpperCase}"); final ParameterizedString p = new ParameterizedString("${a.toUpperCase}");
assertEquals(1, p.getParameterNames().size()); assertEquals(1, p.getParameterNames().size());
assertTrue(p.getParameterNames().contains("a")); assertTrue(p.getParameterNames().contains("a"));
@@ -145,7 +145,7 @@ public class ParamertizedStringTest extends TestCase {
} }
public void testReplaceLocalName() { public void testReplaceLocalName() {
final ParamertizedString p = new ParamertizedString("${a.localPart}"); final ParameterizedString p = new ParameterizedString("${a.localPart}");
assertEquals(1, p.getParameterNames().size()); assertEquals(1, p.getParameterNames().size());
assertTrue(p.getParameterNames().contains("a")); assertTrue(p.getParameterNames().contains("a"));
@@ -165,7 +165,7 @@ public class ParamertizedStringTest extends TestCase {
} }
public void testUndefinedFunctionName() { public void testUndefinedFunctionName() {
ParamertizedString p = new ParamertizedString("${a.anUndefinedMethod}"); ParameterizedString p = new ParameterizedString("${a.anUndefinedMethod}");
assertEquals(1, p.getParameterNames().size()); assertEquals(1, p.getParameterNames().size());
assertTrue(p.getParameterNames().contains("a.anUndefinedMethod")); assertTrue(p.getParameterNames().contains("a.anUndefinedMethod"));
} }

14
gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java
View File

@@ -14,7 +14,7 @@
package com.google.gerrit.server.auth.ldap; package com.google.gerrit.server.auth.ldap;
import com.google.gerrit.common.data.ParamertizedString; import com.google.gerrit.common.data.ParameterizedString;
import com.google.gerrit.reviewdb.AccountGroup; import com.google.gerrit.reviewdb.AccountGroup;
import com.google.gerrit.server.account.AccountException; import com.google.gerrit.server.account.AccountException;
import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.account.GroupCache;
@@ -224,16 +224,16 @@ import javax.net.ssl.SSLSocketFactory;
class LdapSchema { class LdapSchema {
final LdapType type; final LdapType type;
final ParamertizedString accountFullName; final ParameterizedString accountFullName;
final ParamertizedString accountEmailAddress; final ParameterizedString accountEmailAddress;
final ParamertizedString accountSshUserName; final ParameterizedString accountSshUserName;
final String accountMemberField; final String accountMemberField;
final List<LdapQuery> accountQueryList; final List<LdapQuery> accountQueryList;
boolean groupNeedsAccount; boolean groupNeedsAccount;
final List<String> groupBases; final List<String> groupBases;
final SearchScope groupScope; final SearchScope groupScope;
final ParamertizedString groupPattern; final ParameterizedString groupPattern;
final List<LdapQuery> groupMemberQueryList; final List<LdapQuery> groupMemberQueryList;
LdapSchema(final DirContext ctx) { LdapSchema(final DirContext ctx) {
@@ -255,7 +255,7 @@ import javax.net.ssl.SSLSocketFactory;
for (String groupBase : groupBases) { for (String groupBase : groupBases) {
if (groupMemberPattern != null) { if (groupMemberPattern != null) {
final LdapQuery groupMemberQuery = final LdapQuery groupMemberQuery =
new LdapQuery(groupBase, groupScope, new ParamertizedString( new LdapQuery(groupBase, groupScope, new ParameterizedString(
groupMemberPattern), Collections.<String> emptySet()); groupMemberPattern), Collections.<String> emptySet());
if (groupMemberQuery.getParameters().isEmpty()) { if (groupMemberQuery.getParameters().isEmpty()) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
@@ -303,7 +303,7 @@ import javax.net.ssl.SSLSocketFactory;
for (String accountBase : LdapRealm.requiredList(config, "accountBase")) { for (String accountBase : LdapRealm.requiredList(config, "accountBase")) {
final LdapQuery accountQuery = final LdapQuery accountQuery =
new LdapQuery(accountBase, accountScope, new ParamertizedString( new LdapQuery(accountBase, accountScope, new ParameterizedString(
accountPattern), accountAtts); accountPattern), accountAtts);
if (accountQuery.getParameters().isEmpty()) { if (accountQuery.getParameters().isEmpty()) {
throw new IllegalArgumentException( throw new IllegalArgumentException(

6
gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapQuery.java
View File

@@ -14,7 +14,7 @@
package com.google.gerrit.server.auth.ldap; package com.google.gerrit.server.auth.ldap;
import com.google.gerrit.common.data.ParamertizedString; import com.google.gerrit.common.data.ParameterizedString;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@@ -38,11 +38,11 @@ class LdapQuery {
private final String base; private final String base;
private final SearchScope searchScope; private final SearchScope searchScope;
private final ParamertizedString pattern; private final ParameterizedString pattern;
private final String[] returnAttributes; private final String[] returnAttributes;
LdapQuery(final String base, final SearchScope searchScope, LdapQuery(final String base, final SearchScope searchScope,
final ParamertizedString pattern, final Set<String> returnAttributes) { final ParameterizedString pattern, final Set<String> returnAttributes) {
this.base = base; this.base = base;
this.searchScope = searchScope; this.searchScope = searchScope;

14
gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java
View File

@@ -16,7 +16,7 @@ package com.google.gerrit.server.auth.ldap;
import static com.google.gerrit.reviewdb.AccountExternalId.SCHEME_GERRIT; import static com.google.gerrit.reviewdb.AccountExternalId.SCHEME_GERRIT;
import com.google.gerrit.common.data.ParamertizedString; import com.google.gerrit.common.data.ParameterizedString;
import com.google.gerrit.reviewdb.Account; import com.google.gerrit.reviewdb.Account;
import com.google.gerrit.reviewdb.AccountExternalId; import com.google.gerrit.reviewdb.AccountExternalId;
import com.google.gerrit.reviewdb.AccountGroup; import com.google.gerrit.reviewdb.AccountGroup;
@@ -148,14 +148,14 @@ class LdapRealm implements Realm {
return v; return v;
} }
static ParamertizedString paramString(Config c, String n, String d) { static ParameterizedString paramString(Config c, String n, String d) {
String expression = optdef(c, n, d); String expression = optdef(c, n, d);
if (expression == null) { if (expression == null) {
return null; return null;
} else if (expression.contains("${")) { } else if (expression.contains("${")) {
return new ParamertizedString(expression); return new ParameterizedString(expression);
} else { } else {
return new ParamertizedString("${" + expression + "}"); return new ParameterizedString("${" + expression + "}");
} }
} }
@@ -164,7 +164,7 @@ class LdapRealm implements Realm {
return !readOnlyAccountFields.contains(field); return !readOnlyAccountFields.contains(field);
} }
private static String apply(ParamertizedString p, LdapQuery.Result m) private static String apply(ParameterizedString p, LdapQuery.Result m)
throws NamingException { throws NamingException {
if (p == null) { if (p == null) {
return null; return null;
@@ -273,8 +273,8 @@ class LdapRealm implements Realm {
final DirContext ctx = helper.open(); final DirContext ctx = helper.open();
try { try {
final LdapSchema schema = helper.getSchema(ctx); final LdapSchema schema = helper.getSchema(ctx);
final ParamertizedString filter = final ParameterizedString filter =
ParamertizedString.asis(schema.groupPattern ParameterizedString.asis(schema.groupPattern
.replace(GROUPNAME, name).toString()); .replace(GROUPNAME, name).toString());
for (String groupBase : schema.groupBases) { for (String groupBase : schema.groupBases) {
final LdapQuery query = final LdapQuery query =

10
gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java
View File

@@ -14,7 +14,7 @@
package com.google.gerrit.server.mail; package com.google.gerrit.server.mail;
import com.google.gerrit.common.data.ParamertizedString; import com.google.gerrit.common.data.ParameterizedString;
import com.google.gerrit.reviewdb.Account; import com.google.gerrit.reviewdb.Account;
import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.GerritPersonIdent;
import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountCache;
@@ -41,7 +41,7 @@ public class FromAddressGeneratorProvider implements
final Address srvAddr = toAddress(myIdent); final Address srvAddr = toAddress(myIdent);
if (from == null || "MIXED".equalsIgnoreCase(from)) { if (from == null || "MIXED".equalsIgnoreCase(from)) {
ParamertizedString name = new ParamertizedString("${user} (Code Review)"); ParameterizedString name = new ParameterizedString("${user} (Code Review)");
generator = new PatternGen(srvAddr, accountCache, name, srvAddr.email); generator = new PatternGen(srvAddr, accountCache, name, srvAddr.email);
} else if ("USER".equalsIgnoreCase(from)) { } else if ("USER".equalsIgnoreCase(from)) {
@@ -52,7 +52,7 @@ public class FromAddressGeneratorProvider implements
} else { } else {
final Address a = Address.parse(from); final Address a = Address.parse(from);
final ParamertizedString name = a.name != null ? new ParamertizedString(a.name) : null; final ParameterizedString name = a.name != null ? new ParameterizedString(a.name) : null;
if (name == null || name.getParameterNames().isEmpty()) { if (name == null || name.getParameterNames().isEmpty()) {
generator = new ServerGen(a); generator = new ServerGen(a);
} else { } else {
@@ -118,10 +118,10 @@ public class FromAddressGeneratorProvider implements
private final String senderEmail; private final String senderEmail;
private final Address serverAddress; private final Address serverAddress;
private final AccountCache accountCache; private final AccountCache accountCache;
private final ParamertizedString namePattern; private final ParameterizedString namePattern;
PatternGen(final Address serverAddress, final AccountCache accountCache, PatternGen(final Address serverAddress, final AccountCache accountCache,
final ParamertizedString namePattern, final String senderEmail) { final ParameterizedString namePattern, final String senderEmail) {
this.senderEmail = senderEmail; this.senderEmail = senderEmail;
this.serverAddress = serverAddress; this.serverAddress = serverAddress;
this.accountCache = accountCache; this.accountCache = accountCache;

6
gerrit-server/src/main/java/com/google/gerrit/server/project/SectionMatcher.java
View File

@@ -17,7 +17,7 @@ package com.google.gerrit.server.project;
import static com.google.gerrit.server.project.RefControl.isRE; import static com.google.gerrit.server.project.RefControl.isRE;
import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.AccessSection;
import com.google.gerrit.common.data.ParamertizedString; import com.google.gerrit.common.data.ParameterizedString;
import dk.brics.automaton.Automaton; import dk.brics.automaton.Automaton;
@@ -106,12 +106,12 @@ abstract class SectionMatcher {
} }
static class ExpandParameters extends SectionMatcher { static class ExpandParameters extends SectionMatcher {
private final ParamertizedString template; private final ParameterizedString template;
private final String prefix; private final String prefix;
ExpandParameters(String pattern, AccessSection section) { ExpandParameters(String pattern, AccessSection section) {
super(section); super(section);
template = new ParamertizedString(pattern); template = new ParameterizedString(pattern);
if (isRE(pattern)) { if (isRE(pattern)) {
// Replace ${username} with ":USERNAME:" as : is not legal // Replace ${username} with ":USERNAME:" as : is not legal