package org.opendaylight.yangtools.yang.model.util;
import com.google.common.base.MoreObjects;
-import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import java.util.Objects;
+import java.util.Optional;
import org.opendaylight.yangtools.concepts.Immutable;
import org.opendaylight.yangtools.yang.model.api.type.ModifierKind;
import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
private final ModifierKind modifier;
PatternConstraintImpl(final String regex, final Optional<String> description, final Optional<String> reference) {
- this(regex, description, reference, null, null, Optional.absent());
+ this(regex, description, reference, null, null, Optional.empty());
}
PatternConstraintImpl(final String regex, final Optional<String> description, final Optional<String> reference,
final String errorAppTag, final String errorMessage, final Optional<ModifierKind> modifier) {
this.regex = Preconditions.checkNotNull(regex, "regex must not be null.");
- this.description = description.orNull();
- this.reference = reference.orNull();
+ this.description = description.orElse(null);
+ this.reference = reference.orElse(null);
this.errorAppTag = errorAppTag != null ? errorAppTag : "invalid-regular-expression";
this.errorMessage = errorMessage != null ? errorMessage : String.format(
"Supplied value does not match the regular expression %s.", regex);
- this.modifier = modifier.orNull();
+ this.modifier = modifier.orElse(null);
}
@Override
- public String getDescription() {
- return description;
+ public Optional<String> getDescription() {
+ return Optional.ofNullable(description);
}
@Override
- public String getErrorAppTag() {
- return errorAppTag;
+ public Optional<String> getErrorAppTag() {
+ return Optional.ofNullable(errorAppTag);
}
@Override
- public String getErrorMessage() {
- return errorMessage;
+ public Optional<String> getErrorMessage() {
+ return Optional.ofNullable(errorMessage);
}
@Override
- public String getReference() {
- return reference;
+ public Optional<String> getReference() {
+ return Optional.ofNullable(reference);
}
@Override
- public String getRegularExpression() {
+ public String getJavaPatternString() {
return regex;
}
+ @Override
+ public String getRegularExpressionString() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Optional<ModifierKind> getModifier() {
+ return Optional.ofNullable(modifier);
+ }
+
@Override
public int hashCode() {
return Objects.hash(description, errorAppTag, errorMessage, reference, regex, modifier);