HBASE-12519 Remove tabs used as whitespace (Varun Saxena)

This commit is contained in:
stack 2014-11-28 20:50:02 -08:00
parent eb4c194a87
commit 58b6b24c29
64 changed files with 810 additions and 834 deletions

View File

@ -98,8 +98,7 @@ class RootDocProcessor {
} }
@Override @Override
public Object invoke(Object proxy, Method method, Object[] args) public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
throws Throwable {
String methodName = method.getName(); String methodName = method.getName();
if (target instanceof Doc) { if (target instanceof Doc) {
if (methodName.equals("isIncluded")) { if (methodName.equals("isIncluded")) {
@ -121,47 +120,37 @@ class RootDocProcessor {
} else if (methodName.equals("fields")) { } else if (methodName.equals("fields")) {
return filter(((ClassDoc) target).fields(true), FieldDoc.class); return filter(((ClassDoc) target).fields(true), FieldDoc.class);
} else if (methodName.equals("innerClasses")) { } else if (methodName.equals("innerClasses")) {
return filter(((ClassDoc) target).innerClasses(true), return filter(((ClassDoc) target).innerClasses(true), ClassDoc.class);
ClassDoc.class);
} else if (methodName.equals("constructors")) { } else if (methodName.equals("constructors")) {
return filter(((ClassDoc) target).constructors(true), return filter(((ClassDoc) target).constructors(true), ConstructorDoc.class);
ConstructorDoc.class);
} }
} }
} else if (target instanceof PackageDoc) { } else if (target instanceof PackageDoc) {
if (methodName.equals("allClasses")) { if (methodName.equals("allClasses")) {
if (isFiltered(args)) { if (isFiltered(args)) {
return filter(((PackageDoc) target).allClasses(true), return filter(((PackageDoc) target).allClasses(true), ClassDoc.class);
ClassDoc.class);
} else { } else {
return filter(((PackageDoc) target).allClasses(), ClassDoc.class); return filter(((PackageDoc) target).allClasses(), ClassDoc.class);
} }
} else if (methodName.equals("annotationTypes")) { } else if (methodName.equals("annotationTypes")) {
return filter(((PackageDoc) target).annotationTypes(), return filter(((PackageDoc) target).annotationTypes(), AnnotationTypeDoc.class);
AnnotationTypeDoc.class);
} else if (methodName.equals("enums")) { } else if (methodName.equals("enums")) {
return filter(((PackageDoc) target).enums(), return filter(((PackageDoc) target).enums(), ClassDoc.class);
ClassDoc.class);
} else if (methodName.equals("errors")) { } else if (methodName.equals("errors")) {
return filter(((PackageDoc) target).errors(), return filter(((PackageDoc) target).errors(), ClassDoc.class);
ClassDoc.class);
} else if (methodName.equals("exceptions")) { } else if (methodName.equals("exceptions")) {
return filter(((PackageDoc) target).exceptions(), return filter(((PackageDoc) target).exceptions(), ClassDoc.class);
ClassDoc.class);
} else if (methodName.equals("interfaces")) { } else if (methodName.equals("interfaces")) {
return filter(((PackageDoc) target).interfaces(), return filter(((PackageDoc) target).interfaces(), ClassDoc.class);
ClassDoc.class);
} else if (methodName.equals("ordinaryClasses")) { } else if (methodName.equals("ordinaryClasses")) {
return filter(((PackageDoc) target).ordinaryClasses(), return filter(((PackageDoc) target).ordinaryClasses(), ClassDoc.class);
ClassDoc.class);
} }
} }
} }
if (args != null) { if (args != null) {
if (methodName.equals("compareTo") || methodName.equals("equals") if (methodName.equals("compareTo") || methodName.equals("equals")
|| methodName.equals("overrides") || methodName.equals("overrides") || methodName.equals("subclassOf")) {
|| methodName.equals("subclassOf")) {
args[0] = unwrap(args[0]); args[0] = unwrap(args[0]);
} }
} }
@ -182,32 +171,26 @@ class RootDocProcessor {
if (annotations != null) { if (annotations != null) {
for (AnnotationDesc annotation : annotations) { for (AnnotationDesc annotation : annotations) {
String qualifiedTypeName = annotation.annotationType().qualifiedTypeName(); String qualifiedTypeName = annotation.annotationType().qualifiedTypeName();
if (qualifiedTypeName.equals( if (qualifiedTypeName.equals(InterfaceAudience.Private.class.getCanonicalName())
InterfaceAudience.Private.class.getCanonicalName()) || qualifiedTypeName
|| qualifiedTypeName.equals( .equals(InterfaceAudience.LimitedPrivate.class.getCanonicalName())) {
InterfaceAudience.LimitedPrivate.class.getCanonicalName())) {
return true; return true;
} }
if (stability.equals(StabilityOptions.EVOLVING_OPTION)) { if (stability.equals(StabilityOptions.EVOLVING_OPTION)) {
if (qualifiedTypeName.equals( if (qualifiedTypeName.equals(InterfaceStability.Unstable.class.getCanonicalName())) {
InterfaceStability.Unstable.class.getCanonicalName())) {
return true; return true;
} }
} }
if (stability.equals(StabilityOptions.STABLE_OPTION)) { if (stability.equals(StabilityOptions.STABLE_OPTION)) {
if (qualifiedTypeName.equals( if (qualifiedTypeName.equals(InterfaceStability.Unstable.class.getCanonicalName())
InterfaceStability.Unstable.class.getCanonicalName()) || qualifiedTypeName.equals(InterfaceStability.Evolving.class.getCanonicalName())) {
|| qualifiedTypeName.equals(
InterfaceStability.Evolving.class.getCanonicalName())) {
return true; return true;
} }
} }
} }
for (AnnotationDesc annotation : annotations) { for (AnnotationDesc annotation : annotations) {
String qualifiedTypeName = String qualifiedTypeName = annotation.annotationType().qualifiedTypeName();
annotation.annotationType().qualifiedTypeName(); if (qualifiedTypeName.equals(InterfaceAudience.Public.class.getCanonicalName())) {
if (qualifiedTypeName.equals(
InterfaceAudience.Public.class.getCanonicalName())) {
return false; return false;
} }
} }
@ -228,20 +211,16 @@ class RootDocProcessor {
list.add(process(entry, componentType)); list.add(process(entry, componentType));
} }
} }
return list.toArray((Object[]) Array.newInstance(componentType, list return list.toArray((Object[]) Array.newInstance(componentType, list.size()));
.size()));
} }
private Object unwrap(Object proxy) { private Object unwrap(Object proxy) {
if (proxy instanceof Proxy) if (proxy instanceof Proxy) return ((ExcludeHandler) Proxy.getInvocationHandler(proxy)).target;
return ((ExcludeHandler) Proxy.getInvocationHandler(proxy)).target;
return proxy; return proxy;
} }
private boolean isFiltered(Object[] args) { private boolean isFiltered(Object[] args) {
return args != null && Boolean.TRUE.equals(args[0]); return args != null && Boolean.TRUE.equals(args[0]);
} }
} }
} }

