Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Split out TransactionContext classes
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
identifiers
/
ShardIdentifier.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifier.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifier.java
index d65af61ba3f8a957b6f67bdc355035fa93297431..5053d47f84e6fff6f0ab8aa33521dc23fbf45e4d 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifier.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifier.java
@@
-9,19
+9,18
@@
package org.opendaylight.controller.cluster.datastore.identifiers;
import com.google.common.base.Preconditions;
package org.opendaylight.controller.cluster.datastore.identifiers;
import com.google.common.base.Preconditions;
-
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class ShardIdentifier {
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class ShardIdentifier {
+ // This pattern needs to remain in sync with toString(), which produces
+ // strings with corresponding to "%s-shard-%s-%s"
+ private static final Pattern PATTERN = Pattern.compile("(\\S+)-shard-(\\S+)-(\\S+)");
+
private final String shardName;
private final String memberName;
private final String type;
private final String shardName;
private final String memberName;
private final String type;
- //format and pattern should be in sync
- private final String format = "%s-shard-%s-%s";
- private static final Pattern pattern = Pattern.compile("(\\S+)-shard-(\\S+)-(\\S+)");
-
public ShardIdentifier(String shardName, String memberName, String type) {
Preconditions.checkNotNull(shardName, "shardName should not be null");
public ShardIdentifier(String shardName, String memberName, String type) {
Preconditions.checkNotNull(shardName, "shardName should not be null");
@@
-116,7
+115,7
@@
public class ShardIdentifier {
}
public Builder fromShardIdString(String shardId){
}
public Builder fromShardIdString(String shardId){
- Matcher matcher =
pattern
.matcher(shardId);
+ Matcher matcher =
PATTERN
.matcher(shardId);
if (matcher.matches()) {
memberName = matcher.group(1);
if (matcher.matches()) {
memberName = matcher.group(1);