From 64d9a7c139245722c64cdff5755c4acce7fe3554 Mon Sep 17 00:00:00 2001 From: tbreisacher Date: Wed, 19 Apr 2017 17:40:51 -0700 Subject: [PATCH] Automated rollback. *** Original change description *** Annotate CodingConvention as immutable since it's used in an enum. *** ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=153657935 --- .../google/javascript/jscomp/ChromeCodingConvention.java | 7 +++---- .../google/javascript/jscomp/ClosureCodingConvention.java | 7 +++---- src/com/google/javascript/jscomp/CodingConvention.java | 2 -- src/com/google/javascript/jscomp/CodingConventions.java | 3 --- .../google/javascript/jscomp/GoogleCodingConvention.java | 4 +--- 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/com/google/javascript/jscomp/ChromeCodingConvention.java b/src/com/google/javascript/jscomp/ChromeCodingConvention.java index 31b84ada1ea..59c857d6bda 100644 --- a/src/com/google/javascript/jscomp/ChromeCodingConvention.java +++ b/src/com/google/javascript/jscomp/ChromeCodingConvention.java @@ -17,16 +17,15 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.errorprone.annotations.Immutable; import com.google.javascript.jscomp.ClosureCodingConvention.AssertInstanceofSpec; import com.google.javascript.rhino.Node; import com.google.javascript.rhino.jstype.FunctionType; import com.google.javascript.rhino.jstype.ObjectType; import java.util.Collection; +import java.util.Set; -@Immutable -public final class ChromeCodingConvention extends CodingConventions.Proxy { - private final ImmutableSet indirectlyDeclaredProperties; +public class ChromeCodingConvention extends CodingConventions.Proxy { + private final Set indirectlyDeclaredProperties; public ChromeCodingConvention() { this(CodingConventions.getDefault()); diff --git a/src/com/google/javascript/jscomp/ClosureCodingConvention.java b/src/com/google/javascript/jscomp/ClosureCodingConvention.java index b4b0285f585..d3e0417ae80 100644 --- a/src/com/google/javascript/jscomp/ClosureCodingConvention.java +++ b/src/com/google/javascript/jscomp/ClosureCodingConvention.java @@ -19,7 +19,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.errorprone.annotations.Immutable; import com.google.javascript.jscomp.newtypes.DeclaredTypeRegistry; import com.google.javascript.jscomp.newtypes.JSType; import com.google.javascript.jscomp.newtypes.QualifiedName; @@ -33,12 +32,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Set; /** * This describes the Closure-specific JavaScript coding conventions. * */ -@Immutable public final class ClosureCodingConvention extends CodingConventions.Proxy { private static final long serialVersionUID = 1L; @@ -47,7 +46,7 @@ public final class ClosureCodingConvention extends CodingConventions.Proxy { "JSC_REFLECT_OBJECTLIT_EXPECTED", "Object literal expected as second argument"); - private final ImmutableSet indirectlyDeclaredProperties; + private final Set indirectlyDeclaredProperties; public ClosureCodingConvention() { this(CodingConventions.getDefault()); @@ -346,7 +345,7 @@ public boolean isAliasingGlobalThis(Node n) { return CodingConventions.isAliasingGlobalThis(this, n); } - private final ImmutableSet propertyTestFunctions = ImmutableSet.of( + private final Set propertyTestFunctions = ImmutableSet.of( "goog.isDef", "goog.isNull", "goog.isDefAndNotNull", "goog.isString", "goog.isNumber", "goog.isBoolean", "goog.isFunction", "goog.isArray", "goog.isArrayLike", "goog.isObject"); diff --git a/src/com/google/javascript/jscomp/CodingConvention.java b/src/com/google/javascript/jscomp/CodingConvention.java index fa08d172de6..1ff54d5be48 100644 --- a/src/com/google/javascript/jscomp/CodingConvention.java +++ b/src/com/google/javascript/jscomp/CodingConvention.java @@ -15,7 +15,6 @@ */ package com.google.javascript.jscomp; -import com.google.errorprone.annotations.Immutable; import com.google.javascript.jscomp.newtypes.DeclaredTypeRegistry; import com.google.javascript.jscomp.newtypes.JSType; import com.google.javascript.jscomp.newtypes.RawNominalType; @@ -36,7 +35,6 @@ * Compiler for a specific team/company. * */ -@Immutable public interface CodingConvention extends Serializable { /** diff --git a/src/com/google/javascript/jscomp/CodingConventions.java b/src/com/google/javascript/jscomp/CodingConventions.java index 3382322cdea..79c86eddf30 100644 --- a/src/com/google/javascript/jscomp/CodingConventions.java +++ b/src/com/google/javascript/jscomp/CodingConventions.java @@ -18,7 +18,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import com.google.errorprone.annotations.Immutable; import com.google.javascript.jscomp.newtypes.JSType; import com.google.javascript.jscomp.newtypes.RawNominalType; import com.google.javascript.rhino.Node; @@ -84,7 +83,6 @@ static boolean isAliasingGlobalThis(CodingConvention convention, Node n) { * coding convention by creating a jQueryCodingConvention that delegates * to a ClosureCodingConvention that delegates to a DefaultCodingConvention. */ - @Immutable public static class Proxy implements CodingConvention { protected final CodingConvention nextConvention; @@ -332,7 +330,6 @@ public Collection getIndirectlyDeclaredProperties() { * The default coding convention. * Should be at the bottom of all proxy chains. */ - @Immutable private static class DefaultCodingConvention implements CodingConvention { private static final long serialVersionUID = 1L; diff --git a/src/com/google/javascript/jscomp/GoogleCodingConvention.java b/src/com/google/javascript/jscomp/GoogleCodingConvention.java index 6cb2068e911..b543fd9f0f9 100644 --- a/src/com/google/javascript/jscomp/GoogleCodingConvention.java +++ b/src/com/google/javascript/jscomp/GoogleCodingConvention.java @@ -16,7 +16,6 @@ package com.google.javascript.jscomp; -import com.google.errorprone.annotations.Immutable; import com.google.javascript.rhino.Node; import com.google.javascript.rhino.StaticSourceFile; import java.util.regex.Matcher; @@ -27,8 +26,7 @@ * Within Google, variable names are semantically significant. * */ -@Immutable -public final class GoogleCodingConvention extends CodingConventions.Proxy { +public class GoogleCodingConvention extends CodingConventions.Proxy { private static final long serialVersionUID = 1L;