Merge branch 'di-implement-scopes' into MNG-8230

api/maven-api-di/src/main/java/org/apache/maven/di/tool/DiIndexProcessor.java

@@ -24,6 +24,7 @@
 import javax.annotation.processing.SupportedSourceVersion;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
+import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
 import javax.tools.Diagnostic;
 import javax.tools.FileObject;
@@ -71,14 +72,19 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     }
 
     private String getFullClassName(TypeElement typeElement) {
-        String className = typeElement.getQualifiedName().toString();
+        StringBuilder className = new StringBuilder(typeElement.getSimpleName());
         Element enclosingElement = typeElement.getEnclosingElement();
-        if (enclosingElement instanceof TypeElement) {
-            String enclosingClassName =
-                    ((TypeElement) enclosingElement).getQualifiedName().toString();
-            className = enclosingClassName + "$" + typeElement.getSimpleName();
+
+        while (enclosingElement instanceof TypeElement) {
+            className.insert(0, "$").insert(0, ((TypeElement) enclosingElement).getSimpleName());
+            enclosingElement = enclosingElement.getEnclosingElement();
+        }
+
+        if (enclosingElement instanceof PackageElement) {
+            className.insert(0, ".").insert(0, ((PackageElement) enclosingElement).getQualifiedName());
         }
-        return className;
+
+        return className.toString();
     }
 
     private void updateFileIfChanged() throws IOException {

maven-api-impl/pom.xml

@@ -71,6 +71,10 @@ under the License.
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-api-settings</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-di</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-api</artifactId>
@@ -132,11 +136,6 @@ under the License.
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-di</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-named-locks</artifactId>

maven-api-impl/src/main/java/org/apache/maven/internal/impl/di/MojoExecutionScope.java

@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.internal.impl.di;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.function.Supplier;
+
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.di.Key;
+import org.apache.maven.di.Scope;
+import org.apache.maven.di.impl.DIException;
+
+/**
+ * MojoExecutionScope
+ */
+public class MojoExecutionScope implements Scope {
+
+    protected static final class ScopeState {
+        private final Map<Key<?>, Supplier<?>> seeded = new HashMap<>();
+
+        private final Map<Key<?>, Object> provided = new HashMap<>();
+
+        public <T> void seed(Class<T> clazz, Supplier<T> value) {
+            seeded.put(Key.of(clazz), value);
+        }
+
+        public Collection<Object> provided() {
+            return provided.values();
+        }
+    }
+
+    private final ThreadLocal<LinkedList<ScopeState>> values = new ThreadLocal<>();
+
+    public MojoExecutionScope() {}
+
+    public static <T> Supplier<T> seededKeySupplier(Class<? extends T> clazz) {
+        return () -> {
+            throw new IllegalStateException(
+                    "No instance of " + clazz.getName() + " is bound to the mojo execution scope.");
+        };
+    }
+
+    public void enter() {
+        LinkedList<ScopeState> stack = values.get();
+        if (stack == null) {
+            stack = new LinkedList<>();
+            values.set(stack);
+        }
+        stack.addFirst(new ScopeState());
+    }
+
+    protected ScopeState getScopeState() {
+        LinkedList<ScopeState> stack = values.get();
+        if (stack == null || stack.isEmpty()) {
+            throw new IllegalStateException();
+        }
+        return stack.getFirst();
+    }
+
+    public void exit() {
+        final LinkedList<ScopeState> stack = values.get();
+        if (stack == null || stack.isEmpty()) {
+            throw new IllegalStateException();
+        }
+        stack.removeFirst();
+        if (stack.isEmpty()) {
+            values.remove();
+        }
+    }
+
+    public <T> void seed(Class<T> clazz, Supplier<T> value) {
+        getScopeState().seed(clazz, value);
+    }
+
+    public <T> void seed(Class<T> clazz, final T value) {
+        seed(clazz, (Supplier<T>) () -> value);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Nonnull
+    public <T> Supplier<T> scope(@Nonnull Key<T> key, @Nonnull Supplier<T> unscoped) {
+        return () -> {
+            LinkedList<ScopeState> stack = values.get();
+            if (stack == null || stack.isEmpty()) {
+                throw new DIException("Cannot access " + key + " outside of a scoping block");
+            }
+
+            ScopeState state = stack.getFirst();
+
+            Supplier<?> seeded = state.seeded.get(key);
+
+            if (seeded != null) {
+                return (T) seeded.get();
+            }
+
+            T provided = (T) state.provided.get(key);
+            if (provided == null && unscoped != null) {
+                provided = unscoped.get();
+                state.provided.put(key, provided);
+            }
+
+            return provided;
+        };
+    }
+}

maven-api-impl/src/main/java/org/apache/maven/internal/impl/di/OutOfScopeException.java

@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.internal.impl.di;
+
+import org.apache.maven.di.impl.DIException;
+
+public class OutOfScopeException extends DIException {
+    public OutOfScopeException(String message) {
+        super(message);
+    }
+
+    public OutOfScopeException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}