*/
package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
+import static org.opendaylight.yangtools.yang.common.YangConstants.RFC6020_YANG_NAMESPACE;
+import static org.opendaylight.yangtools.yang.common.YangConstants.YANG_XPATH_FUNCTIONS_PREFIX;
import static org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils.firstAttributeOf;
import com.google.common.base.CharMatcher;
-import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableBiMap;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMap.Builder;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
import javax.annotation.Nullable;
+import javax.annotation.RegEx;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.QNameModule;
import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
+import org.opendaylight.yangtools.yang.common.YangVersion;
import org.opendaylight.yangtools.yang.model.api.DeviateKind;
import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
-import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping;
-import org.opendaylight.yangtools.yang.model.api.Status;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
import org.opendaylight.yangtools.yang.model.api.stmt.BelongsToStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.ModuleStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.RevisionStatement;
import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
import org.opendaylight.yangtools.yang.model.util.RevisionAwareXPathImpl;
+import org.opendaylight.yangtools.yang.parser.spi.meta.CopyType;
+import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException;
import org.opendaylight.yangtools.yang.parser.spi.meta.QNameCacheNamespace;
import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
import org.opendaylight.yangtools.yang.parser.spi.source.ModuleCtxToModuleQName;
import org.opendaylight.yangtools.yang.parser.spi.source.ModuleIdentifierToModuleQName;
import org.opendaylight.yangtools.yang.parser.spi.source.ModuleNameToModuleQName;
-import org.opendaylight.yangtools.yang.parser.spi.source.PrefixToModule;
-import org.opendaylight.yangtools.yang.parser.spi.source.QNameToStatementDefinition;
import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
+import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference;
import org.opendaylight.yangtools.yang.parser.stmt.reactor.RootStatementContext;
import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public final class Utils {
- private static final int UNICODE_SCRIPT_FIX_COUNTER = 30;
private static final Logger LOG = LoggerFactory.getLogger(Utils.class);
private static final CharMatcher LEFT_PARENTHESIS_MATCHER = CharMatcher.is('(');
private static final CharMatcher RIGHT_PARENTHESIS_MATCHER = CharMatcher.is(')');
private static final Splitter SPACE_SPLITTER = Splitter.on(' ').omitEmptyStrings().trimResults();
private static final Splitter COLON_SPLITTER = Splitter.on(":").omitEmptyStrings().trimResults();
private static final Pattern PATH_ABS = Pattern.compile("/[^/].*");
- private static final Pattern BETWEEN_CURLY_BRACES_PATTERN = Pattern.compile("\\{(.+?)\\}");
- private static final Set<String> JAVA_UNICODE_BLOCKS = ImmutableSet.<String>builder()
- .add("AegeanNumbers")
- .add("AlchemicalSymbols")
- .add("AlphabeticPresentationForms")
- .add("AncientGreekMusicalNotation")
- .add("AncientGreekNumbers")
- .add("AncientSymbols")
- .add("Arabic")
- .add("ArabicPresentationForms-A")
- .add("ArabicPresentationForms-B")
- .add("ArabicSupplement")
- .add("Armenian")
- .add("Arrows")
- .add("Avestan")
- .add("Balinese")
- .add("Bamum")
- .add("BamumSupplement")
- .add("BasicLatin")
- .add("Batak")
- .add("Bengali")
- .add("BlockElements")
- .add("Bopomofo")
- .add("BopomofoExtended")
- .add("BoxDrawing")
- .add("Brahmi")
- .add("BraillePatterns")
- .add("Buginese")
- .add("Buhid")
- .add("ByzantineMusicalSymbols")
- .add("Carian")
- .add("Cham")
- .add("Cherokee")
- .add("CJKCompatibility")
- .add("CJKCompatibilityForms")
- .add("CJKCompatibilityIdeographs")
- .add("CJKCompatibilityIdeographsSupplement")
- .add("CJKRadicalsSupplement")
- .add("CJKStrokes")
- .add("CJKSymbolsandPunctuation")
- .add("CJKUnifiedIdeographs")
- .add("CJKUnifiedIdeographsExtensionA")
- .add("CJKUnifiedIdeographsExtensionB")
- .add("CJKUnifiedIdeographsExtensionC")
- .add("CJKUnifiedIdeographsExtensionD")
- .add("CombiningDiacriticalMarks")
- .add("CombiningDiacriticalMarksSupplement")
- .add("CombiningHalfMarks")
- .add("CombiningDiacriticalMarksforSymbols")
- .add("CommonIndicNumberForms")
- .add("ControlPictures")
- .add("Coptic")
- .add("CountingRodNumerals")
- .add("Cuneiform")
- .add("CuneiformNumbersandPunctuation")
- .add("CurrencySymbols")
- .add("CypriotSyllabary")
- .add("Cyrillic")
- .add("CyrillicExtended-A")
- .add("CyrillicExtended-B")
- .add("CyrillicSupplementary")
- .add("Deseret")
- .add("Devanagari")
- .add("DevanagariExtended")
- .add("Dingbats")
- .add("DominoTiles")
- .add("EgyptianHieroglyphs")
- .add("Emoticons")
- .add("EnclosedAlphanumericSupplement")
- .add("EnclosedAlphanumerics")
- .add("EnclosedCJKLettersandMonths")
- .add("EnclosedIdeographicSupplement")
- .add("Ethiopic")
- .add("EthiopicExtended")
- .add("EthiopicExtended-A")
- .add("EthiopicSupplement")
- .add("GeneralPunctuation")
- .add("GeometricShapes")
- .add("Georgian")
- .add("GeorgianSupplement")
- .add("Glagolitic")
- .add("Gothic")
- .add("GreekandCoptic")
- .add("GreekExtended")
- .add("Gujarati")
- .add("Gurmukhi")
- .add("HalfwidthandFullwidthForms")
- .add("HangulCompatibilityJamo")
- .add("HangulJamo")
- .add("HangulJamoExtended-A")
- .add("HangulJamoExtended-B")
- .add("HangulSyllables")
- .add("Hanunoo")
- .add("Hebrew")
- .add("HighPrivateUseSurrogates")
- .add("HighSurrogates")
- .add("Hiragana")
- .add("IdeographicDescriptionCharacters")
- .add("ImperialAramaic")
- .add("InscriptionalPahlavi")
- .add("InscriptionalParthian")
- .add("IPAExtensions")
- .add("Javanese")
- .add("Kaithi")
- .add("KanaSupplement")
- .add("Kanbun")
- .add("Kangxi Radicals")
- .add("Kannada")
- .add("Katakana")
- .add("KatakanaPhoneticExtensions")
- .add("KayahLi")
- .add("Kharoshthi")
- .add("Khmer")
- .add("KhmerSymbols")
- .add("Lao")
- .add("Latin-1Supplement")
- .add("LatinExtended-A")
- .add("LatinExtendedAdditional")
- .add("LatinExtended-B")
- .add("LatinExtended-C")
- .add("LatinExtended-D")
- .add("Lepcha")
- .add("LetterlikeSymbols")
- .add("Limbu")
- .add("LinearBIdeograms")
- .add("LinearBSyllabary")
- .add("Lisu")
- .add("LowSurrogates")
- .add("Lycian")
- .add("Lydian")
- .add("MahjongTiles")
- .add("Malayalam")
- .add("Mandaic")
- .add("MathematicalAlphanumericSymbols")
- .add("MathematicalOperators")
- .add("MeeteiMayek")
- .add("MiscellaneousMathematicalSymbols-A")
- .add("MiscellaneousMathematicalSymbols-B")
- .add("MiscellaneousSymbols")
- .add("MiscellaneousSymbolsandArrows")
- .add("MiscellaneousSymbolsAndPictographs")
- .add("MiscellaneousTechnical")
- .add("ModifierToneLetters")
- .add("Mongolian")
- .add("MusicalSymbols")
- .add("Myanmar")
- .add("MyanmarExtended-A")
- .add("NewTaiLue")
- .add("NKo")
- .add("NumberForms")
- .add("Ogham")
- .add("OlChiki")
- .add("OldItalic")
- .add("OldPersian")
- .add("OldSouthArabian")
- .add("OldTurkic")
- .add("OpticalCharacterRecognition")
- .add("Oriya")
- .add("Osmanya")
- .add("Phags-pa")
- .add("PhaistosDisc")
- .add("Phoenician")
- .add("PhoneticExtensions")
- .add("PhoneticExtensionsSupplement")
- .add("PlayingCards")
- .add("PrivateUseArea")
- .add("Rejang")
- .add("RumiNumeralSymbols")
- .add("Runic")
- .add("Samaritan")
- .add("Saurashtra")
- .add("Shavian")
- .add("Sinhala")
- .add("SmallFormVariants")
- .add("SpacingModifierLetters")
- .add("Specials")
- .add("Sundanese")
- .add("SuperscriptsandSubscripts")
- .add("SupplementalArrows-A")
- .add("SupplementalArrows-B")
- .add("SupplementalMathematicalOperators")
- .add("SupplementalPunctuation")
- .add("SupplementaryPrivateUseArea-A")
- .add("SupplementaryPrivateUseArea-B")
- .add("SylotiNagri")
- .add("Syriac")
- .add("Tagalog")
- .add("Tagbanwa")
- .add("Tags")
- .add("TaiLe")
- .add("TaiTham")
- .add("TaiViet")
- .add("TaiXuanJingSymbols")
- .add("Tamil")
- .add("Telugu")
- .add("Thaana")
- .add("Thai")
- .add("Tibetan")
- .add("Tifinagh")
- .add("TransportAndMapSymbols")
- .add("Ugaritic")
- .add("UnifiedCanadianAboriginalSyllabics")
- .add("UnifiedCanadianAboriginalSyllabicsExtended")
- .add("Vai")
- .add("VariationSelectors")
- .add("VariationSelectorsSupplement")
- .add("VedicExtensions")
- .add("VerticalForms")
- .add("YiRadicals")
- .add("YiSyllables")
- .add("YijingHexagramSymbols").build();
+ @RegEx
+ private static final String YANG_XPATH_FUNCTIONS_STRING =
+ "(re-match|deref|derived-from(-or-self)?|enum-value|bit-is-set)(\\()";
+ private static final Pattern YANG_XPATH_FUNCTIONS_PATTERN = Pattern.compile(YANG_XPATH_FUNCTIONS_STRING);
private static final Map<String, DeviateKind> KEYWORD_TO_DEVIATE_MAP;
static {
final List<String> keyTokens = SPACE_SPLITTER.splitToList(value);
// to detect if key contains duplicates
- if ((new HashSet<>(keyTokens)).size() < keyTokens.size()) {
+ if (new HashSet<>(keyTokens).size() < keyTokens.size()) {
// FIXME: report all duplicate keys
throw new SourceException(ctx.getStatementSourceReference(), "Duplicate value in list key: %s", value);
}
static RevisionAwareXPath parseXPath(final StmtContext<?, ?, ?> ctx, final String path) {
final XPath xPath = XPATH_FACTORY.get().newXPath();
- xPath.setNamespaceContext(StmtNamespaceContext.create(ctx));
+ xPath.setNamespaceContext(StmtNamespaceContext.create(ctx,
+ ImmutableBiMap.of(RFC6020_YANG_NAMESPACE.toString(), YANG_XPATH_FUNCTIONS_PREFIX)));
final String trimmed = trimSingleLastSlashFromXPath(path);
try {
+ // XPath extension functions have to be prefixed
+ // yang-specific XPath functions are in fact extended functions, therefore we have to add
+ // "yang" prefix to them so that they can be properly validated with the XPath.compile() method
+ // the "yang" prefix is bound to RFC6020 YANG namespace
+ final String prefixedXPath = addPrefixToYangXPathFunctions(trimmed, ctx);
// TODO: we could capture the result and expose its 'evaluate' method
- xPath.compile(trimmed);
+ xPath.compile(prefixedXPath);
} catch (final XPathExpressionException e) {
LOG.warn("Argument \"{}\" is not valid XPath string at \"{}\"", path, ctx.getStatementSourceReference(), e);
}
return new RevisionAwareXPathImpl(path, PATH_ABS.matcher(path).matches());
}
+ private static String addPrefixToYangXPathFunctions(final String path, final StmtContext<?, ?, ?> ctx) {
+ if (ctx.getRootVersion() == YangVersion.VERSION_1_1) {
+ // FIXME once Java 9 is available, change this to StringBuilder as Matcher.appendReplacement() and
+ // Matcher.appendTail() will accept StringBuilder parameter in Java 9
+ final StringBuffer result = new StringBuffer();
+ final String prefix = YANG_XPATH_FUNCTIONS_PREFIX + ":";
+ final Matcher matcher = YANG_XPATH_FUNCTIONS_PATTERN.matcher(path);
+ while (matcher.find()) {
+ matcher.appendReplacement(result, prefix + matcher.group());
+ }
+
+ matcher.appendTail(result);
+ return result.toString();
+ }
+
+ return path;
+ }
+
public static QName trimPrefix(final QName identifier) {
final String prefixedLocalName = identifier.getLocalName();
final String[] namesParts = prefixedLocalName.split(":");
return identifier;
}
- /**
- *
- * Based on identifier read from source and collections of relevant prefixes and statement definitions mappings
- * provided for actual phase, method resolves and returns valid QName for declared statement to be written.
- * This applies to any declared statement, including unknown statements.
- *
- * @param prefixes - collection of all relevant prefix mappings supplied for actual parsing phase
- * @param stmtDef - collection of all relevant statement definition mappings provided for actual parsing phase
- * @param identifier - statement to parse from source
- * @return valid QName for declared statement to be written
- *
- */
- public static QName getValidStatementDefinition(final PrefixToModule prefixes,
- final QNameToStatementDefinition stmtDef, final QName identifier) {
- if (stmtDef.get(identifier) != null) {
- return stmtDef.get(identifier).getStatementName();
- } else {
- final String prefixedLocalName = identifier.getLocalName();
- final String[] namesParts = prefixedLocalName.split(":");
-
- if (namesParts.length == 2) {
- final String prefix = namesParts[0];
- final String localName = namesParts[1];
-
- if (prefixes == null) {
- return null;
- }
-
- final QNameModule qNameModule = prefixes.get(prefix);
- if (qNameModule == null) {
- return null;
- }
-
- if (prefixes.isPreLinkageMap()) {
- final StatementDefinition foundStmtDef = stmtDef.getByNamespaceAndLocalName(qNameModule.getNamespace(),
- localName);
- return foundStmtDef != null ? foundStmtDef.getStatementName() : null;
- } else {
- final QName qName = QName.create(qNameModule, localName);
- return stmtDef.get(qName) != null ? qName : null;
- }
- }
- }
- return null;
- }
-
static SchemaNodeIdentifier nodeIdentifierFromPath(final StmtContext<?, ?, ?> ctx, final String path) {
// FIXME: is the path trimming really necessary??
final List<QName> qNames = new ArrayList<>();
try {
final QName qName = Utils.qNameFromArgument(ctx, nodeName);
qNames.add(qName);
- } catch (final Exception e) {
- throw new IllegalArgumentException(
- String.format("Failed to parse node '%s' in path '%s'", nodeName, path), e);
+ } catch (final RuntimeException e) {
+ throw new SourceException(ctx.getStatementSourceReference(), e,
+ "Failed to parse node '%s' in path '%s'", nodeName, path);
}
}
return SchemaNodeIdentifier.create(qNames, PATH_ABS.matcher(path).matches());
}
- public static String stringFromStringContext(final YangStatementParser.ArgumentContext context) {
+ public static String stringFromStringContext(final YangStatementParser.ArgumentContext context,
+ final StatementSourceReference ref) {
+ return stringFromStringContext(context, YangVersion.VERSION_1, ref);
+ }
+
+ public static String stringFromStringContext(final YangStatementParser.ArgumentContext context,
+ final YangVersion yangVersion, final StatementSourceReference ref) {
final StringBuilder sb = new StringBuilder();
List<TerminalNode> strings = context.STRING();
if (strings.isEmpty()) {
* Unescape escaped double quotes, tabs, new line and backslash
* in the inner string and trim the result.
*/
+ checkDoubleQuotedString(innerStr, yangVersion, ref);
sb.append(innerStr.replace("\\\"", "\"").replace("\\\\", "\\").replace("\\n", "\n")
.replace("\\t", "\t"));
} else if (firstChar == '\'' && lastChar == '\'') {
*/
sb.append(str.substring(1, str.length() - 1));
} else {
+ checkUnquotedString(str, yangVersion, ref);
sb.append(str);
}
}
return sb.toString();
}
+ private static void checkUnquotedString(final String str, final YangVersion yangVersion,
+ final StatementSourceReference ref) {
+ if (yangVersion == YangVersion.VERSION_1_1) {
+ for (int i = 0; i < str.length(); i++) {
+ switch (str.charAt(i)) {
+ case '"':
+ case '\'':
+ throw new SourceException(ref, "Yang 1.1: unquoted string (%s) contains illegal characters", str);
+ }
+ }
+ }
+ }
+
+ private static void checkDoubleQuotedString(final String str, final YangVersion yangVersion,
+ final StatementSourceReference ref) {
+ if (yangVersion == YangVersion.VERSION_1_1) {
+ for (int i = 0; i < str.length() - 1; i++) {
+ if (str.charAt(i) == '\\') {
+ switch (str.charAt(i + 1)) {
+ case 'n':
+ case 't':
+ case '\\':
+ case '\"':
+ i++;
+ break;
+ default:
+ throw new SourceException(ref,
+ "Yang 1.1: illegal double quoted string (%s). In double quoted string the backslash must be followed "
+ + "by one of the following character [n,t,\",\\], but was '%s'.", str,
+ str.charAt(i + 1));
+ }
+ }
+ }
+ }
+ }
+
public static QName qNameFromArgument(StmtContext<?, ?, ?> ctx, final String value) {
if (Strings.isNullOrEmpty(value)) {
return ctx.getPublicDefinition().getStatementName();
qNameModule = getRootModuleQName(ctx);
}
if (qNameModule == null
- && Iterables.getLast(ctx.getCopyHistory()) == StmtContext.TypeOfCopy.ADDED_BY_AUGMENTATION) {
+ && ctx.getCopyHistory().getLastOperation() == CopyType.ADDED_BY_AUGMENTATION) {
ctx = ctx.getOriginalCtx();
qNameModule = getModuleQNameByPrefix(ctx, prefix);
}
break;
}
- Preconditions.checkArgument(qNameModule != null,
- "Error in module '%s': can not resolve QNameModule for '%s'. Statement source at %s",
- ctx.getRoot().rawStatementArgument(), value, ctx.getStatementSourceReference());
+ qNameModule = InferenceException.throwIfNull(qNameModule, ctx.getStatementSourceReference(),
+ "Cannot resolve QNameModule for '%s'", value);
+
final QNameModule resultQNameModule;
if (qNameModule.getRevision() == null) {
resultQNameModule = QNameModule.create(qNameModule.getNamespace(), SimpleDateFormatUtil.DEFAULT_DATE_REV)
if (StmtContextUtils.producesDeclared(rootCtx, ModuleStatement.class)) {
qNameModule = rootCtx.getFromNamespace(ModuleCtxToModuleQName.class, rootCtx);
} else if (StmtContextUtils.producesDeclared(rootCtx, SubmoduleStatement.class)) {
- final String belongsToModuleName = firstAttributeOf(rootCtx.substatements(), BelongsToStatement.class);
+ final String belongsToModuleName = firstAttributeOf(rootCtx.declaredSubstatements(),
+ BelongsToStatement.class);
qNameModule = rootCtx.getFromNamespace(ModuleNameToModuleQName.class, belongsToModuleName);
} else {
qNameModule = null;
}
public static boolean isUnknownNode(final StmtContext<?, ?, ?> stmtCtx) {
- return stmtCtx.getPublicDefinition().getDeclaredRepresentationClass()
+ return stmtCtx != null && stmtCtx.getPublicDefinition().getDeclaredRepresentationClass()
.isAssignableFrom(UnknownStatementImpl.class);
}
public static DeviateKind parseDeviateFromString(final StmtContext<?, ?, ?> ctx, final String deviateKeyword) {
- return Preconditions.checkNotNull(KEYWORD_TO_DEVIATE_MAP.get(deviateKeyword),
- "String '%s' is not valid deviate argument. Statement source at %s", deviateKeyword,
- ctx.getStatementSourceReference());
+ return SourceException.throwIfNull(KEYWORD_TO_DEVIATE_MAP.get(deviateKeyword),
+ ctx.getStatementSourceReference(), "String '%s' is not valid deviate argument", deviateKeyword);
}
- public static Status parseStatus(final String value) {
- switch (value) {
- case "current":
- return Status.CURRENT;
- case "deprecated":
- return Status.DEPRECATED;
- case "obsolete":
- return Status.OBSOLETE;
- default:
- LOG.warn("Invalid 'status' statement: {}", value);
- return null;
+ static String internBoolean(final String input) {
+ if ("true".equals(input)) {
+ return "true";
+ } else if ("false".equals(input)) {
+ return "false";
+ } else {
+ return input;
}
}
return revision;
}
- public static boolean isModuleIdentifierWithoutSpecifiedRevision(final Object o) {
- return (o instanceof ModuleIdentifier)
- && (((ModuleIdentifier) o).getRevision() == SimpleDateFormatUtil.DEFAULT_DATE_IMP || ((ModuleIdentifier) o)
- .getRevision() == SimpleDateFormatUtil.DEFAULT_BELONGS_TO_DATE);
- }
-
/**
* Replaces illegal characters of QName by the name of the character (e.g.
* '?' is replaced by "QuestionMark" etc.).
return string;
}
- public static String fixUnicodeScriptPattern(String rawPattern) {
- for (int i = 0; i < UNICODE_SCRIPT_FIX_COUNTER; i++) {
- try {
- Pattern.compile(rawPattern);
- return rawPattern;
- } catch(final PatternSyntaxException ex) {
- LOG.debug("Invalid regex pattern syntax in: {}", rawPattern, ex);
- if (ex.getMessage().contains("Unknown character script name")) {
- rawPattern = fixUnknownScripts(ex.getMessage(), rawPattern);
- } else {
- return rawPattern;
- }
- }
- }
-
- LOG.warn("Regex pattern could not be fixed: {}", rawPattern);
- return rawPattern;
- }
-
- private static String fixUnknownScripts(final String exMessage, final String rawPattern) {
- StringBuilder result = new StringBuilder(rawPattern);
- final Matcher matcher = BETWEEN_CURLY_BRACES_PATTERN.matcher(exMessage);
- if (matcher.find()) {
- final String capturedGroup = matcher.group(1);
- if (JAVA_UNICODE_BLOCKS.contains(capturedGroup)) {
- final int idx = rawPattern.indexOf("Is" + capturedGroup);
- result = result.replace(idx, idx + 2, "In");
- }
- }
- return result.toString();
- }
-
public static boolean belongsToTheSameModule(final QName targetStmtQName, final QName sourceStmtQName) {
if (targetStmtQName.getModule().equals(sourceStmtQName.getModule())) {
return true;
return false;
}
- public static boolean isPresenceContainer(final StatementContextBase<?, ?, ?> targetCtx) {
- if (!targetCtx.getPublicDefinition().equals(Rfc6020Mapping.CONTAINER)) {
- return false;
- }
-
- final List<StatementContextBase<?, ?, ?>> targetSubStatements = new ImmutableList.Builder<StatementContextBase<?, ?, ?>>()
- .addAll(targetCtx.declaredSubstatements()).addAll(targetCtx.effectiveSubstatements()).build();
- for (final StatementContextBase<?, ?, ?> subStatement : targetSubStatements) {
- if (subStatement.getPublicDefinition().equals(Rfc6020Mapping.PRESENCE)) {
- return true;
- }
- }
-
- return false;
- }
-
- public static SourceIdentifier createSourceIdentifier(RootStatementContext<?, ?, ?> root) {
+ public static SourceIdentifier createSourceIdentifier(final RootStatementContext<?, ?, ?> root) {
final QNameModule qNameModule = root.getFromNamespace(ModuleCtxToModuleQName.class, root);
if (qNameModule != null) {
// creates SourceIdentifier for a module
return RevisionSourceIdentifier.create((String) root.getStatementArgument(),
qNameModule.getFormattedRevision());
- } else {
- // creates SourceIdentifier for a submodule
- final Date revision = Optional.fromNullable(Utils.getLatestRevision(root.declaredSubstatements()))
- .or(SimpleDateFormatUtil.DEFAULT_DATE_REV);
- final String formattedRevision = SimpleDateFormatUtil.getRevisionFormat().format(revision);
- return RevisionSourceIdentifier.create((String) root.getStatementArgument(),
- formattedRevision);
}
+
+ // creates SourceIdentifier for a submodule
+ final Date revision = Optional.ofNullable(Utils.getLatestRevision(root.declaredSubstatements()))
+ .orElse(SimpleDateFormatUtil.DEFAULT_DATE_REV);
+ final String formattedRevision = SimpleDateFormatUtil.getRevisionFormat().format(revision);
+ return RevisionSourceIdentifier.create((String) root.getStatementArgument(), formattedRevision);
}
}
Code Review / yangtools.git / blobdiff