[MRESOLVER-517] Rename scope mgr method and javadoc fixes (#449)

Rename method and clean up Javadoc issues.

---

https://issues.apache.org/jira/browse/MRESOLVER-517

Author: cstamas

maven-resolver-api/src/main/java/org/eclipse/aether/DefaultRepositorySystemSession.java

@@ -827,7 +827,7 @@ public DefaultRepositorySystemSession setScopeManager(ScopeManager scopeManager)
     @Override
     public SystemDependencyScope getSystemDependencyScope() {
         if (scopeManager != null) {
-            return scopeManager.getSystemScope().orElse(null);
+            return scopeManager.getSystemDependencyScope().orElse(null);
         } else {
             return SystemDependencyScope.LEGACY;
         }

maven-resolver-api/src/main/java/org/eclipse/aether/RepositorySystemSession.java

@@ -764,10 +764,10 @@ interface SessionBuilder {
     /**
      * Returns the system dependency scope.
      * <p>
-     * Shorthand method for {@link #getScopeManager()#getSystemDependencyScope()}.
+     * Shorthand method for {@link ScopeManager#getSystemDependencyScope()}.
      * <p>
      * If {@link ScopeManager} is set, {@link #getScopeManager()} returns non-null value, the result of
-     * {@link ScopeManager#getSystemScope()} is returned (that may be {@code null}). If no {@link ScopeManager}
+     * {@link ScopeManager#getSystemDependencyScope()} is returned (that may be {@code null}). If no {@link ScopeManager}
      * if set, then {@link SystemDependencyScope#LEGACY} instance is returned, as lack of scope manager means that
      * resolver operates in "legacy" mode (Maven3 compatible mode).
      *

maven-resolver-api/src/main/java/org/eclipse/aether/scope/DependencyScope.java

@@ -33,7 +33,7 @@ public interface DependencyScope {
     String getId();
 
     /**
-     * Shorthand method of {@link #getId()#equals(Object)}.
+     * Shorthand method of {@code getId().equals(String label)}.
      */
     default boolean is(String label) {
         return getId().equals(label);

maven-resolver-api/src/main/java/org/eclipse/aether/scope/ScopeManager.java

@@ -42,7 +42,7 @@ public interface ScopeManager {
      * always a leaf on graph), is not in any repository, but is actually hosted on host OS file system. On resolution
      * resolver merely checks is file present or not.
      */
-    Optional<SystemDependencyScope> getSystemScope();
+    Optional<SystemDependencyScope> getSystemDependencyScope();
 
     /**
      * Returns a specific dependency scope by label.

maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/scope/ManagedScopeDeriver.java

@@ -41,7 +41,7 @@ public final class ManagedScopeDeriver extends ScopeDeriver {
 
     public ManagedScopeDeriver(InternalScopeManager scopeManager) {
         this.scopeManager = requireNonNull(scopeManager, "scopeManager");
-        this.systemScope = scopeManager.getSystemScope().orElse(null);
+        this.systemScope = scopeManager.getSystemDependencyScope().orElse(null);
     }
 
     @Override

maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/scope/ManagedScopeSelector.java

@@ -49,7 +49,7 @@ public final class ManagedScopeSelector extends ScopeSelector {
 
     public ManagedScopeSelector(InternalScopeManager scopeManager) {
         requireNonNull(scopeManager, "scopeManager");
-        this.systemScope = scopeManager.getSystemScope().orElse(null);
+        this.systemScope = scopeManager.getSystemDependencyScope().orElse(null);
         this.dependencyScopesByWidthDescending =
                 Collections.unmodifiableList(scopeManager.getDependencyScopeUniverse().stream()
                         .sorted(Comparator.comparing(scopeManager::getDependencyScopeWidth)

maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/scope/ScopeManagerImpl.java

@@ -96,7 +96,7 @@ public String getId() {
     }
 
     @Override
-    public Optional<SystemDependencyScope> getSystemScope() {
+    public Optional<SystemDependencyScope> getSystemDependencyScope() {
         return Optional.ofNullable(systemDependencyScope.get());
     }
 

maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/session/DefaultCloseableSession.java

@@ -339,7 +339,7 @@ public ScopeManager getScopeManager() {
     @Override
     public SystemDependencyScope getSystemDependencyScope() {
         if (scopeManager != null) {
-            return scopeManager.getSystemScope().orElse(null);
+            return scopeManager.getSystemDependencyScope().orElse(null);
         } else {
             return SystemDependencyScope.LEGACY;
         }

maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/AbstractDependencyManager.java

@@ -68,7 +68,9 @@ protected AbstractDependencyManager(int deriveUntil, int applyFrom, ScopeManager
                 Collections.emptyMap(),
                 Collections.emptyMap(),
                 Collections.emptyMap(),
-                scopeManager != null ? scopeManager.getSystemScope().orElse(null) : SystemDependencyScope.LEGACY);
+                scopeManager != null
+                        ? scopeManager.getSystemDependencyScope().orElse(null)
+                        : SystemDependencyScope.LEGACY);
     }
 
     @SuppressWarnings("checkstyle:ParameterNumber")

maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/OptionalDependencySelector.java

@@ -28,8 +28,7 @@
  * A dependency selector that excludes optional dependencies which occur beyond level one of the dependency graph.
  *
  * @see Dependency#isOptional()
- * @see org.eclipse.aether.internal.impl.scope.OptionalDependencySelector
- * @deprecated This class is deprecated.
+ * @deprecated This class is deprecated. Use same named class from impl module instead.
  */
 @Deprecated
 public final class OptionalDependencySelector implements DependencySelector {

maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelector.java

@@ -37,8 +37,7 @@
  * In particular, the filter is not aware of scopes that logically include other scopes.
  *
  * @see Dependency#getScope()
- * @see org.eclipse.aether.internal.impl.scope.ScopeDependencySelector
- * @deprecated This class is deprecated.
+ * @deprecated This class is deprecated. Use same named class from impl module instead.
  */
 @Deprecated
 public final class ScopeDependencySelector implements DependencySelector {