aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/analysis
diff options
context:
space:
mode:
authorGravatar Ulf Adams <ulfjack@google.com>2016-04-19 11:32:24 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-04-19 13:51:07 +0000
commit83fce40e69ef35c90e69a57387b1f95b387ad453 (patch)
tree6a0acfb404629d0d8423217b89ca7b38ea9da2bb /src/main/java/com/google/devtools/build/lib/analysis
parent0dbe07f017d391aba0613b4e6ca1503b62382ccd (diff)
Review a number of action subclasses and update them according to the spec.
Second pass. Consists of adding @Immutable annotations, adding final modifiers, and changing the types of fields to immutable types. -- MOS_MIGRATED_REVID=120216592
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis')
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/PseudoAction.java1
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/SymlinkTreeAction.java4
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/actions/CreateIncSymlinkAction.java5
3 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/PseudoAction.java b/src/main/java/com/google/devtools/build/lib/analysis/PseudoAction.java
index c482f2e615..e0eb712597 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/PseudoAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/PseudoAction.java
@@ -35,7 +35,6 @@ import java.util.UUID;
* about rules to extra_actions.
*/
public class PseudoAction<InfoType extends MessageLite> extends AbstractAction {
-
private final UUID uuid;
private final String mnemonic;
private final GeneratedExtension<ExtraActionInfo, InfoType> infoExtension;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/SymlinkTreeAction.java b/src/main/java/com/google/devtools/build/lib/analysis/SymlinkTreeAction.java
index 0e98408a15..5ebe26f0eb 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/SymlinkTreeAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/SymlinkTreeAction.java
@@ -22,6 +22,7 @@ import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.Executor;
import com.google.devtools.build.lib.actions.ResourceSet;
+import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.util.Fingerprint;
import com.google.devtools.build.lib.util.Preconditions;
import com.google.devtools.build.lib.vfs.PathFragment;
@@ -32,7 +33,8 @@ import javax.annotation.Nullable;
* Action responsible for the symlink tree creation.
* Used to generate runfiles and fileset symlink farms.
*/
-public class SymlinkTreeAction extends AbstractAction {
+@Immutable
+public final class SymlinkTreeAction extends AbstractAction {
private static final String GUID = "63412bda-4026-4c8e-a3ad-7deb397728d4";
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/CreateIncSymlinkAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/CreateIncSymlinkAction.java
index f374dfff9d..06d353dfc1 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/CreateIncSymlinkAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/CreateIncSymlinkAction.java
@@ -25,6 +25,7 @@ import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.Executor;
import com.google.devtools.build.lib.actions.ResourceSet;
+import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.util.Fingerprint;
import com.google.devtools.build.lib.vfs.Path;
@@ -35,9 +36,9 @@ import java.util.SortedMap;
/**
* This action creates a set of symbolic links.
*/
+@Immutable
public final class CreateIncSymlinkAction extends AbstractAction {
-
- private final SortedMap<Artifact, Artifact> symlinks;
+ private final ImmutableSortedMap<Artifact, Artifact> symlinks;
/**
* Creates a new instance. The symlinks map maps symlinks to their targets, i.e. the symlink paths