Author: lindner
Date: Sun Feb 6 05:39:07 2011
New Revision: 1067590
URL: http://svn.apache.org/viewvc?rev=1067590&view=rev
Log:
minor style fixes
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java?rev=1067590&r1=1067589&r2=1067590&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
Sun Feb 6 05:39:07 2011
@@ -56,13 +56,13 @@ public class AuthenticationServletFilter
public static final String AUTH_TYPE_OAUTH = "OAuth";
// At some point change this to a container specific realm
- private static final String realm = "shindig";
+ private static final String REALM = "shindig";
private List<AuthenticationHandler> handlers;
//class name for logging purpose
- private static final String classname =
AuthenticationServletFilter.class.getName();
- private static final Logger LOG = Logger.getLogger(classname,
MessageKeys.MESSAGES);
+ private static final String CLASSNAME =
AuthenticationServletFilter.class.getName();
+ private static final Logger LOG = Logger.getLogger(CLASSNAME,
MessageKeys.MESSAGES);
@Inject
public void setAuthenticationHandlers(List<AuthenticationHandler> handlers) {
@@ -90,7 +90,7 @@ public class AuthenticationServletFilter
callChain(chain, req, resp);
return;
} else {
- String authHeader = handler.getWWWAuthenticateHeader(realm);
+ String authHeader = handler.getWWWAuthenticateHeader(REALM);
if (authHeader != null) {
resp.addHeader("WWW-Authenticate", authHeader);
}
@@ -103,7 +103,7 @@ public class AuthenticationServletFilter
Throwable cause = iae.getCause();
if (LOG.isLoggable(Level.INFO)) {
- LOG.logp(Level.INFO, classname, "doFilter",
MessageKeys.ERROR_PARSING_SECURE_TOKEN, cause);
+ LOG.logp(Level.INFO, CLASSNAME, "doFilter",
MessageKeys.ERROR_PARSING_SECURE_TOKEN, cause);
}
if (iae.getAdditionalHeaders() != null) {
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java?rev=1067590&r1=1067589&r2=1067590&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java
Sun Feb 6 05:39:07 2011
@@ -32,12 +32,12 @@ import java.util.Locale;
*/
public final class DateUtil {
- private static final DateTimeFormatter rfc1123DateFormat = DateTimeFormat
+ private static final DateTimeFormatter RFC1123_DATE_FORMAT = DateTimeFormat
.forPattern("EEE, dd MMM yyyy HH:mm:ss 'GMT'")
.withLocale(Locale.US)
.withZone(DateTimeZone.UTC);
- private static final DateTimeFormatter iso8601DateFormat =
ISODateTimeFormat.dateTime()
+ private static final DateTimeFormatter ISO8601_DATE_FORMAT =
ISODateTimeFormat.dateTime()
.withZone(DateTimeZone.UTC);
private DateUtil() {}
@@ -51,7 +51,7 @@ public final class DateUtil {
*/
public static Date parseRfc1123Date(String dateStr) {
try {
- return rfc1123DateFormat.parseDateTime(dateStr).toDate();
+ return RFC1123_DATE_FORMAT.parseDateTime(dateStr).toDate();
} catch (Exception e) {
// Don't care.
return null;
@@ -85,7 +85,7 @@ public final class DateUtil {
* Formats an ISO 8601 format date.
*/
public static String formatIso8601Date(long time) {
- return iso8601DateFormat.print(time);
+ return ISO8601_DATE_FORMAT.print(time);
}
/**
@@ -99,7 +99,7 @@ public final class DateUtil {
* Formats an RFC 1123 format date.
*/
public static String formatRfc1123Date(long timeStamp) {
- return rfc1123DateFormat.print(timeStamp);
+ return RFC1123_DATE_FORMAT.print(timeStamp);
}
}
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java?rev=1067590&r1=1067589&r2=1067590&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
Sun Feb 6 05:39:07 2011
@@ -43,10 +43,11 @@ import javax.xml.parsers.ParserConfigura
* loading of external files (xinclude, external entities, DTDs, etc.) are
disabled.
*/
public final class XmlUtil {
- private static final String classname = XmlUtil.class.getName();
- private static final Logger LOG = Logger.getLogger(classname,
MessageKeys.MESSAGES);
+ private static final String CLASSNAME = XmlUtil.class.getName();
+ private static final Logger LOG = Logger.getLogger(CLASSNAME,
MessageKeys.MESSAGES);
+
// Handles xml errors so that they're not logged to stderr.
- private static final ErrorHandler errorHandler = new ErrorHandler() {
+ private static final ErrorHandler ERROR_HANDLER = new ErrorHandler() {
public void error(SAXParseException exception) throws SAXException {
throw exception;
}
@@ -55,24 +56,24 @@ public final class XmlUtil {
}
public void warning(SAXParseException exception) {
if (LOG.isLoggable(Level.INFO)) {
- LOG.logp(Level.INFO, classname, "warning",
MessageKeys.ERROR_PARSING_XML, exception);
+ LOG.logp(Level.INFO, CLASSNAME, "warning",
MessageKeys.ERROR_PARSING_XML, exception);
}
}
};
private static boolean canReuseBuilders = false;
- private static final DocumentBuilderFactory builderFactory
+ private static final DocumentBuilderFactory BUILDER_FACTORY
= DocumentBuilderFactory.newInstance();
- private static final ThreadLocal<DocumentBuilder> reusableBuilder
+ private static final ThreadLocal<DocumentBuilder> REUSABLE_BUILDER
= new ThreadLocal<DocumentBuilder>() {
@Override
protected DocumentBuilder initialValue() {
try {
if (LOG.isLoggable(Level.FINE))
LOG.fine("Created a new document builder");
- return builderFactory.newDocumentBuilder();
+ return BUILDER_FACTORY.newDocumentBuilder();
} catch (ParserConfigurationException e) {
throw new RuntimeException(e);
}
@@ -81,70 +82,70 @@ public final class XmlUtil {
static {
// Namespace support is required for <os:> elements
- builderFactory.setNamespaceAware(true);
+ BUILDER_FACTORY.setNamespaceAware(true);
// Disable various insecure and/or expensive options.
- builderFactory.setValidating(false);
+ BUILDER_FACTORY.setValidating(false);
// Can't disable doctypes entirely because they're usually harmless.
External entity
// resolution, however, is both expensive and insecure.
try {
- builderFactory.setAttribute(
+ BUILDER_FACTORY.setAttribute(
"http://xml.org/sax/features/external-general-entities";, false);
} catch (IllegalArgumentException e) {
// Not supported by some very old parsers.
if (LOG.isLoggable(Level.INFO)) {
- LOG.logp(Level.INFO, classname, "static block",
MessageKeys.ERROR_PARSING_EXTERNAL_ENTITIES);
+ LOG.logp(Level.INFO, CLASSNAME, "static block",
MessageKeys.ERROR_PARSING_EXTERNAL_ENTITIES);
}
}
try {
- builderFactory.setAttribute(
+ BUILDER_FACTORY.setAttribute(
"http://xml.org/sax/features/external-parameter-entities";, false);
} catch (IllegalArgumentException e) {
// Not supported by some very old parsers.
if (LOG.isLoggable(Level.INFO)) {
- LOG.logp(Level.INFO, classname, "static block",
MessageKeys.ERROR_PARSING_EXTERNAL_ENTITIES);
+ LOG.logp(Level.INFO, CLASSNAME, "static block",
MessageKeys.ERROR_PARSING_EXTERNAL_ENTITIES);
}
}
try {
- builderFactory.setAttribute(
+ BUILDER_FACTORY.setAttribute(
"http://apache.org/xml/features/nonvalidating/load-external-dtd";,
false);
} catch (IllegalArgumentException e) {
// Only supported by Apache's XML parsers.
if (LOG.isLoggable(Level.INFO)) {
- LOG.logp(Level.INFO, classname, "static block",
MessageKeys.ERROR_PARSING_EXTERNAL_DTD);
+ LOG.logp(Level.INFO, CLASSNAME, "static block",
MessageKeys.ERROR_PARSING_EXTERNAL_DTD);
}
}
try {
- builderFactory.setAttribute(XMLConstants.FEATURE_SECURE_PROCESSING,
true);
+ BUILDER_FACTORY.setAttribute(XMLConstants.FEATURE_SECURE_PROCESSING,
true);
} catch (IllegalArgumentException e) {
// Not supported by older parsers.
if (LOG.isLoggable(Level.INFO)) {
- LOG.logp(Level.INFO, classname, "static block",
MessageKeys.ERROR_PARSING_SECURE_XML);
+ LOG.logp(Level.INFO, CLASSNAME, "static block",
MessageKeys.ERROR_PARSING_SECURE_XML);
}
}
try {
- DocumentBuilder builder = builderFactory.newDocumentBuilder();
+ DocumentBuilder builder = BUILDER_FACTORY.newDocumentBuilder();
builder.reset();
canReuseBuilders = true;
if (LOG.isLoggable(Level.INFO)) {
- LOG.logp(Level.INFO, classname, "static block",
MessageKeys.REUSE_DOC_BUILDERS);
+ LOG.logp(Level.INFO, CLASSNAME, "static block",
MessageKeys.REUSE_DOC_BUILDERS);
}
} catch (UnsupportedOperationException e) {
// Only supported by newer parsers (xerces 2.8.x+ for instance).
canReuseBuilders = false;
if (LOG.isLoggable(Level.INFO)) {
- LOG.logp(Level.INFO, classname, "static block",
MessageKeys.NOT_REUSE_DOC_BUILDERS);
+ LOG.logp(Level.INFO, CLASSNAME, "static block",
MessageKeys.NOT_REUSE_DOC_BUILDERS);
}
} catch (ParserConfigurationException e) {
// Only supported by newer parsers (xerces 2.8.x+ for instance).
canReuseBuilders = false;
if (LOG.isLoggable(Level.INFO)) {
- LOG.logp(Level.INFO, classname, "static block",
MessageKeys.NOT_REUSE_DOC_BUILDERS);
+ LOG.logp(Level.INFO, CLASSNAME, "static block",
MessageKeys.NOT_REUSE_DOC_BUILDERS);
}
}
}
@@ -297,12 +298,12 @@ public final class XmlUtil {
private static DocumentBuilder getBuilder() throws
ParserConfigurationException {
DocumentBuilder builder;
if (canReuseBuilders) {
- builder = reusableBuilder.get();
+ builder = REUSABLE_BUILDER.get();
builder.reset();
} else {
- builder = builderFactory.newDocumentBuilder();
+ builder = BUILDER_FACTORY.newDocumentBuilder();
}
- builder.setErrorHandler(errorHandler);
+ builder.setErrorHandler(ERROR_HANDLER);
return builder;
}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java?rev=1067590&r1=1067589&r2=1067590&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
Sun Feb 6 05:39:07 2011
@@ -87,7 +87,7 @@ public class GadgetsHandlerService {
// Map shindig data class to API interfaces
@VisibleForTesting
- static final Map<Class<?>, Class<?>> apiClasses =
+ static final Map<Class<?>, Class<?>> API_CLASSES =
new ImmutableMap.Builder<Class<?>, Class<?>>()
.put(View.class, GadgetsHandlerApi.View.class)
.put(UserPref.class, GadgetsHandlerApi.UserPref.class)
@@ -103,7 +103,7 @@ public class GadgetsHandlerService {
// Provide mapping for internal enums to api enums
@VisibleForTesting
- static final Map<Enum<?>, Enum<?>> enumConversionMap =
+ static final Map<Enum<?>, Enum<?>> ENUM_CONVERSION_MAP =
new ImmutableMap.Builder<Enum<?>, Enum<?>>()
// View.ContentType mapping
.putAll(BeanDelegator.createDefaultEnumMap(View.ContentType.class,
@@ -147,7 +147,7 @@ public class GadgetsHandlerService {
this.beanFilter = beanFilter;
this.cajaContentRewriter = cajaContentRewriter;
- this.beanDelegator = new BeanDelegator(apiClasses, enumConversionMap);
+ this.beanDelegator = new BeanDelegator(API_CLASSES, ENUM_CONVERSION_MAP);
}
/**
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java?rev=1067590&r1=1067589&r2=1067590&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java
Sun Feb 6 05:39:07 2011
@@ -39,7 +39,7 @@ import java.util.Map;
public class MessageBundle {
public static final MessageBundle EMPTY = new MessageBundle();
- private static final DefaultHtmlSerializer htmlSerializer = new
DefaultHtmlSerializer();
+ private static final DefaultHtmlSerializer HTML_SERIALIZER = new
DefaultHtmlSerializer();
private final ImmutableMap<String, String> messages;
private final String languageDirection;
@@ -162,7 +162,7 @@ public class MessageBundle {
// Workaround to treat CDATA as text.
sw.append(msgChildren.item(child).getTextContent());
} else {
- htmlSerializer.serialize(msgChildren.item(child), sw);
+ HTML_SERIALIZER.serialize(msgChildren.item(child), sw);
}
} catch (IOException e) {
throw new SpecParserException("Unexpected error getting value of msg
node",
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java?rev=1067590&r1=1067589&r2=1067590&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java
Sun Feb 6 05:39:07 2011
@@ -69,7 +69,7 @@ public class GadgetsHandlerServiceTest e
private static final String FALLBACK = "http://example.com/data2";;
private final BeanDelegator delegator = new BeanDelegator(
- GadgetsHandlerService.apiClasses, GadgetsHandlerService.enumConversionMap);
+ GadgetsHandlerService.API_CLASSES,
GadgetsHandlerService.ENUM_CONVERSION_MAP);
private final FakeTimeSource timeSource = new
FakeTimeSource(CURRENT_TIME_MS);
private final FeatureRegistry mockRegistry = mock(FeatureRegistry.class);