View File

@ -35,8 +35,7 @@ class StabilityOptions {
return null; return null;
} }
public static void validOptions(String[][] options, public static void validOptions(String[][] options, DocErrorReporter reporter) {
DocErrorReporter reporter) {
for (int i = 0; i < options.length; i++) { for (int i = 0; i < options.length; i++) {
String opt = options[i][0].toLowerCase(); String opt = options[i][0].toLowerCase();
if (opt.equals(UNSTABLE_OPTION)) { if (opt.equals(UNSTABLE_OPTION)) {
@ -65,5 +64,4 @@ class StabilityOptions {
} }
return filteredOptions; return filteredOptions;
} }
} }

View File

@ -180,12 +180,11 @@ public class AggregationClient implements Closeable {
*/ */
private void validateParameters(Scan scan, boolean canFamilyBeAbsent) throws IOException { private void validateParameters(Scan scan, boolean canFamilyBeAbsent) throws IOException {
if (scan == null if (scan == null
|| (Bytes.equals(scan.getStartRow(), scan.getStopRow()) && !Bytes || (Bytes.equals(scan.getStartRow(), scan.getStopRow()) && !Bytes.equals(
.equals(scan.getStartRow(), HConstants.EMPTY_START_ROW)) scan.getStartRow(), HConstants.EMPTY_START_ROW))
|| ((Bytes.compareTo(scan.getStartRow(), scan.getStopRow()) > 0) && || ((Bytes.compareTo(scan.getStartRow(), scan.getStopRow()) > 0) && !Bytes.equals(
!Bytes.equals(scan.getStopRow(), HConstants.EMPTY_END_ROW))) { scan.getStopRow(), HConstants.EMPTY_END_ROW))) {
throw new IOException( throw new IOException("Agg client Exception: Startrow should be smaller than Stoprow");
"Agg client Exception: Startrow should be smaller than Stoprow");
} else if (!canFamilyBeAbsent) { } else if (!canFamilyBeAbsent) {
if (scan.getFamilyMap().size() != 1) { if (scan.getFamilyMap().size() != 1) {
throw new IOException("There must be only one family."); throw new IOException("There must be only one family.");