diff options
author | 2015-06-08 12:49:58 +0000 | |
---|---|---|
committer | 2015-06-08 15:36:04 +0000 | |
commit | 466b6d1cd2eefeb870d6b2de1e07c20eecdf4315 (patch) | |
tree | 5c425a93d5cf71dc7fa7749fe8aa938054b44223 /src/main/java/com/google | |
parent | 988da682d87bc90cc1fef3cc09a7ef14f2d88c5a (diff) |
Revert maven/Rule to a plain vanilla class (instead of an AutoValue one)
--
MOS_MIGRATED_REVID=95431414
Diffstat (limited to 'src/main/java/com/google')
-rw-r--r-- | src/main/java/com/google/devtools/build/workspace/maven/Resolver.java | 2 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/workspace/maven/Rule.java | 29 |
2 files changed, 21 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/workspace/maven/Resolver.java b/src/main/java/com/google/devtools/build/workspace/maven/Resolver.java index 2f79cf1e0f..58cd6cc923 100644 --- a/src/main/java/com/google/devtools/build/workspace/maven/Resolver.java +++ b/src/main/java/com/google/devtools/build/workspace/maven/Resolver.java @@ -84,7 +84,7 @@ public class Resolver { } for (org.apache.maven.model.Dependency dependency : model.getDependencies()) { - Rule rule = Rule.create( + Rule rule = new Rule( dependency.getArtifactId(), dependency.getGroupId(), dependency.getVersion()); if (deps.containsKey(rule.name())) { Rule existingDependency = deps.get(rule.name()); diff --git a/src/main/java/com/google/devtools/build/workspace/maven/Rule.java b/src/main/java/com/google/devtools/build/workspace/maven/Rule.java index 3c680dfe07..33a78eb31b 100644 --- a/src/main/java/com/google/devtools/build/workspace/maven/Rule.java +++ b/src/main/java/com/google/devtools/build/workspace/maven/Rule.java @@ -14,20 +14,31 @@ package com.google.devtools.build.workspace.maven; -import com.google.auto.value.AutoValue; - /** * A struct representing the fields of maven_jar to be written to the WORKSPACE file. */ -@AutoValue -public abstract class Rule { - static Rule create(String artifactId, String groupId, String version) { - return new AutoValue_Rule(artifactId, groupId, version); +public final class Rule { + private final String artifactId; + private final String groupId; + private final String version; + + public Rule(String artifactId, String groupId, String version) { + this.artifactId = artifactId; + this.groupId = groupId; + this.version = version; + } + + public String artifactId() { + return artifactId; } - abstract String artifactId(); - abstract String groupId(); - abstract String version(); + public String groupId() { + return groupId; + } + + public String version() { + return version; + } String name() { return (groupId() + "/" + artifactId()).replaceAll("\\.", "/"); |