From d5a2cce99f0258800d204c744bcf0547b4f07259 Mon Sep 17 00:00:00 2001 From: thevpc Date: Mon, 2 Dec 2024 00:42:23 +0100 Subject: [PATCH] [FIXED] stabilization --- .../java/net/thevpc/nuts/NDescriptor.java | 7 +++ .../main/java/net/thevpc/nuts/NFetchCmd.java | 6 +- .../thevpc/nuts/NNoSuchElementException.java | 10 +-- .../thevpc/nuts/NNotExecutableException.java | 4 +- .../net/thevpc/nuts/NNotFoundException.java | 10 +-- .../main/java/net/thevpc/nuts/NSearchCmd.java | 6 +- .../main/java/net/thevpc/nuts/log/NLog.java | 8 +++ .../thevpc/nuts/reserved/NApiUtilsRPI.java | 61 ++++++++++++++++--- .../standalone/DefaultNDescriptor.java | 4 ++ .../standalone/DefaultNDescriptorBuilder.java | 4 ++ .../dependency/util/NClassLoaderUtils.java | 10 +-- .../dependency/util/NDependencyUtils.java | 4 ++ .../descriptor/DelegateNDescriptor.java | 5 ++ .../descriptor/util/NDescriptorUtils.java | 3 - .../impl/NRepositoryFolderHelper.java | 2 +- .../impl/nuts/NHttpSrvRepository.java | 2 +- .../workspace/DefaultNWorkspace.java | 4 +- .../workspace/cmd/fetch/DefaultNFetchCmd.java | 10 ++- 18 files changed, 120 insertions(+), 40 deletions(-) diff --git a/core/nuts-api/src/main/java/net/thevpc/nuts/NDescriptor.java b/core/nuts-api/src/main/java/net/thevpc/nuts/NDescriptor.java index 9764f9dc8..f2045b7e1 100644 --- a/core/nuts-api/src/main/java/net/thevpc/nuts/NDescriptor.java +++ b/core/nuts-api/src/main/java/net/thevpc/nuts/NDescriptor.java @@ -104,6 +104,13 @@ public interface NDescriptor extends Serializable, NBlankable { */ String getPackaging(); + /** + * + * This is typically the case for pom projects + * @return true when the descriptor does not define a content. + */ + boolean isNoContent(); + /** * dependency resolution solver. defaults to 'maven' * diff --git a/core/nuts-api/src/main/java/net/thevpc/nuts/NFetchCmd.java b/core/nuts-api/src/main/java/net/thevpc/nuts/NFetchCmd.java index 43ff39830..51331dcd7 100644 --- a/core/nuts-api/src/main/java/net/thevpc/nuts/NFetchCmd.java +++ b/core/nuts-api/src/main/java/net/thevpc/nuts/NFetchCmd.java @@ -101,7 +101,7 @@ static NFetchCmd ofNutsRuntime() { NFetchCmd setExpireTime(Instant value); /** - * when true, NutsNotFoundException instances are ignored + * when true, NNotFoundException instances are ignored * * @return true if armed FailFast mode */ @@ -109,9 +109,9 @@ static NFetchCmd ofNutsRuntime() { /** * set armed (or disarmed) fail safe mode. if true, null replaces - * NutsNotFoundException. + * NNotFoundException. * - * @param enable if true, null replaces NutsNotFoundException. + * @param enable if true, null replaces NNotFoundException. * @return {@code this} instance */ NFetchCmd setFailFast(boolean enable); diff --git a/core/nuts-api/src/main/java/net/thevpc/nuts/NNoSuchElementException.java b/core/nuts-api/src/main/java/net/thevpc/nuts/NNoSuchElementException.java index 6be6e5f1d..118633eca 100644 --- a/core/nuts-api/src/main/java/net/thevpc/nuts/NNoSuchElementException.java +++ b/core/nuts-api/src/main/java/net/thevpc/nuts/NNoSuchElementException.java @@ -38,7 +38,7 @@ public class NNoSuchElementException extends NException { /** - * Constructs a new NutsIllegalArgumentException exception + * Constructs a new NNoSuchElementException exception * * @param message message */ @@ -47,7 +47,7 @@ public NNoSuchElementException(NMsg message) { } /** - * Constructs a new NutsIllegalArgumentException exception + * Constructs a new NNoSuchElementException exception * * @param message message * @param cause cause @@ -57,13 +57,13 @@ public NNoSuchElementException(NMsg message, Throwable cause) { } /** - * Constructs a new NutsIllegalArgumentException exception + * Constructs a new NNoSuchElementException exception * * @param message message * @param cause cause - * @param enableSuppression whether or not suppression is enabled or + * @param enableSuppression whether suppression is enabled or * disabled - * @param writableStackTrace whether or not the stack trace should be + * @param writableStackTrace whether the stack trace should be * writable */ public NNoSuchElementException(NMsg message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { diff --git a/core/nuts-api/src/main/java/net/thevpc/nuts/NNotExecutableException.java b/core/nuts-api/src/main/java/net/thevpc/nuts/NNotExecutableException.java index 39870a066..be72bd67b 100644 --- a/core/nuts-api/src/main/java/net/thevpc/nuts/NNotExecutableException.java +++ b/core/nuts-api/src/main/java/net/thevpc/nuts/NNotExecutableException.java @@ -29,7 +29,7 @@ import net.thevpc.nuts.util.NMsg; /** - * Exception thrown when a non executable nuts id is requested to run. + * Exception thrown when a non-executable nuts id is requested to run. * * @app.category Exceptions * @since 0.5.4 @@ -42,7 +42,7 @@ public class NNotExecutableException extends NExecutionException { private final NId id; /** - * Constructs a new NutsNotExecutableException exception + * Constructs a new NNotExecutableException exception * * @param id artifact id */ diff --git a/core/nuts-api/src/main/java/net/thevpc/nuts/NNotFoundException.java b/core/nuts-api/src/main/java/net/thevpc/nuts/NNotFoundException.java index 603968ce5..8e885e200 100644 --- a/core/nuts-api/src/main/java/net/thevpc/nuts/NNotFoundException.java +++ b/core/nuts-api/src/main/java/net/thevpc/nuts/NNotFoundException.java @@ -47,7 +47,7 @@ public class NNotFoundException extends NException { private Set missingDependencies = Collections.emptySet(); /** - * Constructs a new NutsNotFoundException exception + * Constructs a new NNotFoundException exception * * @param id artifact id */ @@ -56,7 +56,7 @@ public NNotFoundException(NId id) { } /** - * Constructs a new NutsNotFoundException exception + * Constructs a new NNotFoundException exception * * @param id artifact id * @param cause cause @@ -67,7 +67,7 @@ public NNotFoundException(NId id, Throwable cause) { /** - * Constructs a new NutsNotFoundException exception + * Constructs a new NNotFoundException exception * * @param id artifact id * @param dependencies dependencies @@ -88,7 +88,7 @@ public NNotFoundException(NId id, NIdInvalidDependency[] dependencies, NIdInvali } /** - * Constructs a new NutsNotFoundException exception + * Constructs a new NNotFoundException exception * * @param id artifact id * @param message message @@ -102,7 +102,7 @@ public NNotFoundException(NId id, NMsg message, Throwable cause) { } /** - * Constructs a new NutsNotFoundException exception + * Constructs a new NNotFoundException exception * * @param id artifact id * @param message message diff --git a/core/nuts-api/src/main/java/net/thevpc/nuts/NSearchCmd.java b/core/nuts-api/src/main/java/net/thevpc/nuts/NSearchCmd.java index 2480be1ca..a2dec4b16 100644 --- a/core/nuts-api/src/main/java/net/thevpc/nuts/NSearchCmd.java +++ b/core/nuts-api/src/main/java/net/thevpc/nuts/NSearchCmd.java @@ -601,7 +601,7 @@ static NSearchCmd of() { List getPackaging(); /** - * when true, NutsNotFoundException instances are ignored + * when true, NNotFoundException instances are ignored * * @return true if armed FailFast mode */ @@ -609,9 +609,9 @@ static NSearchCmd of() { /** * set armed (or disarmed) fail safe mode. if true, null replaces - * NutsNotFoundException. + * NNotFoundException. * - * @param enable if true, null replaces NutsNotFoundException. + * @param enable if true, null replaces NNotFoundException. * @return {@code this} instance */ NSearchCmd setFailFast(boolean enable); diff --git a/core/nuts-api/src/main/java/net/thevpc/nuts/log/NLog.java b/core/nuts-api/src/main/java/net/thevpc/nuts/log/NLog.java index d7637b356..bb569fcbd 100644 --- a/core/nuts-api/src/main/java/net/thevpc/nuts/log/NLog.java +++ b/core/nuts-api/src/main/java/net/thevpc/nuts/log/NLog.java @@ -197,6 +197,14 @@ default void warn(NMsg msg, Throwable thrown){ log(Level.WARNING, NLogVerb.WARNING, msg, thrown); } + default void info(NMsg msg){ + log(Level.INFO, NLogVerb.INFO, msg); + } + + default void debug(NMsg msg){ + log(Level.FINEST, NLogVerb.DEBUG, msg); + } + default void warn(NMsg msg){ log(Level.WARNING, NLogVerb.WARNING, msg,null); } diff --git a/core/nuts-api/src/main/java/net/thevpc/nuts/reserved/NApiUtilsRPI.java b/core/nuts-api/src/main/java/net/thevpc/nuts/reserved/NApiUtilsRPI.java index 0e5ef280e..f238fc953 100644 --- a/core/nuts-api/src/main/java/net/thevpc/nuts/reserved/NApiUtilsRPI.java +++ b/core/nuts-api/src/main/java/net/thevpc/nuts/reserved/NApiUtilsRPI.java @@ -27,6 +27,9 @@ import net.thevpc.nuts.*; +import net.thevpc.nuts.boot.NBootLogConfig; +import net.thevpc.nuts.boot.NBootOptionsInfo; +import net.thevpc.nuts.boot.reserved.cmdline.NBootWorkspaceCmdLineParser; import net.thevpc.nuts.text.NText; import net.thevpc.nuts.text.NTextBuilder; import net.thevpc.nuts.util.NBlankable; @@ -128,10 +131,39 @@ public static boolean resolveShowStackTrace(NWorkspaceOptions bo) { } } + public static boolean resolveShowStackTrace(NBootOptionsInfo bo) { + if (bo.getShowStacktrace()!=null) { + return bo.getShowStacktrace(); + } else if (bo.getBot()!=null && bo.getBot()) { + return false; + } else { + if (NApiUtilsRPI.getSysBoolNutsProperty("stacktrace", false)) { + return true; + } + if (bo.getDebug()!=null && !NBlankable.isBlank(bo.getDebug())) { + return true; + } + NBootLogConfig nLogConfig = bo.getLogConfig(); + if (nLogConfig!=null && nLogConfig.getLogTermLevel() != null + && nLogConfig.getLogTermLevel().intValue() < Level.INFO.intValue()) { + return true; + } + return false; + } + } + public static int processThrowable(Throwable ex, String[] args) { - NWorkspaceOptionsBuilder bo = NWorkspaceOptionsBuilder.of(); - bo.setCmdLine(args); - return processThrowable(ex, null, true, resolveShowStackTrace(bo), resolveGui(bo)); + if (ex == null) { + return 0; + } + NSession session = NSessionAwareExceptionBase.resolveSession(ex).orNull(); + if (session != null) { + return (NApplicationExceptionHandler.of() + .processThrowable(args, ex)); + } + NBootOptionsInfo options = new NBootOptionsInfo(); + NBootWorkspaceCmdLineParser.parseNutsArguments(args, options); + return processThrowable(ex, null, true, resolveShowStackTrace(options), resolveGui(options)); } /** @@ -145,26 +177,26 @@ public static int processThrowable(Throwable ex, NLog out) { if (ex == null) { return 0; } - NSession session = NSessionAwareExceptionBase.resolveSession(ex).orNull(); NWorkspaceOptionsBuilder bo = null; if (session != null) { bo = NWorkspace.get().getBootOptions().builder().toWorkspaceOptions().builder(); + return processThrowable(ex, out, true, resolveShowStackTrace(bo), resolveGui(bo)); } else { - NWorkspaceOptionsBuilder options = NWorkspaceOptionsBuilder.of(); //load inherited String nutsArgs = NStringUtils.trim( NStringUtils.trim(System.getProperty("nuts.boot.args")) + " " + NStringUtils.trim(System.getProperty("nuts.args")) ); try { - options.setCmdLine(NCmdLine.parseDefault(nutsArgs).get().toStringArray()); + NBootOptionsInfo options = new NBootOptionsInfo(); + NBootWorkspaceCmdLineParser.parseNutsArguments(NCmdLine.parseDefault(nutsArgs).get().toStringArray(), options); + return processThrowable(ex, null, true, resolveShowStackTrace(options), resolveGui(options)); } catch (Exception e) { //any, ignore... } - bo = options; + return 254; } - return processThrowable(ex, out, true, resolveShowStackTrace(bo), resolveGui(bo)); } public static boolean resolveGui(NWorkspaceOptions bo) { @@ -180,6 +212,19 @@ public static boolean resolveGui(NWorkspaceOptions bo) { return false; } } + public static boolean resolveGui(NBootOptionsInfo bo) { + if (bo.getBot()!=null && bo.getBot()) { + return false; + } + if (bo.getGui()!=null && bo.getGui()) { + if (!NApiUtilsRPI.isGraphicalDesktopEnvironment()) { + return false; + } + return true; + } else { + return false; + } + } public static int processThrowable(Throwable ex, NLog out, boolean showMessage, boolean showStackTrace, boolean showGui) { if (ex == null) { diff --git a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/DefaultNDescriptor.java b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/DefaultNDescriptor.java index a01249147..b6863e716 100755 --- a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/DefaultNDescriptor.java +++ b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/DefaultNDescriptor.java @@ -305,6 +305,10 @@ public String getPackaging() { return packaging; } + public boolean isNoContent() { + return "pom".equals(getPackaging()); + } + @Override public String getSolver() { return solver; diff --git a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/DefaultNDescriptorBuilder.java b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/DefaultNDescriptorBuilder.java index 526eb53c5..055eb6ca1 100755 --- a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/DefaultNDescriptorBuilder.java +++ b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/DefaultNDescriptorBuilder.java @@ -843,4 +843,8 @@ public List getDevelopers() { public int getSupportLevel(NSupportLevelContext context) { return NConstants.Support.DEFAULT_SUPPORT; } + + public boolean isNoContent() { + return "pom".equals(getPackaging()); + } } diff --git a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/dependency/util/NClassLoaderUtils.java b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/dependency/util/NClassLoaderUtils.java index 95d90bb21..10454a7a2 100644 --- a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/dependency/util/NClassLoaderUtils.java +++ b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/dependency/util/NClassLoaderUtils.java @@ -65,11 +65,11 @@ private static NClassLoaderNode toClassLoaderNode(NDependencyTreeNode d, boolean return toClassLoaderNodeWithOptional(d, false, withChildren, repositoryFilter); } - private static NClassLoaderNode toClassLoaderNodeWithOptional(NDependency d, boolean isOptional, NRepositoryFilter repositoryFilter) { + private static NClassLoaderNode toClassLoaderNodeWithOptional(NDependency d, boolean optional, NRepositoryFilter repositoryFilter) { NPath cc = null; - if (!isOptional) { - if (!NDependencyUtils.isRequiredDependency(d)) { - isOptional = true; + if (!optional) { + if (NDependencyUtils.isOptionalDependency(d)) { + optional = true; } } NId id = d.toId(); @@ -94,7 +94,7 @@ private static NClassLoaderNode toClassLoaderNodeWithOptional(NDependency d, boo ); } } - if (isOptional) { + if (optional) { return null; } throw new NNotFoundException(id); diff --git a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/dependency/util/NDependencyUtils.java b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/dependency/util/NDependencyUtils.java index 30872fe4d..d67fa4601 100644 --- a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/dependency/util/NDependencyUtils.java +++ b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/dependency/util/NDependencyUtils.java @@ -52,6 +52,10 @@ public static String toExclusionListString(NId[] exclusions) { return String.join(",", ex); } + public static boolean isOptionalDependency(NDependency d) { + return !isRequiredDependency(d); + } + public static boolean isRequiredDependency(NDependency d) { if (d.isOptional()) { return false; diff --git a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/descriptor/DelegateNDescriptor.java b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/descriptor/DelegateNDescriptor.java index b0d330030..5b10dcfe2 100755 --- a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/descriptor/DelegateNDescriptor.java +++ b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/descriptor/DelegateNDescriptor.java @@ -198,4 +198,9 @@ public List getMailingLists() { public NDescriptorOrganization getOrganization() { return getBase().getOrganization(); } + + @Override + public boolean isNoContent() { + return getBase().isNoContent(); + } } diff --git a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/descriptor/util/NDescriptorUtils.java b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/descriptor/util/NDescriptorUtils.java index e95705173..62d0f84e2 100644 --- a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/descriptor/util/NDescriptorUtils.java +++ b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/descriptor/util/NDescriptorUtils.java @@ -22,9 +22,6 @@ import java.util.stream.Collectors; public class NDescriptorUtils { - public static boolean isNoContent(NDescriptor desc) { - return desc != null && "pom".equals(desc.getPackaging()); - } public static NDescriptor getEffectiveDescriptor(NDefinition def) { final NDescriptor d = def.getEffectiveDescriptor().orNull(); diff --git a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/repository/impl/NRepositoryFolderHelper.java b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/repository/impl/NRepositoryFolderHelper.java index a09d86210..36ee7a632 100755 --- a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/repository/impl/NRepositoryFolderHelper.java +++ b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/repository/impl/NRepositoryFolderHelper.java @@ -381,7 +381,7 @@ public NDescriptor deploy(NDeployRepositoryCmd deployment, NConfirmationMode wri CoreNIdUtils.checkLongId(id); NInputSource inputSource = null; if (deployment.getContent() == null) { - if (!NDescriptorUtils.isNoContent(descriptor)) { + if (!descriptor.isNoContent()) { NAssert.requireNonNull(deployment.getContent(), () -> NMsg.ofC("invalid deployment; missing content for %s", deployment.getId())); } } else { diff --git a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/repository/impl/nuts/NHttpSrvRepository.java b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/repository/impl/nuts/NHttpSrvRepository.java index bd34fee0e..74d5aca95 100755 --- a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/repository/impl/nuts/NHttpSrvRepository.java +++ b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/repository/impl/nuts/NHttpSrvRepository.java @@ -295,7 +295,7 @@ private String resolveAuthURLPart() { // public void checkAllowedFetch(NutsId parse, NutsSession session) { // super.checkAllowedFetch(parse, session); // if (session.getFetchMode() != NutsFetchMode.REMOTE) { -// throw new NutsNotFoundException(session(), parse); +// throw new NNotFoundException(session(), parse); // } // } private class NamedNIdFromStreamIterator extends NIteratorBase { diff --git a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/workspace/DefaultNWorkspace.java b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/workspace/DefaultNWorkspace.java index 86f2e6c83..336aa0d05 100755 --- a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/workspace/DefaultNWorkspace.java +++ b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/workspace/DefaultNWorkspace.java @@ -968,7 +968,7 @@ public void installOrUpdateImpl(NDefinition def, String[] args, boolean resolveI try { NDependencyFilter ndf = NDependencyFilters.of().byRunnable(); if (def.getEffectiveDescriptor().isNotPresent() - || (!NDescriptorUtils.isNoContent(def.getDescriptor()) && def.getContent().isNotPresent())) { + || (!def.getDescriptor().isNoContent() && def.getContent().isNotPresent())) { // reload def NFetchCmd fetch2 = NFetchCmd.of(def.getId()) .content() @@ -1074,7 +1074,7 @@ public void installOrUpdateImpl(NDefinition def, String[] args, boolean resolveI } out.flush(); NWorkspace envs = this; - if (def.getContent().isPresent() || NDescriptorUtils.isNoContent(def.getDescriptor())) { + if (def.getContent().isPresent() || def.getDescriptor().isNoContent()) { if (requireParents) { List requiredDefinitions = new ArrayList<>(); for (NId parent : def.getDescriptor().getParents()) { diff --git a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/workspace/cmd/fetch/DefaultNFetchCmd.java b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/workspace/cmd/fetch/DefaultNFetchCmd.java index 99931b3db..0d5789053 100755 --- a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/workspace/cmd/fetch/DefaultNFetchCmd.java +++ b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/workspace/cmd/fetch/DefaultNFetchCmd.java @@ -45,9 +45,15 @@ public DefaultNFetchCmd(NWorkspace workspace) { public NPath getResultContent() { try { NDefinition def = fetchDefinition(getId(), copy().setContent(true).setEffective(false), true, false); - if(NDescriptorUtils.isNoContent(def.getDescriptor())){ + if(def.getDescriptor().isNoContent()){ return null; } + if(!def.getContent().isPresent()){ + if (!isFailFast()) { + return null; + } + throw new NNotFoundException(getId(),NMsg.ofC("missing content for %s",getId())); + } return def.getContent().get(); } catch (NNotFoundException ex) { if (!isFailFast()) { @@ -239,7 +245,7 @@ public NDefinition fetchDefinitionNoCache(NId id, NFetchCmd options, boolean inc // always ok for content, if 'content' flag is not armed, try find 'local' path NInstalledRepository installedRepository = dws.getInstalledRepository(); if (includeContent) { - if (!NDescriptorUtils.isNoContent(foundDefinition.getDescriptor())) { + if (!foundDefinition.getDescriptor().isNoContent()) { boolean loadedFromInstallRepo = DefaultNInstalledRepository.INSTALLED_REPO_UUID.equals(successfulDescriptorLocation .getRepository().getUuid()); NId id1 = CoreNIdUtils.createContentFaceId(foundDefinition.getId(), foundDefinition.getDescriptor());