From 1f27de7baf664f5a548b119ddacc14c8a71a9bc1 Mon Sep 17 00:00:00 2001 From: Svata Dedic Date: Mon, 2 Oct 2023 20:52:16 +0200 Subject: [PATCH] Priming build and reload improvements. --- .../nbcode/integration/maven.properties | 1 + java/maven/apichanges.xml | 14 + java/maven/build.xml | 3 +- java/maven/nbproject/project.properties | 2 +- .../modules/maven/NbArtifactFixer.java | 49 +++ .../modules/maven/NbMavenProjectImpl.java | 153 +++++++++- .../modules/maven/api/NbMavenProject.java | 54 +++- .../AbstractProjectClassPathImpl.java | 9 + .../classpath/ClassPathProviderImpl.java | 2 + .../maven/classpath/CompileClassPathImpl.java | 7 +- .../execute/MavenCommandLineExecutor.java | 5 +- .../modules/maven/execute/ReactorChecker.java | 12 +- .../maven/modelcache/MavenProjectCache.java | 223 +++++++++----- .../problems/MavenModelProblemsProvider.java | 11 +- .../maven/problems/ProblemReporterImpl.java | 2 +- .../maven/problems/SanityBuildAction.java | 17 +- .../spi/newproject/CreateProjectBuilder.java | 2 +- .../projects/multiproject/democa/.gitignore | 15 + .../democa/.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 59925 bytes .../.mvn/wrapper/maven-wrapper.properties | 18 ++ .../data/projects/multiproject/democa/LICENSE | 201 ++++++++++++ .../data/projects/multiproject/democa/NOTICE | 1 + .../projects/multiproject/democa/README.md | 71 +++++ .../projects/multiproject/democa/lib/pom.xml | 210 +++++++++++++ .../com/exampleca/ProfilePicturesApi.java | 44 +++ .../exampleca/ProfilePicturesController.java | 101 ++++++ .../exampleca/controller/GenreController.java | 84 +++++ .../main/java/com/exampleca/domain/Genre.java | 57 ++++ .../exampleca/repository/GenreRepository.java | 35 +++ .../com/exampleca/service/GenreService.java | 59 ++++ .../native-image/resource-config.json | 6 + .../resources/db/migration/V1__schema.sql | 5 + .../multiproject/democa/micronaut-cli.yml | 6 + .../data/projects/multiproject/democa/mvnw | 287 ++++++++++++++++++ .../projects/multiproject/democa/mvnw.bat | 187 ++++++++++++ .../projects/multiproject/democa/oci/pom.xml | 255 ++++++++++++++++ .../main/java/com/exampleca/Application.java | 37 +++ .../application-oraclecloud.properties | 8 + .../bootstrap-oraclecloud.properties | 0 .../democa/oci/src/main/resources/logback.xml | 14 + .../com/exampleca/GenreControllerTest.java | 126 ++++++++ .../src/test/java/com/exampleca/OciTest.java | 37 +++ .../ProfilePicturesControllerTest.java | 115 +++++++ .../resources/application-test.properties | 4 + .../data/projects/multiproject/democa/pom.xml | 45 +++ .../modules/maven/NbMavenProjectImplTest.java | 3 + .../maven/NbMavenProjectImplTest2.java | 205 +++++++++++++ .../modules/maven/execute/MockMavenExec.java | 23 +- .../maven/problems/PrimingActionTest.java | 14 +- .../actions/ProvidedConfigurationsTest.java | 7 +- 50 files changed, 2711 insertions(+), 135 deletions(-) create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/.gitignore create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/.mvn/wrapper/maven-wrapper.jar create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/.mvn/wrapper/maven-wrapper.properties create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/LICENSE create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/NOTICE create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/README.md create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/lib/pom.xml create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/ProfilePicturesApi.java create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/ProfilePicturesController.java create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/controller/GenreController.java create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/domain/Genre.java create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/repository/GenreRepository.java create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/service/GenreService.java create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/resources/META-INF/native-image/resource-config.json create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/resources/db/migration/V1__schema.sql create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/micronaut-cli.yml create mode 100755 java/maven/test/unit/data/projects/multiproject/democa/mvnw create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/mvnw.bat create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/oci/pom.xml create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/oci/src/main/java/com/exampleca/Application.java create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/oci/src/main/resources/application-oraclecloud.properties create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/oci/src/main/resources/bootstrap-oraclecloud.properties create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/oci/src/main/resources/logback.xml create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/oci/src/test/java/com/exampleca/GenreControllerTest.java create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/oci/src/test/java/com/exampleca/OciTest.java create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/oci/src/test/java/com/exampleca/ProfilePicturesControllerTest.java create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/oci/src/test/resources/application-test.properties create mode 100644 java/maven/test/unit/data/projects/multiproject/democa/pom.xml create mode 100644 java/maven/test/unit/src/org/netbeans/modules/maven/NbMavenProjectImplTest2.java diff --git a/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/maven.properties b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/maven.properties index aca469984308..22eaeaae63d3 100644 --- a/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/maven.properties +++ b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/maven.properties @@ -17,3 +17,4 @@ primingBuild.snapshot.goals=install primingBuild.regular.goals=install +skipTests=true diff --git a/java/maven/apichanges.xml b/java/maven/apichanges.xml index 8854fb3799e7..eb9cc37425b9 100644 --- a/java/maven/apichanges.xml +++ b/java/maven/apichanges.xml @@ -83,6 +83,20 @@ is the proper place. + + + Support for partially loaded projects + + + + + + Added a + getPratialProject that returns potentially incompletely loaded project instead of a mocked-up fallback (see isErrorPlaceholder(). + Also added a isIncomplete() check that checks project's status. + + + diff --git a/java/maven/build.xml b/java/maven/build.xml index 6bd5eb7fd1a7..1cfa92a1a7d3 100644 --- a/java/maven/build.xml +++ b/java/maven/build.xml @@ -99,7 +99,8 @@ - + + diff --git a/java/maven/nbproject/project.properties b/java/maven/nbproject/project.properties index 871f4bacb8d7..f20d64491d08 100644 --- a/java/maven/nbproject/project.properties +++ b/java/maven/nbproject/project.properties @@ -22,7 +22,7 @@ javadoc.apichanges=${basedir}/apichanges.xml javadoc.arch=${basedir}/arch.xml javahelp.hs=maven.hs extra.module.files=maven-nblib/ -spec.version.base=2.160.0 +spec.version.base=2.161.0 # The CPExtender test fails in library processing (not randomly) since NetBeans 8.2; disabling. test.excludes=**/CPExtenderTest.class diff --git a/java/maven/src/org/netbeans/modules/maven/NbArtifactFixer.java b/java/maven/src/org/netbeans/modules/maven/NbArtifactFixer.java index e44c2ffc5812..0d8e7ae2cff7 100644 --- a/java/maven/src/org/netbeans/modules/maven/NbArtifactFixer.java +++ b/java/maven/src/org/netbeans/modules/maven/NbArtifactFixer.java @@ -27,6 +27,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.function.Consumer; import java.util.logging.Level; import java.util.logging.Logger; import org.apache.maven.artifact.DefaultArtifact; @@ -105,6 +106,10 @@ public class NbArtifactFixer implements ArtifactFixer { //instead of workarounds down the road, we set the artifact's file here. // some stacktraces to maven/aether do set it after querying our code, but some don't for reasons unknown to me. artifact.setFile(f); + Set s = CAPTURE_FAKE_ARTIFACTS.get(); + if (s != null) { + s.add(artifact); + } return f; } catch (IOException x) { Exceptions.printStackTrace(x); @@ -149,4 +154,48 @@ private static synchronized File createFallbackPOM(String groupId, String artifa return fallbackPOM; } + public interface ExceptionCallable { + public T call() throws E; + } + + @SuppressWarnings("unchecked") + private static void sneakyThrow(Throwable exception) throws T { + throw (T) exception; + } + + /** + * Collects faked artifacts, which would be otherwise hidden in maven infrastructure. The value is only valid during {@link #collectFallbackArtifacts}, which + * can be invoked recursively. + */ + private static ThreadLocal> CAPTURE_FAKE_ARTIFACTS = new ThreadLocal>(); + + /** + * Performs an operation and collects forged artifacts created during that operation. The invocation can be nested; each invocation gets only artifacts from its own 'level', + * not those from possible nested invocations. The function passes on all runtime exceptions and checked exception thrown by the operation. + * + * @param value produced by the executed operation + * @param exception thrown from the operation + * @param code the operation to call and monitor + * @param collector callback that will get collected artifacts. + * @return + * @throws E + */ + public static T collectFallbackArtifacts(ExceptionCallable code, Consumer> collector) throws E { + Set save = CAPTURE_FAKE_ARTIFACTS.get(); + try { + CAPTURE_FAKE_ARTIFACTS.set(new HashSet<>()); + return code.call(); + } catch (Error | RuntimeException r) { + throw r; + } catch (Exception ex) { + sneakyThrow(ex); + // unreachable + throw new Error(); + } finally { + if (collector != null) { + collector.accept(CAPTURE_FAKE_ARTIFACTS.get()); + } + CAPTURE_FAKE_ARTIFACTS.set(save); + } + } } diff --git a/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java b/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java index d8a0bedca2d3..85112b7db6d4 100644 --- a/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java +++ b/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java @@ -41,7 +41,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Properties; import java.util.Set; import java.util.WeakHashMap; @@ -134,6 +133,14 @@ public final class NbMavenProjectImpl implements Project { private final RequestProcessor.Task reloadTask = RELOAD_RP.create(new Runnable() { @Override public void run() { + if (LOG.isLoggable(Level.FINE)) { + MavenProject x; + synchronized (NbMavenProjectImpl.this) { + x = project == null ? null : project.get(); + } + LOG.log(Level.FINE, "Project {0} starting reload. Currentproject is: {1}", + new Object[] { System.identityHashCode(x == null ? this : x ) }); + } problemReporter.clearReports(); //#167741 -this will trigger node refresh? MavenProject prj = loadOriginalMavenProject(true); MavenProject old; @@ -303,6 +310,15 @@ public String getHintJavaPlatform() { */ //TODO revisit usage, eventually should be only reuse MavenProjectCache public @NonNull MavenProject loadMavenProject(MavenEmbedder embedder, List activeProfiles, Properties properties) { + ProjectActionContext.Builder b = ProjectActionContext.newBuilder(this). + withProfiles(activeProfiles); + for (String pn : properties.stringPropertyNames()) { + b.withProperty(pn, properties.getProperty(pn)); + } + + return MavenProjectCache.loadMavenProject(projectFile, + b.context(), null); + /* try { MavenExecutionRequest req = embedder.createMavenExecutionRequest(); req.addActiveProfiles(activeProfiles); @@ -340,6 +356,7 @@ public String getHintJavaPlatform() { LOG.log(Level.INFO, "Runtime exception thrown while loading maven project at " + getProjectDirectory(), exc); //NOI18N } return MavenProjectCache.getFallbackProject(this.getPOMFile()); + */ } /** @@ -374,7 +391,8 @@ public MavenProject loadParentOf(MavenEmbedder embedder, MavenProject project) t request.setRepositorySession(maven.newRepositorySession(req)); if (project.getParentFile() != null) { - parent = builder.build(project.getParentFile(), request).getProject(); + req.setPom(project.getParentFile()); + parent = MavenProjectCache.loadOriginalMavenProjectInternal(embedder, req); } else if (project.getModel().getParent() != null) { parent = builder.build(project.getParentArtifact(), request).getProject(); } @@ -408,6 +426,21 @@ public Map createSystemPropsForPropertyExpres public Map createUserPropsForPropertyExpressions() { return NbCollections.checkedMapByCopy(configProvider.getActiveConfiguration().getProperties(), String.class, String.class, true); } + + /** + * Returns the current parsed project state. May return {@code null}, if the project was never loaded or expired from the cache, but + * never blocks on Maven infrastructure and is very fast. + * @return current project or {@code null} + */ + @CheckForNull + public MavenProject getOriginalMavenProjectOrNull() { + synchronized (this) { + if (project == null) { + return null; + } + return project.get(); + } + } /** * getter for the maven's own project representation.. this instance is cached but gets reloaded @@ -435,7 +468,8 @@ public Map createUserPropsForPropertyExpress } /** - * Returns the original project, or waits for reload task if already pending. + * Returns the original project, or waits for reload task if already pending. Use with care, as + * the method blocks until the project reload eventually finishes in the reload thread / RP. * @return possibly reloaded Maven project. */ public MavenProject getFreshOriginalMavenProject() { @@ -544,12 +578,6 @@ void stopHardReferencingMavenPoject() { model = null; } newproject = MavenProjectCache.getMavenProject(this.getPOMFile(), reload); - if (newproject == null) { //null when no pom.xml in project folder.. - newproject = MavenProjectCache.getFallbackProject(projectFile); - LOG.log(Level.FINE, "Project {0} going to fallback, with packaging: {1}", new Object[] { getPOMFile(), newproject.getPackaging() }); - } - final MavenExecutionResult res = MavenProjectCache.getExecutionResult(newproject); - final MavenProject np = newproject; } finally { if (LOG.isLoggable(Level.FINE) && SwingUtilities.isEventDispatchThread()) { LOG.log(Level.FINE, "Project " + getProjectDirectory().getPath() + " loaded in AWT event dispatching thread!", new RuntimeException()); @@ -559,29 +587,123 @@ void stopHardReferencingMavenPoject() { return newproject; } + /** + * Task that potential project reloads should wait on. If set, a {@link fireProjectReload}(true) will be scheduled only after this blocker finishes. + */ + private RequestProcessor.Task reloadBlocker; - + /** + * Schedules project operation that delays potential reloads. If a reload is posted, it will be performed only after + * this operation compeltes (successfully, or erroneously). Multiple project operations can be scheduled, an eventual project reload + * should happen after all those operations complete. It is possible to postpone project reload indefinitely, avoid unnecessary + * operation schedules. + * + * @param r operation to run + * @return controlling task. + */ + public RequestProcessor.Task scheduleProjectOperation(RequestProcessor.Task t) { + if (Boolean.getBoolean("test.reload.sync")) { + LOG.log(Level.FINE, "Running the blocking task synchronously (test.reload.sync set)"); + t.run(); + return t; + } else { + synchronized (this) { + if (reloadBlocker == null) { + LOG.log(Level.FINER, "Blocking project reload on task {0}", t); + reloadBlocker = t; + return t; + } else { + // will chain after existing reload blocker AND the new task. + final RequestProcessor.Task t2 = RELOAD_RP.create(() -> {}); + LOG.log(Level.FINER, "Creating project blocker {0}, chain after existing blocker {1}", new Object[] { t2, t }); + reloadBlocker.addTaskListener((e) -> { + t.addTaskListener((e2) -> { + synchronized (NbMavenProjectImpl.this) { + if (t2 == reloadBlocker) { + reloadBlocker = null; + } + } + t2.run(); + }); + }); + reloadBlocker = t2; + return t2; + } + } + } + } + public RequestProcessor.Task fireProjectReload() { + return fireProjectReload(false); + } + + /** + * Schedules project reload. If `waitForBlockers` is true and {@link #scheduleProjectOperation} registered some task(s), project reload + * will be postponed until after those task(s) finish. The returned task completes after the project reload itself completes (after the potential + * delays). + *

+ * As a result of project's reload, child projects may be reloaded, but the returned task does not wait for children reload to complete. + * + * @param waitForBlockers + * @return the task that completes after project reloads. + */ + public RequestProcessor.Task fireProjectReload(boolean waitForBlockers) { //#227101 not only AWT and project read/write mutex has to be checked, there are some additional more //complex scenarios that can lead to deadlock. Just give up and always fire changes in separate RP. if (Boolean.getBoolean("test.reload.sync")) { reloadTask.run(); //for tests just do sync reload, even though silly, even sillier is to attempt to sync the threads.. } else { + RequestProcessor.Task t; + synchronized (this) { + if (reloadBlocker != null && waitForBlockers) { + // avoid holding the lock while potentially executing the listener in-line + t = reloadBlocker; + } else { + t = null; + } + } + if (t != null) { + final RequestProcessor.Task t2 = RELOAD_RP.create(() -> {}); + LOG.log(Level.FINER, "Scheduling project reload retry after blocker {0} completes, Returning task {1}", new Object[] { t, t2 }); + t.addTaskListener((e) -> { + synchronized (NbMavenProjectImpl.this) { + if (t == reloadBlocker) { + reloadBlocker = null; + } + } + fireProjectReload(true).addTaskListener((e2) -> { + // mark the t2 task finished. + if (!t2.isFinished()) { + t2.run(); + } + }); + }); + return t2; + } + LOG.log(Level.FINER, "Scheduling prject reload {0}, no blocker found.", this); + LOG.log(Level.FINER, "Stack trace:", new Throwable()); reloadTask.schedule(0); //asuming here that schedule(0) will move the scheduled task in the queue if not yet executed } return reloadTask; } private void reloadPossibleBrokenModules(MavenProject preceding, MavenProject p) { + LOG.log(Level.FINE, "Recovery for project {2}, preceding: {0}, current: {1}, ", + new Object[] { preceding == null ? -1 : System.identityHashCode(preceding), System.identityHashCode(p), p }); // restrict to just poms that were marked as broken/incomplete. - if (!(MavenProjectCache.isFallbackproject(preceding) || + if (!(MavenProjectCache.isIncompleteProject(preceding) || // the project is tagged by Boolean.TRUE, if a SanityBuildAction was created for it. preceding.getContextValue("org.netbeans.modules.maven.problems.primingNotDone") == Boolean.TRUE)) { + LOG.log(Level.FINER, "Project is not fallbach: {0}, {1}", new Object[] { + MavenProjectCache.isIncompleteProject(preceding), + preceding.getContextValue("org.netbeans.modules.maven.problems.primingNotDone") + }); return; } // but do not cascade from projects, which are themselves broken. if (MavenProjectCache.isFallbackproject(p)) { + LOG.log(Level.FINE, "New project is still fallback, skipping"); return; } File basePOMFile = p.getFile().getParentFile(); @@ -593,10 +715,15 @@ private void reloadPossibleBrokenModules(MavenProject preceding, MavenProject p) } MavenProject child = MavenProjectCache.getMavenProject(modPom, true, false); if (child == null) { + LOG.log(Level.FINE, "Child project {0} is not cached yet", modPom); continue; } + LOG.log(Level.FINE, "Child project fallback status: {0}, {1}", new Object[] { + MavenProjectCache.isIncompleteProject(child), + child.getContextValue("org.netbeans.modules.maven.problems.primingNotDone") + }); // the project may have more problems, more subtle, but now repair just total breakage - if (!MavenProjectCache.isFallbackproject(child) && child.getContextValue("org.netbeans.modules.maven.problems.primingNotDone") != Boolean.TRUE) { + if (!MavenProjectCache.isIncompleteProject(child) && child.getContextValue("org.netbeans.modules.maven.problems.primingNotDone") != Boolean.TRUE) { LOG.log(Level.FINE, "Project for module {0} is not a fallback, skipping", modName); continue; } @@ -612,7 +739,7 @@ private void reloadPossibleBrokenModules(MavenProject preceding, MavenProject p) } else { LOG.log(Level.INFO, "Recovering module {0}, pomfile {1}", new Object[] { modName, modPom }); NbMavenProjectImpl childImpl = c.getLookup().lookup(NbMavenProjectImpl.class); - childImpl.fireProjectReload(); + childImpl.fireProjectReload(true); } } catch (IOException ex) { LOG.log(Level.FINE, "Error getting module project {0} is not a project", modName); diff --git a/java/maven/src/org/netbeans/modules/maven/api/NbMavenProject.java b/java/maven/src/org/netbeans/modules/maven/api/NbMavenProject.java index e1575a269dd3..c8c3e86b87c7 100644 --- a/java/maven/src/org/netbeans/modules/maven/api/NbMavenProject.java +++ b/java/maven/src/org/netbeans/modules/maven/api/NbMavenProject.java @@ -194,9 +194,9 @@ private NbMavenProject(NbMavenProjectImpl proj) { } /** - * - * @return - * @since + * Checks if the project is completely broken. Also see {@link #getPartialProject}. + * @return true, if the project is broken and could not be loaded + * @see #getPartialProject */ public boolean isUnloadable() { return MavenProjectCache.isFallbackproject(getMavenProject()); @@ -586,10 +586,12 @@ private void fireChange(URI uri) { * */ private RequestProcessor.Task fireProjectReload() { - return project.fireProjectReload(); + return project.fireProjectReload(true); } private void doFireReload() { + MavenProject p = project.getOriginalMavenProjectOrNull(); + LOG.log(Level.FINE, "Firing PROJECT change for maven project {0}, mavenprj {1}", new Object[] { this, System.identityHashCode(p == null ? this : p) }); FileUtil.refreshFor(FileUtil.toFile(project.getProjectDirectory())); NbMavenProjectImpl.refreshLocalRepository(project); support.firePropertyChange(PROP_PROJECT, null, null); @@ -630,16 +632,58 @@ public static void removePropertyChangeListener(Project prj, PropertyChangeListe assert false : "Attempted to remove PropertyChangeListener from project " + prj; //NOI18N } } + + /** + * Retrieves at least partial project information. A MavenProject instance may be a fallback in case the reading + * fails because of locally missing artifacts and/or referenced parents. However partial model may be available. The function + * returns the passed project, if it read correctly. Otherwise, it attempts to locate a partially load project and returns that one. + * If a partial project is not available, it will return the passed (fallback) project. + *

+ * The result can be checked to be {@link #isErrorPlaceholder} to determine if the result was a returned partial project or not. + * Note that partial projects may not resolve all references properly, be prepared for unresolved artifacts and/or plugins. Do not pass + * partial projects blindly around. + *

+ * Returns {@code null} if the passed project is {@code null} + * @param project the project to check + * @return partial project if the passed project did not load properly and the partial project is available. + * @since 2.161 + */ + public static MavenProject getPartialProject(MavenProject project) { + if (project == null) { + return null; + } + if (isIncomplete(project)) { + MavenProject pp = MavenProjectCache.getPartialProject(project); + if (pp != null) { + return pp; + } + } + return project; + } /** - * Checks whether a given project is just an error placeholder. + * Checks whether a given project is just an error placeholder. Such project may be fundamentally broken, i.e. missing + * declarations from the parent, unresolved dependencies or versions. Also see {@link #isIncomplete} * @param project a project loaded by e.g. {@link #getMavenProject} * @return true if it was loaded as an error fallback, false for a normal project * @since 2.24 + * @see #isIncomplete + * @see #getPartialProject */ public static boolean isErrorPlaceholder(@NonNull MavenProject project) { return MavenProjectCache.isFallbackproject(project); // see NbMavenProjectImpl.getFallbackProject } + + /** + * Checks if the project resolved using incomplete or missing information. Each {@link #isErrorPlaceholder} is an incomplete project. + * If the project is just missing proper referenced artifacts, it will not be reported as a {@link #isErrorPlaceholder}, but as {@link #isIncomplete}. + * @param project + * @return true, if the project is not completely resolved + * @since 2.161 + */ + public static boolean isIncomplete(@NonNull MavenProject project) { + return MavenProjectCache.isIncompleteProject(project); + } @Override public String toString() { return project.toString(); diff --git a/java/maven/src/org/netbeans/modules/maven/classpath/AbstractProjectClassPathImpl.java b/java/maven/src/org/netbeans/modules/maven/classpath/AbstractProjectClassPathImpl.java index ba919d114150..b2dd0c66c27a 100644 --- a/java/maven/src/org/netbeans/modules/maven/classpath/AbstractProjectClassPathImpl.java +++ b/java/maven/src/org/netbeans/modules/maven/classpath/AbstractProjectClassPathImpl.java @@ -32,6 +32,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.apache.maven.artifact.Artifact; +import org.apache.maven.project.MavenProject; import org.netbeans.modules.maven.NbMavenProjectImpl; import org.netbeans.modules.maven.api.NbMavenProject; import org.netbeans.spi.java.classpath.ClassPathImplementation; @@ -54,13 +55,18 @@ public abstract class AbstractProjectClassPathImpl implements ClassPathImplement protected AbstractProjectClassPathImpl(NbMavenProjectImpl proj) { project = proj; + LOGGER.log(Level.FINER, "Creating {0} for project {1}, with original {2}", new Object[] { getClass(), proj, proj.getOriginalMavenProjectOrNull() }); //TODO make weak or remove the listeners as well?? NbMavenProject.addPropertyChangeListener(proj, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { //explicitly listing both RESOURCE and PROJECT properties, it's unclear if both are required but since some other places call addWatchedPath but don't listen it's likely required if (NbMavenProject.PROP_RESOURCE.equals(evt.getPropertyName()) || NbMavenProject.PROP_PROJECT.equals(evt.getPropertyName())) { + MavenProject mp = project.getOriginalMavenProjectOrNull(); + LOGGER.log(Level.FINE, "{0} got change {1} from project: {2} with maven project {3}", new Object[] { getClass(), evt.getPropertyName(), project, + System.identityHashCode(mp == null ? this : null) }); if (project.getProjectWatcher().isUnloadable()) { + LOGGER.log(Level.FINER, "{0} is not loadable, exiting", project); return; //let's just continue with the old value, stripping classpath for broken project and re-creating it later serves no greater good. } List newValues = getPath(); @@ -69,6 +75,9 @@ public void propertyChange(PropertyChangeEvent evt) { synchronized (AbstractProjectClassPathImpl.this) { oldvalue = resources; hasChanged = hasChanged(oldvalue, newValues); + LOGGER.log(Level.FINER, "{0}: {1} classpath is: {2}, {3} entries", new Object[] { + getClass(), project, newValues, newValues.size() + }); // System.out.println("checking=" + AbstractProjectClassPathImpl.this.getClass()); if (hasChanged) { resources = newValues; diff --git a/java/maven/src/org/netbeans/modules/maven/classpath/ClassPathProviderImpl.java b/java/maven/src/org/netbeans/modules/maven/classpath/ClassPathProviderImpl.java index 009555c25326..fda13392d1e8 100644 --- a/java/maven/src/org/netbeans/modules/maven/classpath/ClassPathProviderImpl.java +++ b/java/maven/src/org/netbeans/modules/maven/classpath/ClassPathProviderImpl.java @@ -538,6 +538,7 @@ protected boolean isReset(PropertyChangeEvent evt) { boolean reset = false; if( (NbMavenProject.PROP_RESOURCE.equals(evt.getPropertyName()) && evt.getNewValue() instanceof URI)) { File file = Utilities.toFile((URI) evt.getNewValue()); + LOGGER.log(Level.FINER, "{0} checking reset with file {1}", new Object[] { getClass(), file }); for (String sourceRoot : proj.getOriginalMavenProject().getCompileSourceRoots()) { if(file.equals(new File(sourceRoot, MODULE_INFO_JAVA))) { reset = true; @@ -701,6 +702,7 @@ public ClassPathSelector(NbMavenProjectImpl proj) { // maven checks recursively all source roots for module-info, // for performace reasons we will be checking and listening only on the root of a source root NbMavenProject.addPropertyChangeListener(proj, (evt) -> { + LOGGER.log(Level.FINER, "{0} got property change {1} from {2}", new Object[] { getClass(), evt, proj }); if (isReset(evt)) { active = null; support.firePropertyChange(PROP_ACTIVE_CLASS_PATH, null, null); diff --git a/java/maven/src/org/netbeans/modules/maven/classpath/CompileClassPathImpl.java b/java/maven/src/org/netbeans/modules/maven/classpath/CompileClassPathImpl.java index 26b789cd80ed..c748267e63a6 100644 --- a/java/maven/src/org/netbeans/modules/maven/classpath/CompileClassPathImpl.java +++ b/java/maven/src/org/netbeans/modules/maven/classpath/CompileClassPathImpl.java @@ -26,6 +26,8 @@ import java.util.EnumSet; import java.util.List; import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; import org.apache.maven.artifact.Artifact; import org.apache.maven.project.MavenProject; import org.netbeans.api.java.classpath.ClassPath; @@ -38,7 +40,7 @@ * @author Milos Kleint */ class CompileClassPathImpl extends AbstractProjectClassPathImpl implements FlaggedClassPathImplementation { - + private static final Logger LOGGER = Logger.getLogger(CompileClassPathImpl.class.getName()); private volatile boolean incomplete; private final boolean addOutputDir; @@ -52,6 +54,9 @@ public CompileClassPathImpl(NbMavenProjectImpl proj, boolean addOutputDir) { URI[] createPath() { List lst = new ArrayList<>(); boolean broken = getCompileArtifacts(getMavenProject().getOriginalMavenProject(), lst); + MavenProject mp = getMavenProject().getOriginalMavenProjectOrNull(); + LOGGER.log(Level.FINER, "{0} for project {1}: creating path for {2}: size {4} - {3}", + new Object[] { getClass(), getMavenProject(), System.identityHashCode(mp == null ? this : mp), lst, lst.size() }); if(addOutputDir) { lst.add(Utilities.toURI(getProject().getProjectWatcher().getOutputDirectory(false))); } diff --git a/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java b/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java index 99e500c34c85..6b7331ac872f 100644 --- a/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java +++ b/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java @@ -390,6 +390,7 @@ public void actionPerformed(ActionEvent e) { if (prj != null) { NbMavenProjectImpl impl = prj.getLookup().lookup(NbMavenProjectImpl.class); if (impl != null) { + // this reload must not wait for blockers. RequestProcessor.Task reloadTask = impl.fireProjectReload(); reloadTask.waitFinished(); } @@ -516,7 +517,7 @@ private static List createMavenExecutionCommand(RunConfig config, Constr } if (config.getReactorStyle() != RunConfig.ReactorStyle.NONE) { File basedir = config.getExecutionDirectory(); - MavenProject mp = config.getMavenProject(); + MavenProject mp = NbMavenProject.getPartialProject(config.getMavenProject()); File projdir = NbMavenProject.isErrorPlaceholder(mp) ? basedir : mp.getBasedir(); String rel = basedir != null && projdir != null ? FileUtilities.relativizeFile(basedir, projdir) : null; if (!".".equals(rel)) { @@ -1100,7 +1101,7 @@ private File getAltMavenLocation() { private File searchMavenWrapper(RunConfig config) { String fileName = Utilities.isWindows() ? "mvnw.cmd" : "mvnw"; //NOI18N - MavenProject project = config.getMavenProject(); + MavenProject project = NbMavenProject.getPartialProject(config.getMavenProject()); while (project != null) { File baseDir = project.getBasedir(); if (baseDir != null) { diff --git a/java/maven/src/org/netbeans/modules/maven/execute/ReactorChecker.java b/java/maven/src/org/netbeans/modules/maven/execute/ReactorChecker.java index 2b5ea231078e..753bec9905d9 100644 --- a/java/maven/src/org/netbeans/modules/maven/execute/ReactorChecker.java +++ b/java/maven/src/org/netbeans/modules/maven/execute/ReactorChecker.java @@ -63,9 +63,6 @@ public class ReactorChecker implements PrerequisitesChecker { // Unloadable? return true; } - if (NbMavenProject.isErrorPlaceholder(mavenprj.getMavenProject())) { - return true; // broken project - } NbMavenProject reactor = findReactor(mavenprj); File reactorRoot = reactor.getMavenProject().getBasedir(); if (reactor != mavenprj) { @@ -94,7 +91,7 @@ public class ReactorChecker implements PrerequisitesChecker { * @return its apparent reactor root; maybe just the same project */ public static @NonNull NbMavenProject findReactor(@NonNull NbMavenProject module) { // #197232 - MavenProject prj = module.getMavenProject(); + MavenProject prj = NbMavenProject.getPartialProject(module.getMavenProject()); List models = MavenEmbedder.getModelDescriptors(prj); File moduleDir = prj.getBasedir(); File current = moduleDir; @@ -124,8 +121,11 @@ public class ReactorChecker implements PrerequisitesChecker { } } NbMavenProject p = load(prj.getBasedir().getParentFile()); - if (p != null && listsModule(moduleDir.getParentFile(), moduleDir, p.getMavenProject().getModules())) { - return findReactor(p); + if (p != null) { + MavenProject mp = NbMavenProject.getPartialProject(p.getMavenProject()); + if (listsModule(moduleDir.getParentFile(), moduleDir, mp.getModules())) { + return findReactor(p); + } } return module; } diff --git a/java/maven/src/org/netbeans/modules/maven/modelcache/MavenProjectCache.java b/java/maven/src/org/netbeans/modules/maven/modelcache/MavenProjectCache.java index 6d8c521e2b0e..61a50730718e 100644 --- a/java/maven/src/org/netbeans/modules/maven/modelcache/MavenProjectCache.java +++ b/java/maven/src/org/netbeans/modules/maven/modelcache/MavenProjectCache.java @@ -25,16 +25,19 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Set; import java.util.WeakHashMap; import java.util.function.BiConsumer; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.SwingUtilities; import org.apache.maven.AbstractMavenLifecycleParticipant; +import org.apache.maven.artifact.Artifact; import org.apache.maven.execution.DefaultMavenExecutionResult; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenExecutionResult; @@ -45,6 +48,7 @@ import org.netbeans.api.annotations.common.NonNull; import org.netbeans.api.project.ProjectActionContext; import org.netbeans.modules.maven.M2AuxilaryConfigImpl; +import org.netbeans.modules.maven.NbArtifactFixer; import org.netbeans.modules.maven.api.NbMavenProject; import org.netbeans.modules.maven.api.execute.RunConfig; import org.netbeans.modules.maven.configurations.M2Configuration; @@ -67,7 +71,27 @@ public final class MavenProjectCache { private static final Logger LOG = Logger.getLogger(MavenProjectCache.class.getName()); private static final String CONTEXT_EXECUTION_RESULT = "NB_Execution_Result"; + + /** + * The value contains the set of artifacts, that have been faked during the reading operation. + */ + private static final String CONTEXT_FAKED_ARTIFACTS = "NB_FakedArtifacts"; + + /** + * Marks a project that observed unknown build participants. + */ private static final String CONTEXT_PARTICIPANTS = "NB_AbstractParticipant_Present"; + /** + * Marks a fallback project. The project was not fully read. Value of the context key is either a Boolean.TRUE as an indicator, or + * the partially read project, which does not resolve fully. Can be extracted with {@link #getPartialProject(org.apache.maven.project.MavenProject)}. + */ + private static final String CONTEXT_PARTIAL_PROJECT = "org.netbeans.modules.maven.partialProject"; // NOI18N + + /** + * Marks a fallback project. The project is forged and is not read from the maven infrastructure. A fallback project may have a {@link #getPartialProject(org.apache.maven.project.MavenProject) partial project} + * attached. + */ + private static final String CONTEXT_FALLBACK_PROJECT = "org.netbeans.modules.maven.fallbackProject"; // NOI18N /** * Folder with module-configurable whitelist of lifecycle participants. Currently only 'ignore' can be specified. @@ -172,8 +196,107 @@ private static boolean isLifecycleParticipatnIgnored(AbstractMavenLifecycleParti return check != null && check.getAttribute(ATTR_IGNORE_ON_LOAD) == Boolean.TRUE; } - private static @NonNull MavenProject loadOriginalMavenProject(final File pomFile, ProjectActionContext ctx, RunConfig runConf) { + public static MavenProject loadOriginalMavenProjectInternal(MavenEmbedder projectEmbedder, MavenExecutionRequest req) { + MavenProject newproject = null; + File pomFile = req.getPom(); + + MavenExecutionResult res = null; + Set fakes = new HashSet<>(); long startLoading = System.currentTimeMillis(); + + try { + res = NbArtifactFixer.collectFallbackArtifacts(() -> projectEmbedder.readProjectWithDependencies(req, true), (c) -> + c.forEach(a -> { + // artifact fixer only fakes POMs. + fakes.add(projectEmbedder.createArtifactWithClassifier(a.getGroupId(), a.getArtifactId(), a.getVersion(), "pom", a.getClassifier())); // NOI18N + } + )); + newproject = res.getProject(); + + //#204898 + if (newproject != null) { + LOG.log(Level.FINE, "Loaded project for {0}, packaging: {1}", new Object[] { pomFile, newproject.getPackaging() }); + ClassLoader projectRealm = newproject.getClassRealm(); + if (projectRealm != null) { + ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader(); + Thread.currentThread().setContextClassLoader(projectRealm); + try { + //boolean execute = EnableParticipantsBuildAction.isEnabled(aux); + List lookup = projectEmbedder.getPlexus().lookupList(AbstractMavenLifecycleParticipant.class); + if (lookup.size() > 0) { //just in case.. +// if (execute) { +// LOG.info("Executing External Build Participants..."); +// MavenSession session = new MavenSession( projectEmbedder.getPlexus(), newproject.getProjectBuildingRequest().getRepositorySession(), req, res ); +// session.setCurrentProject(newproject); +// session.setProjects(Collections.singletonList(newproject)); +// projectEmbedder.setUpLegacySupport(); +// projectEmbedder.getPlexus().lookup(LegacySupport.class).setSession(session); +// +// for (AbstractMavenLifecycleParticipant part : lookup) { +// try { +// Thread.currentThread().setContextClassLoader( part.getClass().getClassLoader() ); +// part.afterSessionStart(session); +// part.afterProjectsRead(session); +// } catch (MavenExecutionException ex) { +// Exceptions.printStackTrace(ex); +// } +// } +// } else { + List parts = new ArrayList(); + for (AbstractMavenLifecycleParticipant part : lookup) { + if (isLifecycleParticipatnIgnored(part)) { + //#204898 create a whitelist of known not harmful participants that can be just ignored + continue; + } + String name = part.getClass().getName(); + parts.add(name); + } + if (parts.size() > 0) { + newproject.setContextValue(CONTEXT_PARTICIPANTS, parts); + } +// } + } + } catch (ComponentLookupException e) { + // this is just silly, lookupList should return an empty list! + } finally { + Thread.currentThread().setContextClassLoader(originalClassLoader); + } + } + } + } catch (RuntimeException exc) { + //guard against exceptions that are not processed by the embedder + //#136184 NumberFormatException + LOG.log(Level.INFO, "Runtime exception thrown while loading maven project at " + pomFile, exc); //NOI18N + res = new DefaultMavenExecutionResult(); + res.addException(exc); + } finally { + if (newproject == null) { + newproject = getFallbackProject(res, pomFile); + } + //#215159 clear the project building request, it references multiple Maven Models via the RepositorySession cache + //is not used in maven itself, most likely used by m2e only.. + newproject.setProjectBuildingRequest(null); + long endLoading = System.currentTimeMillis(); + LOG.log(Level.FINE, "Loaded project in {0} msec at {1}", new Object[] {endLoading - startLoading, pomFile.getPath()}); + if (LOG.isLoggable(Level.FINE) && SwingUtilities.isEventDispatchThread()) { + LOG.log(Level.FINE, "Project " + pomFile.getPath() + " loaded in AWT event dispatching thread!", new RuntimeException()); + } + if (LOG.isLoggable(Level.FINE) && !res.getExceptions().isEmpty()) { + LOG.log(Level.FINE, "Errors encountered during loading the project:"); + for (Throwable t : res.getExceptions()) { + LOG.log(Level.FINE, "Maven reported:", t); + } + } + if (!fakes.isEmpty() && !isIncompleteProject(newproject)) { + LOG.log(Level.FINE, "Incomplete artifact encountered during loading the project: {0}", fakes); + newproject.setContextValue(CONTEXT_PARTIAL_PROJECT, Boolean.TRUE); + newproject.setContextValue(CONTEXT_FAKED_ARTIFACTS, fakes); + } + } + return newproject; + } + + private static @NonNull MavenProject loadOriginalMavenProject(final File pomFile, ProjectActionContext ctx, RunConfig runConf) { MavenEmbedder projectEmbedder = EmbedderFactory.getProjectEmbedder(); MavenProject newproject = null; //TODO have independent from M2AuxiliaryConfigImpl @@ -194,7 +317,6 @@ private static boolean isLifecycleParticipatnIgnored(AbstractMavenLifecycleParti } } - MavenExecutionResult res = null; try { List mavenConfigOpts = Collections.emptyList(); for (FileObject root = projectDir; root != null; root = root.getParent()) { @@ -277,92 +399,19 @@ private static boolean isLifecycleParticipatnIgnored(AbstractMavenLifecycleParti LOG.log(Level.FINE, "request property 'packaging': {0}", req.getSystemProperties().get("packaging")); LOG.log(Level.FINE, "embedder property 'packaging': {0}", projectEmbedder.getSystemProperties().get("packaging")); } - res = projectEmbedder.readProjectWithDependencies(req, true); - newproject = res.getProject(); - - //#204898 - if (newproject != null) { - LOG.log(Level.FINE, "Loaded project for {0}, packaging: {1}", new Object[] { pomFile, newproject.getPackaging() }); - ClassLoader projectRealm = newproject.getClassRealm(); - if (projectRealm != null) { - ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader(); - Thread.currentThread().setContextClassLoader(projectRealm); - try { - //boolean execute = EnableParticipantsBuildAction.isEnabled(aux); - List lookup = projectEmbedder.getPlexus().lookupList(AbstractMavenLifecycleParticipant.class); - if (lookup.size() > 0) { //just in case.. -// if (execute) { -// LOG.info("Executing External Build Participants..."); -// MavenSession session = new MavenSession( projectEmbedder.getPlexus(), newproject.getProjectBuildingRequest().getRepositorySession(), req, res ); -// session.setCurrentProject(newproject); -// session.setProjects(Collections.singletonList(newproject)); -// projectEmbedder.setUpLegacySupport(); -// projectEmbedder.getPlexus().lookup(LegacySupport.class).setSession(session); -// -// for (AbstractMavenLifecycleParticipant part : lookup) { -// try { -// Thread.currentThread().setContextClassLoader( part.getClass().getClassLoader() ); -// part.afterSessionStart(session); -// part.afterProjectsRead(session); -// } catch (MavenExecutionException ex) { -// Exceptions.printStackTrace(ex); -// } -// } -// } else { - List parts = new ArrayList(); - for (AbstractMavenLifecycleParticipant part : lookup) { - if (isLifecycleParticipatnIgnored(part)) { - //#204898 create a whitelist of known not harmful participants that can be just ignored - continue; - } - String name = part.getClass().getName(); - parts.add(name); - } - if (parts.size() > 0) { - newproject.setContextValue(CONTEXT_PARTICIPANTS, parts); - } -// } - } - } catch (ComponentLookupException e) { - // this is just silly, lookupList should return an empty list! - } finally { - Thread.currentThread().setContextClassLoader(originalClassLoader); - } - } - } - } catch (RuntimeException | IOException exc) { + newproject = loadOriginalMavenProjectInternal(projectEmbedder, req); + } catch (IOException exc) { + MavenExecutionResult res = null; //guard against exceptions that are not processed by the embedder //#136184 NumberFormatException LOG.log(Level.INFO, "Runtime exception thrown while loading maven project at " + pomFile, exc); //NOI18N res = new DefaultMavenExecutionResult(); res.addException(exc); - } finally { - if (newproject == null) { - newproject = getFallbackProject(res, pomFile); - } - //#215159 clear the project building request, it references multiple Maven Models via the RepositorySession cache - //is not used in maven itself, most likely used by m2e only.. - newproject.setProjectBuildingRequest(null); - //TODO some exceptions in result contain various model caches as well.. - newproject.setContextValue(CONTEXT_EXECUTION_RESULT, res); - long endLoading = System.currentTimeMillis(); - LOG.log(Level.FINE, "Loaded project in {0} msec at {1}", new Object[] {endLoading - startLoading, pomFile.getPath()}); - if (LOG.isLoggable(Level.FINE) && SwingUtilities.isEventDispatchThread()) { - LOG.log(Level.FINE, "Project " + pomFile.getPath() + " loaded in AWT event dispatching thread!", new RuntimeException()); - } - if (LOG.isLoggable(Level.FINE) && !res.getExceptions().isEmpty()) { - LOG.log(Level.FINE, "Errors encountered during loading the project:"); - for (Throwable t : res.getExceptions()) { - LOG.log(Level.FINE, "Maven reported:", t); - } - } + newproject = getFallbackProject(res, pomFile); } return newproject; } - private static final String CONTEXT_PARTIAL_PROJECT = "org.netbeans.modules.maven.partialProject"; // NOI18N - private static final String CONTEXT_FALLBACK_PROJECT = "org.netbeans.modules.maven.fallbackProject"; // NOI18N - /** * Create a fallback project, but patch the incomplete project from the building result into it. * The method will eventually start to return the partial project but still flagged as a fallback - see {@link #isFallbackproject(org.apache.maven.project.MavenProject)}. @@ -377,6 +426,7 @@ public static MavenProject getFallbackProject(MavenExecutionResult result, File if (result == null) { return toReturn; } + toReturn.setContextValue(CONTEXT_EXECUTION_RESULT, result); MavenProject partial = null; for (Throwable t : result.getExceptions()) { @@ -417,11 +467,24 @@ public static MavenProject getFallbackProject(File projectFile) throws Assertion return newproject; } + public static boolean isIncompleteProject(MavenProject prj) { + return prj.getContextValue(CONTEXT_PARTIAL_PROJECT) != null; + } + public static boolean isFallbackproject(MavenProject prj) { if ("error".equals(prj.getGroupId()) && "error".equals(prj.getArtifactId()) && Bundle.LBL_Incomplete_Project_Name().equals(prj.getName())) { return true; } else { - return prj.getContextValue(CONTEXT_PARTIAL_PROJECT) == Boolean.TRUE; + return prj.getContextValue(CONTEXT_FALLBACK_PROJECT) != null; + } + } + + public static MavenProject getPartialProject(MavenProject prj) { + Object o = prj.getContextValue(CONTEXT_PARTIAL_PROJECT); + if (o instanceof MavenProject) { + return (MavenProject)o; + } else { + return null; } } diff --git a/java/maven/src/org/netbeans/modules/maven/problems/MavenModelProblemsProvider.java b/java/maven/src/org/netbeans/modules/maven/problems/MavenModelProblemsProvider.java index 34cddf8c5e44..b842285ff812 100644 --- a/java/maven/src/org/netbeans/modules/maven/problems/MavenModelProblemsProvider.java +++ b/java/maven/src/org/netbeans/modules/maven/problems/MavenModelProblemsProvider.java @@ -33,9 +33,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicReference; import java.util.logging.Level; import java.util.logging.Logger; import org.apache.maven.artifact.Artifact; @@ -86,7 +83,7 @@ }, projectType = "org-netbeans-modules-maven" ) public class MavenModelProblemsProvider implements ProjectProblemsProvider, InternalActionDelegate { - static final ScheduledExecutorService RP = new RequestProcessor(MavenModelProblemsProvider.class); + static final RequestProcessor RP = new RequestProcessor(MavenModelProblemsProvider.class); private static final Logger LOG = Logger.getLogger(MavenModelProblemsProvider.class.getName()); private final PropertyChangeSupport support = new PropertyChangeSupport(this); @@ -250,6 +247,10 @@ private Pair, Boolean> doGetProblems1(boolean sync) { prj = ((NbMavenProjectImpl)project).getFreshOriginalMavenProject(); } } + if (prj != null && !sanityBuildStatus) { + prj.setContextValue("org.netbeans.modules.maven.problems.primingNotDone", null); + LOG.log(Level.FINE, "Clearing priming status of {0}, fallback status is {1}", new Object[] { prj, NbMavenProject.isErrorPlaceholder(prj) }); + } //mark the project model as checked once and cached firePropertyChange(); return Pair.of(toRet, sanityBuildStatus); @@ -495,7 +496,7 @@ public void invokeAction(String command, Lookup context) throws IllegalArgumentE listener.finished(true); } else { LOG.log(Level.FINE, "Resolving sanity build action"); - CompletableFuture r = saba.resolve(); + CompletableFuture r = saba.resolve(context); r.whenComplete((a, e) -> { listener.finished(e == null); }); diff --git a/java/maven/src/org/netbeans/modules/maven/problems/ProblemReporterImpl.java b/java/maven/src/org/netbeans/modules/maven/problems/ProblemReporterImpl.java index 296cf3035f86..cab78a8bf229 100644 --- a/java/maven/src/org/netbeans/modules/maven/problems/ProblemReporterImpl.java +++ b/java/maven/src/org/netbeans/modules/maven/problems/ProblemReporterImpl.java @@ -93,7 +93,7 @@ public final class ProblemReporterImpl implements ProblemReporter, Comparator getPendingResult() { }) @Override public CompletableFuture resolve() { + return resolve(null); + } + + public CompletableFuture resolve(Lookup context) { CompletableFuture pr = pendingResult; if (pr != null && !pr.isDone()) { LOG.log(Level.FINE, "SanityBuild.resolve returns: {0}", pendingResult); @@ -112,8 +117,12 @@ public void run() { try { LOG.log(Level.FINE, "Configuring sanity build"); BeanRunConfig config = new BeanRunConfig(); + if (context != null) { + config.setActionContext(context); + } config.setExecutionDirectory(FileUtil.toFile(nbproject.getProjectDirectory())); NbMavenProject mavenPrj = nbproject.getLookup().lookup(NbMavenProject.class); + MavenProject loaded = NbMavenProject.getPartialProject(mavenPrj.getMavenProject()); String goals; if (mavenPrj != null && mavenPrj.getMavenProject().getVersion() != null @@ -175,7 +184,7 @@ public void run() { } pendingResult = publicResult; } - MavenModelProblemsProvider.RP.submit(toRet); + ((NbMavenProjectImpl)this.nbproject).scheduleProjectOperation(MavenModelProblemsProvider.RP.post(toRet)); return publicResult; } diff --git a/java/maven/src/org/netbeans/modules/maven/spi/newproject/CreateProjectBuilder.java b/java/maven/src/org/netbeans/modules/maven/spi/newproject/CreateProjectBuilder.java index 5e01527baeca..11b3b563d090 100644 --- a/java/maven/src/org/netbeans/modules/maven/spi/newproject/CreateProjectBuilder.java +++ b/java/maven/src/org/netbeans/modules/maven/spi/newproject/CreateProjectBuilder.java @@ -129,7 +129,7 @@ public void create() { } } } - if (parent != null && MavenProjectCache.isFallbackproject(parent)) { + if (parent != null && NbMavenProject.isErrorPlaceholder(parent)) { //#240989 - guessing that unloadable parent project could be the problem. parent = null; } diff --git a/java/maven/test/unit/data/projects/multiproject/democa/.gitignore b/java/maven/test/unit/data/projects/multiproject/democa/.gitignore new file mode 100644 index 000000000000..5a03bc30a460 --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/.gitignore @@ -0,0 +1,15 @@ +Thumbs.db +.DS_Store +.gradle +build/ +target/ +out/ +.micronaut/ +.idea +*.iml +*.ipr +*.iws +.project +.settings +.classpath +.factorypath diff --git a/java/maven/test/unit/data/projects/multiproject/democa/.mvn/wrapper/maven-wrapper.jar b/java/maven/test/unit/data/projects/multiproject/democa/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..bf82ff01c6cdae4a1bb754a6e062954d77ac5c11 GIT binary patch literal 59925 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

dy!05UMhSKsK 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 VCNKd3JGtOvEm(5t0lFyE{{i--k}m)N literal 0 HcmV?d00001 diff --git a/java/maven/test/unit/data/projects/multiproject/democa/.mvn/wrapper/maven-wrapper.properties b/java/maven/test/unit/data/projects/multiproject/democa/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000000..6caf4740aae8 --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# 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 +# +# https://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. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/java/maven/test/unit/data/projects/multiproject/democa/LICENSE b/java/maven/test/unit/data/projects/multiproject/democa/LICENSE new file mode 100644 index 000000000000..20e4bd85661f --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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 + + https://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. diff --git a/java/maven/test/unit/data/projects/multiproject/democa/NOTICE b/java/maven/test/unit/data/projects/multiproject/democa/NOTICE new file mode 100644 index 000000000000..be30feb22c76 --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/NOTICE @@ -0,0 +1 @@ +Copyright (c) 2023, Oracle and/or its affiliates. diff --git a/java/maven/test/unit/data/projects/multiproject/democa/README.md b/java/maven/test/unit/data/projects/multiproject/democa/README.md new file mode 100644 index 000000000000..94c8fb241880 --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/README.md @@ -0,0 +1,71 @@ +## Micronaut 4.0.3 Documentation + +- [User Guide](https://docs.micronaut.io/4.0.3/guide/) +- [API Reference](https://docs.micronaut.io/4.0.3/api/) +- [Configuration Reference](https://docs.micronaut.io/4.0.3/guide/configurationreference.html) +- [Micronaut Guides](https://guides.micronaut.io/) +--- +- [Micronaut Maven Plugin documentation](https://micronaut-projects.github.io/micronaut-maven-plugin/latest/) +## Feature data-jdbc documentation + +- [Micronaut Data JDBC documentation](https://micronaut-projects.github.io/micronaut-data/latest/guide/index.html#jdbc) + + +## Feature flyway documentation + +- [Micronaut Flyway Database Migration documentation](https://micronaut-projects.github.io/micronaut-flyway/latest/guide/index.html) + +- [https://flywaydb.org/](https://flywaydb.org/) + + +## Feature http-client documentation + +- [Micronaut HTTP Client documentation](https://docs.micronaut.io/latest/guide/index.html#nettyHttpClient) + + +## Feature jdbc-hikari documentation + +- [Micronaut Hikari JDBC Connection Pool documentation](https://micronaut-projects.github.io/micronaut-sql/latest/guide/index.html#jdbc) + + +## Feature maven-enforcer-plugin documentation + +- [https://maven.apache.org/enforcer/maven-enforcer-plugin/](https://maven.apache.org/enforcer/maven-enforcer-plugin/) + + +## Feature object-storage-oracle-cloud documentation + +- [Micronaut Object Storage - Oracle Cloud documentation](https://micronaut-projects.github.io/micronaut-object-storage/latest/guide/) + +- [https://www.oracle.com/cloud/storage/object-storage/](https://www.oracle.com/cloud/storage/object-storage/) + + +## Feature oracle-cloud-atp documentation + +- [Micronaut Oracle Cloud Autonomous Transaction Processing (ATP) documentation](https://micronaut-projects.github.io/micronaut-oracle-cloud/latest/guide/#_micronaut_oraclecloud_atp) + +- [https://www.oracle.com/autonomous-database/autonomous-transaction-processing/](https://www.oracle.com/autonomous-database/autonomous-transaction-processing/) + + +## Feature oracle-cloud-sdk documentation + +- [Micronaut Oracle Cloud SDK documentation](https://micronaut-projects.github.io/micronaut-oracle-cloud/latest/guide/) + +- [https://docs.cloud.oracle.com/en-us/iaas/Content/API/SDKDocs/javasdk.htm](https://docs.cloud.oracle.com/en-us/iaas/Content/API/SDKDocs/javasdk.htm) + + +## Feature serialization-jackson documentation + +- [Micronaut Serialization Jackson Core documentation](https://micronaut-projects.github.io/micronaut-serialization/latest/guide/) + + +## Feature test-resources documentation + +- [Micronaut Test Resources documentation](https://micronaut-projects.github.io/micronaut-test-resources/latest/guide/) + + +## Feature validation documentation + +- [Micronaut Validation documentation](https://micronaut-projects.github.io/micronaut-validation/latest/guide/) + + diff --git a/java/maven/test/unit/data/projects/multiproject/democa/lib/pom.xml b/java/maven/test/unit/data/projects/multiproject/democa/lib/pom.xml new file mode 100644 index 000000000000..7bc2a5e5dda4 --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/lib/pom.xml @@ -0,0 +1,210 @@ + + + + 4.0.0 + com.exampleca + lib + 1.0-SNAPSHOT + jar + + + com.exampleca + democa-parent + 1.0-SNAPSHOT + + + + jar + 17 + 17 + 4.0.3-oracle-00001 + + + + + central + https://repo.maven.apache.org/maven2 + + + + gcn + https://maven.oracle.com/public + + + + + + + cloud.graal.gcn + gcn-bom + 2.0 + pom + import + + + + + + io.micronaut + micronaut-inject + compile + + + io.micronaut.validation + micronaut-validation + compile + + + io.micronaut + micronaut-http-client + compile + + + io.micronaut + micronaut-http-server-netty + compile + + + io.micronaut.data + micronaut-data-jdbc + compile + + + io.micronaut.objectstorage + micronaut-object-storage-core + compile + + + io.micronaut.objectstorage + micronaut-object-storage-oracle-cloud + compile + + + io.micronaut.oraclecloud + micronaut-oraclecloud-atp + compile + + + io.micronaut.serde + micronaut-serde-jackson + compile + + + io.micronaut.sql + micronaut-jdbc-hikari + compile + + + io.micronaut.validation + micronaut-validation + compile + + + jakarta.validation + jakarta.validation-api + compile + + + ch.qos.logback + logback-classic + runtime + + + io.micronaut + micronaut-http-server + provided + + + io.micronaut.testresources + micronaut-test-resources-client + provided + + + io.micronaut.test + micronaut-test-junit5 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + + + + + + ${basedir}/src/main/resources + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + + + io.micronaut + micronaut-inject-java + ${micronaut.core.version} + + + io.micronaut.data + micronaut-data-processor + ${micronaut.data.version} + + + io.micronaut + micronaut-graal + ${micronaut.core.version} + + + io.micronaut.serde + micronaut-serde-processor + ${micronaut.serialization.version} + + + io.micronaut.validation + micronaut-validation-processor + ${micronaut.validation.version} + + + + -Amicronaut.processing.group=com.exampleca + -Amicronaut.processing.module=lib + + + + + + + diff --git a/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/ProfilePicturesApi.java b/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/ProfilePicturesApi.java new file mode 100644 index 000000000000..38f084693947 --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/ProfilePicturesApi.java @@ -0,0 +1,44 @@ +/* + * Copyright 2023 Oracle and/or its affiliates + * + * Licensed 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 + * + * https://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 com.exampleca; + +import io.micronaut.http.HttpRequest; +import io.micronaut.http.HttpResponse; +import io.micronaut.http.annotation.Delete; +import io.micronaut.http.annotation.Get; +import io.micronaut.http.annotation.Post; +import io.micronaut.http.annotation.Status; +import io.micronaut.http.multipart.CompletedFileUpload; +import io.micronaut.http.server.types.files.StreamedFile; + +import java.util.Optional; + +import static io.micronaut.http.HttpStatus.NO_CONTENT; +import static io.micronaut.http.MediaType.MULTIPART_FORM_DATA; + +public interface ProfilePicturesApi { + + @Post(uri = "/{userId}", consumes = MULTIPART_FORM_DATA) + HttpResponse upload(CompletedFileUpload fileUpload, String userId, HttpRequest request); + + @Get("/{userId}") + Optional> download(String userId); + + @Status(NO_CONTENT) + @Delete("/{userId}") + void delete(String userId); +} diff --git a/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/ProfilePicturesController.java b/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/ProfilePicturesController.java new file mode 100644 index 000000000000..4391c9c40dd9 --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/ProfilePicturesController.java @@ -0,0 +1,101 @@ +/* + * Copyright 2023 Oracle and/or its affiliates + * + * Licensed 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 + * + * https://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 com.exampleca; + +import io.micronaut.http.HttpRequest; +import io.micronaut.http.HttpResponse; +import io.micronaut.http.MutableHttpResponse; +import io.micronaut.http.annotation.Controller; +import io.micronaut.http.multipart.CompletedFileUpload; +import io.micronaut.http.server.types.files.StreamedFile; +import io.micronaut.http.server.util.HttpHostResolver; +import io.micronaut.http.uri.UriBuilder; +import io.micronaut.objectstorage.ObjectStorageEntry; +import io.micronaut.objectstorage.ObjectStorageOperations; +import io.micronaut.objectstorage.request.UploadRequest; +import io.micronaut.objectstorage.response.UploadResponse; +import io.micronaut.scheduling.TaskExecutors; +import io.micronaut.scheduling.annotation.ExecuteOn; + +import java.net.URI; +import java.util.Optional; + +import static io.micronaut.http.HttpHeaders.ETAG; +import static io.micronaut.http.MediaType.IMAGE_JPEG_TYPE; + +@Controller(ProfilePicturesController.PREFIX) +@ExecuteOn(TaskExecutors.IO) +class ProfilePicturesController implements ProfilePicturesApi { + + static final String PREFIX = "/pictures"; + + private final ObjectStorageOperations objectStorage; + private final HttpHostResolver httpHostResolver; + + ProfilePicturesController(ObjectStorageOperations objectStorage, + HttpHostResolver httpHostResolver) { + this.objectStorage = objectStorage; + this.httpHostResolver = httpHostResolver; + if (false) { + System.err.println(""); + } + } + + @Override + public HttpResponse upload(CompletedFileUpload fileUpload, + String userId, + HttpRequest request) { + String key = buildKey(userId); + UploadRequest objectStorageUpload = UploadRequest.fromCompletedFileUpload(fileUpload, key); + UploadResponse response = objectStorage.upload(objectStorageUpload); + + return HttpResponse + .created(location(request, userId)) + .header(ETAG, response.getETag()); + } + + private static String buildKey(String userId) { + return userId + ".jpg"; + } + + private URI location(HttpRequest request, String userId) { + return UriBuilder.of(httpHostResolver.resolve(request)) + .path(PREFIX) + .path(userId) + .build(); + } + + @Override + public Optional> download(String userId) { + String key = buildKey(userId); + return objectStorage.retrieve(key) + .map(ProfilePicturesController::buildStreamedFile); + } + + private static HttpResponse buildStreamedFile(ObjectStorageEntry entry) { + StreamedFile file = new StreamedFile(entry.getInputStream(), IMAGE_JPEG_TYPE).attach(entry.getKey()); + MutableHttpResponse httpResponse = HttpResponse.ok(); + file.process(httpResponse); + return httpResponse.body(file); + } + + @Override + public void delete(String userId) { + String key = buildKey(userId); + objectStorage.delete(key); + } +} diff --git a/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/controller/GenreController.java b/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/controller/GenreController.java new file mode 100644 index 000000000000..52888f251f6d --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/controller/GenreController.java @@ -0,0 +1,84 @@ +/* + * Copyright 2023 Oracle and/or its affiliates + * + * Licensed 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 + * + * https://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 com.exampleca.controller; + +import com.exampleca.domain.Genre; +import com.exampleca.service.GenreService; +import io.micronaut.data.model.Pageable; +import io.micronaut.http.HttpResponse; +import io.micronaut.http.annotation.Body; +import io.micronaut.http.annotation.Controller; +import io.micronaut.http.annotation.Delete; +import io.micronaut.http.annotation.Get; +import io.micronaut.http.annotation.Post; +import io.micronaut.http.annotation.Put; +import io.micronaut.http.annotation.Status; +import io.micronaut.scheduling.TaskExecutors; +import io.micronaut.scheduling.annotation.ExecuteOn; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import java.net.URI; +import java.util.List; +import java.util.Optional; + +import static io.micronaut.http.HttpHeaders.LOCATION; +import static io.micronaut.http.HttpStatus.NO_CONTENT; + +@ExecuteOn(TaskExecutors.IO) +@Controller("/genres") +class GenreController { + + private final GenreService genreService; + + GenreController(GenreService genreService) { + this.genreService = genreService; + } + + @Get("/{id}") + public Optional show(Long id) { + return genreService.findById(id); + } + + @Put("/{id}/{name}") + public HttpResponse update(long id, String name) { + genreService.update(id, name); + return HttpResponse + .noContent() + .header(LOCATION, URI.create("/genres/" + id).getPath()); + } + + @Get("/list") + public List list(@Valid Pageable pageable) { + return genreService.list(pageable); + } + + @Post + public HttpResponse save(@Body("name") @NotBlank String name) { + Genre genre = genreService.save(name); + + return HttpResponse + .created(genre) + .headers(headers -> headers.location(URI.create("/genres/" + genre.getId()))); + } + + @Delete("/{id}") + @Status(NO_CONTENT) + public void delete(Long id) { + genreService.delete(id); + } +} diff --git a/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/domain/Genre.java b/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/domain/Genre.java new file mode 100644 index 000000000000..1be6cfd256c5 --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/domain/Genre.java @@ -0,0 +1,57 @@ +/* + * Copyright 2023 Oracle and/or its affiliates + * + * Licensed 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 + * + * https://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 com.exampleca.domain; + +import io.micronaut.data.annotation.GeneratedValue; +import io.micronaut.data.annotation.Id; +import io.micronaut.data.annotation.MappedEntity; +import io.micronaut.serde.annotation.Serdeable; + +import jakarta.validation.constraints.NotNull; + +@Serdeable +@MappedEntity +public class Genre { + + @Id + @GeneratedValue + private Long id; + + @NotNull + private String name; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public String toString() { + return "Genre{" + "id=" + id + ", name='" + name + "'}"; + } +} diff --git a/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/repository/GenreRepository.java b/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/repository/GenreRepository.java new file mode 100644 index 000000000000..342eb3c7b62e --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/repository/GenreRepository.java @@ -0,0 +1,35 @@ +/* + * Copyright 2023 Oracle and/or its affiliates + * + * Licensed 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 + * + * https://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 com.exampleca.repository; + +import com.exampleca.domain.Genre; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.data.annotation.Id; +import io.micronaut.data.jdbc.annotation.JdbcRepository; +import io.micronaut.data.repository.PageableRepository; + +import jakarta.validation.constraints.NotBlank; + +import static io.micronaut.data.model.query.builder.sql.Dialect.ORACLE; + +@JdbcRepository(dialect = ORACLE) +public interface GenreRepository extends PageableRepository { + + Genre save(@NonNull @NotBlank String name); + + long update(@Id long id, @NonNull @NotBlank String name); +} diff --git a/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/service/GenreService.java b/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/service/GenreService.java new file mode 100644 index 000000000000..9f390d1ab39c --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/java/com/exampleca/service/GenreService.java @@ -0,0 +1,59 @@ +/* + * Copyright 2023 Oracle and/or its affiliates + * + * Licensed 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 + * + * https://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 com.exampleca.service; + +import com.exampleca.domain.Genre; +import com.exampleca.repository.GenreRepository; +import io.micronaut.data.model.Pageable; +import jakarta.inject.Singleton; + +import jakarta.transaction.Transactional; +import java.util.List; +import java.util.Optional; + +@Singleton +public class GenreService { + + private final GenreRepository genreRepository; + + GenreService(GenreRepository genreRepository) { + this.genreRepository = genreRepository; + } + + public Optional findById(Long id) { + return genreRepository.findById(id); + } + + @Transactional + public long update(long id, String name) { + return genreRepository.update(id, name); + } + + public List list(Pageable pageable) { + return genreRepository.findAll(pageable).getContent(); + } + + @Transactional + public Genre save(String name) { + return genreRepository.save(name); + } + + @Transactional + public void delete(long id) { + genreRepository.deleteById(id); + } +} diff --git a/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/resources/META-INF/native-image/resource-config.json b/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/resources/META-INF/native-image/resource-config.json new file mode 100644 index 000000000000..df505cc2fb9b --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/resources/META-INF/native-image/resource-config.json @@ -0,0 +1,6 @@ +{ + "resources": + [ + { "pattern": "db/migration/.*sql$" } + ] +} diff --git a/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/resources/db/migration/V1__schema.sql b/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/resources/db/migration/V1__schema.sql new file mode 100644 index 000000000000..4e6e95088ba3 --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/lib/src/main/resources/db/migration/V1__schema.sql @@ -0,0 +1,5 @@ +CREATE TABLE "GENRE" ( + "ID" NUMBER(19) PRIMARY KEY NOT NULL, + "NAME" VARCHAR(255) NOT NULL +); +CREATE SEQUENCE "GENRE_SEQ" MINVALUE 1 START WITH 1 NOCACHE NOCYCLE; diff --git a/java/maven/test/unit/data/projects/multiproject/democa/micronaut-cli.yml b/java/maven/test/unit/data/projects/multiproject/democa/micronaut-cli.yml new file mode 100644 index 000000000000..02fae4182e89 --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/micronaut-cli.yml @@ -0,0 +1,6 @@ +applicationType: default +defaultPackage: com.exampleca +testFramework: junit +sourceLanguage: java +buildTool: maven +features: [app-name, data, data-jdbc, flyway, gcn-bom, gcn-license, gcn-oci-cloud-app, gcn-oci-database, gcn-oci-objectstore, graalvm, http-client, java, java-application, jdbc-hikari, junit, logback, maven, maven-enforcer-plugin, netty-server, object-storage-oracle-cloud, oracle-cloud-atp, oracle-cloud-sdk, properties, readme, serialization-jackson, shade, test-resources, validation] diff --git a/java/maven/test/unit/data/projects/multiproject/democa/mvnw b/java/maven/test/unit/data/projects/multiproject/democa/mvnw new file mode 100755 index 000000000000..8822887469dd --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/mvnw @@ -0,0 +1,287 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# 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 +# +# https://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.1.1 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="`/usr/libexec/java_home`"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + printf '%s' "$(cd "$basedir"; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname $0)") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) wrapperUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $wrapperUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + QUIET="--quiet" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + QUIET="" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" + fi + [ $? -eq 0 ] || rm -f "$wrapperJarPath" + elif command -v curl > /dev/null; then + QUIET="--silent" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + QUIET="" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L + fi + [ $? -eq 0 ] || rm -f "$wrapperJarPath" + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaSource="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=`cygpath --path --windows "$javaSource"` + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/java/maven/test/unit/data/projects/multiproject/democa/mvnw.bat b/java/maven/test/unit/data/projects/multiproject/democa/mvnw.bat new file mode 100644 index 000000000000..1d7c59bec3fd --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/mvnw.bat @@ -0,0 +1,187 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.1.1 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/java/maven/test/unit/data/projects/multiproject/democa/oci/pom.xml b/java/maven/test/unit/data/projects/multiproject/democa/oci/pom.xml new file mode 100644 index 000000000000..da27a5cc6b30 --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/oci/pom.xml @@ -0,0 +1,255 @@ + + + + 4.0.0 + com.exampleca + oci + 1.0-SNAPSHOT + ${packaging} + democa-${artifactId} + + + com.exampleca + democa-parent + 1.0-SNAPSHOT + + + jar + 17 + 17 + 4.0.3-oracle-00001 + true + netty + com.exampleca.Application + + + + + central + https://repo.maven.apache.org/maven2 + + + + gcn + https://maven.oracle.com/public + + + + + + + cloud.graal.gcn + gcn-bom + 2.0 + pom + import + + + + + + com.oracle.oci.sdk + oci-java-sdk-addons-graalvm + compile + + + io.micronaut + micronaut-http-client + compile + + + io.micronaut + micronaut-http-server-netty + compile + + + io.micronaut.data + micronaut-data-jdbc + compile + + + io.micronaut.flyway + micronaut-flyway + compile + + + io.micronaut.objectstorage + micronaut-object-storage-oracle-cloud + compile + + + io.micronaut.oraclecloud + micronaut-oraclecloud-atp + compile + + + io.micronaut.oraclecloud + micronaut-oraclecloud-httpclient-netty + compile + + + io.micronaut.oraclecloud + micronaut-oraclecloud-sdk + compile + + + io.micronaut.serde + micronaut-serde-jackson + compile + + + io.micronaut.sql + micronaut-jdbc-hikari + compile + + + io.micronaut.validation + micronaut-validation + compile + + + jakarta.validation + jakarta.validation-api + compile + + + ch.qos.logback + logback-classic + runtime + + + org.flywaydb + flyway-database-oracle + runtime + + + io.micronaut.testresources + micronaut-test-resources-client + provided + + + io.micronaut.test + micronaut-test-junit5 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.mockito + mockito-core + test + + + com.exampleca + lib + 1.0-SNAPSHOT + compile + + + + + + com.google.cloud.tools + jib-maven-plugin + + + ${project.name} + + + + + io.micronaut.maven + micronaut-maven-plugin + + frolvlad/alpine-glibc:alpine-3.16 + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + + + io.micronaut + micronaut-inject-java + ${micronaut.core.version} + + + io.micronaut.data + micronaut-data-processor + ${micronaut.data.version} + + + io.micronaut + micronaut-inject + + + + + io.micronaut + micronaut-graal + ${micronaut.core.version} + + + io.micronaut.serde + micronaut-serde-processor + ${micronaut.serialization.version} + + + io.micronaut + micronaut-inject + + + + + io.micronaut.validation + micronaut-validation-processor + ${micronaut.validation.version} + + + io.micronaut + micronaut-inject + + + + + + -Amicronaut.processing.group=com.exampleca + -Amicronaut.processing.module=oci + + + + + + + diff --git a/java/maven/test/unit/data/projects/multiproject/democa/oci/src/main/java/com/exampleca/Application.java b/java/maven/test/unit/data/projects/multiproject/democa/oci/src/main/java/com/exampleca/Application.java new file mode 100644 index 000000000000..be1cb4e58cf9 --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/oci/src/main/java/com/exampleca/Application.java @@ -0,0 +1,37 @@ +/* + * Copyright 2023 Oracle and/or its affiliates + * + * Licensed 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 + * + * https://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 com.exampleca; + +import io.micronaut.core.annotation.NonNull; +import io.micronaut.context.ApplicationContextBuilder; +import io.micronaut.context.ApplicationContextConfigurer; +import io.micronaut.context.annotation.ContextConfigurer; +import io.micronaut.runtime.Micronaut; + +public class Application { + + @ContextConfigurer + public static class Configurer implements ApplicationContextConfigurer { + @Override + public void configure(@NonNull ApplicationContextBuilder builder) { + builder.defaultEnvironments("oraclecloud"); + } + } + public static void main(String[] args) { + Micronaut.run(Application.class, args); + } +} \ No newline at end of file diff --git a/java/maven/test/unit/data/projects/multiproject/democa/oci/src/main/resources/application-oraclecloud.properties b/java/maven/test/unit/data/projects/multiproject/democa/oci/src/main/resources/application-oraclecloud.properties new file mode 100644 index 000000000000..305919772677 --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/oci/src/main/resources/application-oraclecloud.properties @@ -0,0 +1,8 @@ +flyway.datasources.default.enabled=true +datasources.default.dialect=ORACLE +micronaut.application.name=oci +datasources.default.ocid= +micronaut.object-storage.oracle-cloud.default.namespace=${OBJECT_STORAGE_NAMESPACE} +datasources.default.walletPassword= +oci.config.profile=DEFAULT +micronaut.object-storage.oracle-cloud.default.bucket=${OBJECT_STORAGE_BUCKET} diff --git a/java/maven/test/unit/data/projects/multiproject/democa/oci/src/main/resources/bootstrap-oraclecloud.properties b/java/maven/test/unit/data/projects/multiproject/democa/oci/src/main/resources/bootstrap-oraclecloud.properties new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/java/maven/test/unit/data/projects/multiproject/democa/oci/src/main/resources/logback.xml b/java/maven/test/unit/data/projects/multiproject/democa/oci/src/main/resources/logback.xml new file mode 100644 index 000000000000..44b79c40d494 --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/oci/src/main/resources/logback.xml @@ -0,0 +1,14 @@ + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + diff --git a/java/maven/test/unit/data/projects/multiproject/democa/oci/src/test/java/com/exampleca/GenreControllerTest.java b/java/maven/test/unit/data/projects/multiproject/democa/oci/src/test/java/com/exampleca/GenreControllerTest.java new file mode 100644 index 000000000000..6a1f4db68e0b --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/oci/src/test/java/com/exampleca/GenreControllerTest.java @@ -0,0 +1,126 @@ +/* + * Copyright 2023 Oracle and/or its affiliates + * + * Licensed 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 + * + * https://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 com.exampleca; + +import com.exampleca.domain.Genre; +import com.exampleca.repository.GenreRepository; +import io.micronaut.core.type.Argument; +import io.micronaut.context.env.Environment; +import io.micronaut.http.HttpRequest; +import io.micronaut.http.HttpResponse; +import io.micronaut.http.client.HttpClient; +import io.micronaut.http.client.annotation.Client; +import io.micronaut.http.client.exceptions.HttpClientResponseException; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; +import jakarta.inject.Inject; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + +import java.util.Collections; +import java.util.List; + +import static io.micronaut.http.HttpHeaders.LOCATION; +import static io.micronaut.http.HttpStatus.CREATED; +import static io.micronaut.http.HttpStatus.NOT_FOUND; +import static io.micronaut.http.HttpStatus.NO_CONTENT; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + +@MicronautTest(environments = Environment.ORACLE_CLOUD) +class GenreControllerTest { + + @Inject + @Client("/") + HttpClient client; + + @Test + void testFindNonExistingGenreReturns404() { + HttpClientResponseException thrown = assertThrows(HttpClientResponseException.class, () -> { + client.toBlocking().exchange(HttpRequest.GET("/genres/99999")); + }); + + assertNotNull(thrown.getResponse()); + assertEquals(NOT_FOUND, thrown.getStatus()); + } + + @Test + void testGenreCrudOperations() { + + HttpResponse response = client.toBlocking().exchange( + HttpRequest.POST("/genres", Collections.singletonMap("name", "DevOps"))); + assertEquals(CREATED, response.getStatus()); + + response = client.toBlocking().exchange( + HttpRequest.POST("/genres", Collections.singletonMap("name", "Microservices"))); + assertEquals(CREATED, response.getStatus()); + + Long id = entityId(response); + + Genre genre = client.toBlocking().retrieve( + HttpRequest.GET("/genres/" + id), Genre.class); + assertEquals("Microservices", genre.getName()); + + response = client.toBlocking().exchange( + HttpRequest.PUT("/genres/" + id + "/Micro-services", null)); + assertEquals(NO_CONTENT, response.getStatus()); + + genre = client.toBlocking().retrieve( + HttpRequest.GET("/genres/" + id), Genre.class); + assertEquals("Micro-services", genre.getName()); + + List genres = client.toBlocking().retrieve( + HttpRequest.GET("/genres/list"), Argument.listOf(Genre.class)); + assertEquals(2, genres.size()); + + genres = client.toBlocking().retrieve( + HttpRequest.GET("/genres/list?size=1"), Argument.listOf(Genre.class)); + assertEquals(1, genres.size()); + assertEquals("DevOps", genres.get(0).getName()); + + genres = client.toBlocking().retrieve( + HttpRequest.GET("/genres/list?size=1&sort=name,desc"), Argument.listOf(Genre.class)); + assertEquals(1, genres.size()); + assertEquals("Micro-services", genres.get(0).getName()); + + genres = client.toBlocking().retrieve( + HttpRequest.GET("/genres/list?size=1&page=2"), Argument.listOf(Genre.class)); + assertEquals(0, genres.size()); + + response = client.toBlocking().exchange( + HttpRequest.DELETE("/genres/" + id)); + assertEquals(NO_CONTENT, response.getStatus()); + } + + private Long entityId(HttpResponse response) { + String value = response.header(LOCATION); + if (value == null) { + return null; + } + String path = "/genres/"; + int index = value.indexOf(path); + return index == -1 ? null : Long.valueOf(value.substring(index + path.length())); + } + + @Inject + GenreRepository genreRepository; + + @AfterEach + void cleanup() { + genreRepository.deleteAll(); + } +} diff --git a/java/maven/test/unit/data/projects/multiproject/democa/oci/src/test/java/com/exampleca/OciTest.java b/java/maven/test/unit/data/projects/multiproject/democa/oci/src/test/java/com/exampleca/OciTest.java new file mode 100644 index 000000000000..18d29f35cc4a --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/oci/src/test/java/com/exampleca/OciTest.java @@ -0,0 +1,37 @@ +/* + * Copyright 2023 Oracle and/or its affiliates + * + * Licensed 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 + * + * https://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 com.exampleca; + +import io.micronaut.runtime.EmbeddedApplication; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Assertions; + +import jakarta.inject.Inject; + +@MicronautTest +class OciTest { + + @Inject + EmbeddedApplication application; + + @Test + void testItWorks() { + Assertions.assertTrue(application.isRunning()); + } + +} diff --git a/java/maven/test/unit/data/projects/multiproject/democa/oci/src/test/java/com/exampleca/ProfilePicturesControllerTest.java b/java/maven/test/unit/data/projects/multiproject/democa/oci/src/test/java/com/exampleca/ProfilePicturesControllerTest.java new file mode 100644 index 000000000000..ca8ddb87dbf2 --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/oci/src/test/java/com/exampleca/ProfilePicturesControllerTest.java @@ -0,0 +1,115 @@ +/* + * Copyright 2023 Oracle and/or its affiliates + * + * Licensed 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 + * + * https://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 com.exampleca; + +import io.micronaut.http.HttpRequest; +import io.micronaut.http.client.HttpClient; +import io.micronaut.http.client.annotation.Client; +import io.micronaut.http.client.multipart.MultipartBody; +import io.micronaut.objectstorage.ObjectStorageEntry; +import io.micronaut.objectstorage.ObjectStorageOperations; +import io.micronaut.objectstorage.response.UploadResponse; +import io.micronaut.test.annotation.MockBean; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; +import jakarta.inject.Inject; +import org.junit.jupiter.api.Test; + +import java.io.InputStream; +import java.util.Optional; + +import static io.micronaut.http.HttpHeaders.ETAG; +import static io.micronaut.http.HttpHeaders.LOCATION; +import static io.micronaut.http.HttpStatus.CREATED; +import static io.micronaut.http.HttpStatus.NO_CONTENT; +import static io.micronaut.http.HttpStatus.OK; +import static io.micronaut.http.MediaType.MULTIPART_FORM_DATA_TYPE; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@MicronautTest +class ProfilePicturesControllerTest { + + @Inject + @Client(ProfilePicturesController.PREFIX) + HttpClient client; + + @Inject + ObjectStorageOperations objectStorageOperations; + + /* + * Mock ObjectStorageOperations with Mockito (https://site.mockito.org/) + * The @MockBean annotation indicates the method returns a mock bean of ObjectStorageOperations. + * The ObjectStorageOperations mock is injected into the test with @Inject above. + */ + @MockBean(ObjectStorageOperations.class) + ObjectStorageOperations objectStorageOperations() { + return mock(ObjectStorageOperations.class); + } + + @Test + void upload() { + + when(objectStorageOperations.upload(any())) + .then(invocation -> + when(mock(UploadResponse.class).getETag()) + .thenReturn("etag") + .getMock()); + + var body = MultipartBody.builder() + .addPart( + "fileUpload", + "picture.jpg", + "picture".getBytes()); + + var request = HttpRequest.POST("/avatar", body) + .contentType(MULTIPART_FORM_DATA_TYPE); + + var response = client.toBlocking().exchange(request); + + assertEquals(CREATED, response.status()); + assertTrue(response.header(LOCATION).endsWith("/pictures/avatar")); + assertEquals("etag", response.header(ETAG)); + } + + @Test + void download() { + when(objectStorageOperations.retrieve("avatar.jpg")) + .then(invocation -> Optional.of(mock(ObjectStorageEntry.class))); + ObjectStorageEntry objectStorageEntry = mock(ObjectStorageEntry.class); + when(objectStorageEntry.getInputStream()).then(invocation -> InputStream.nullInputStream()); + when(objectStorageOperations.retrieve("avatar.jpg")) + .then(invocation -> Optional.of(objectStorageEntry)); + + var response = client.toBlocking().exchange("/avatar"); + + assertEquals(OK, response.status()); + verify(objectStorageOperations).retrieve("avatar.jpg"); + } + + @Test + void delete() { + + var response = client.toBlocking().exchange(HttpRequest.DELETE("/avatar")); + + assertEquals(NO_CONTENT, response.status()); + verify(objectStorageOperations).delete("avatar.jpg"); + } +} diff --git a/java/maven/test/unit/data/projects/multiproject/democa/oci/src/test/resources/application-test.properties b/java/maven/test/unit/data/projects/multiproject/democa/oci/src/test/resources/application-test.properties new file mode 100644 index 000000000000..fa27a3fd2377 --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/oci/src/test/resources/application-test.properties @@ -0,0 +1,4 @@ +flyway.datasources.default.enabled=true +datasources.default.dialect=ORACLE +datasources.default.ocid= +datasources.default.walletPassword= diff --git a/java/maven/test/unit/data/projects/multiproject/democa/pom.xml b/java/maven/test/unit/data/projects/multiproject/democa/pom.xml new file mode 100644 index 000000000000..808842a1ef39 --- /dev/null +++ b/java/maven/test/unit/data/projects/multiproject/democa/pom.xml @@ -0,0 +1,45 @@ + + + + 4.0.0 + + io.micronaut.platform + micronaut-parent + 4.0.3-oracle-00001 + + + + central + https://repo.maven.apache.org/maven2 + + + gcn + https://maven.oracle.com/public + + + democa-parent + 1.0-SNAPSHOT + com.exampleca + democa + pom + + + lib + oci + + diff --git a/java/maven/test/unit/src/org/netbeans/modules/maven/NbMavenProjectImplTest.java b/java/maven/test/unit/src/org/netbeans/modules/maven/NbMavenProjectImplTest.java index 5106ae265274..d2db62b8d349 100644 --- a/java/maven/test/unit/src/org/netbeans/modules/maven/NbMavenProjectImplTest.java +++ b/java/maven/test/unit/src/org/netbeans/modules/maven/NbMavenProjectImplTest.java @@ -22,6 +22,9 @@ import java.io.IOException; import java.lang.ref.Reference; import java.lang.ref.WeakReference; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Collections; import java.util.Set; import java.util.TreeSet; diff --git a/java/maven/test/unit/src/org/netbeans/modules/maven/NbMavenProjectImplTest2.java b/java/maven/test/unit/src/org/netbeans/modules/maven/NbMavenProjectImplTest2.java new file mode 100644 index 000000000000..e114a96a516d --- /dev/null +++ b/java/maven/test/unit/src/org/netbeans/modules/maven/NbMavenProjectImplTest2.java @@ -0,0 +1,205 @@ +/* + * 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.netbeans.modules.maven; + +import java.io.File; +import java.io.IOException; +import java.lang.ref.Reference; +import java.lang.ref.WeakReference; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.Collections; +import java.util.Set; +import java.util.TreeSet; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import static junit.framework.TestCase.assertEquals; +import static junit.framework.TestCase.assertTrue; +import org.netbeans.api.annotations.common.SuppressWarnings; +import org.netbeans.api.java.queries.SourceLevelQuery; +import org.netbeans.api.project.FileOwnerQuery; +import org.netbeans.api.project.Project; +import org.netbeans.api.project.ProjectManager; +import org.netbeans.junit.NbTestCase; +import org.netbeans.junit.RandomlyFails; +import org.netbeans.modules.maven.api.NbMavenProject; +import org.netbeans.modules.maven.debug.MavenJPDAStart; +import org.netbeans.modules.maven.embedder.EmbedderFactory; +import org.netbeans.modules.maven.modelcache.MavenProjectCache; +import org.netbeans.modules.projectapi.nb.TimedWeakReference; +import org.netbeans.spi.project.ActionProgress; +import org.netbeans.spi.project.ActionProvider; +import org.netbeans.spi.project.LookupMerger; +import org.netbeans.spi.project.ProjectServiceProvider; +import org.openide.filesystems.FileObject; +import org.openide.filesystems.FileUtil; +import org.openide.filesystems.test.TestFileUtils; +import org.openide.modules.DummyInstalledFileLocator; +import org.openide.util.Lookup; +import org.openide.util.lookup.Lookups; +import org.openide.windows.IOProvider; + +public class NbMavenProjectImplTest2 extends NbTestCase { + + public NbMavenProjectImplTest2(String name) { + super(name); + } + + private FileObject wd; + private File repo; + private FileObject repoFO; + private FileObject dataFO; + + private static File getTestNBDestDir() { + String destDir = System.getProperty("test.netbeans.dest.dir"); + // set in project.properties as test-unit-sys-prop.test.netbeans.dest.dir + assertNotNull("test.netbeans.dest.dir property has to be set when running within binary distribution", destDir); + return new File(destDir); + } + + protected @Override void setUp() throws Exception { + // this property could be eventually initialized by NB module system, as MavenCacheDisabler i @OnStart, but that's unreliable. + System.setProperty("maven.defaultProjectBuilder.disableGlobalModelCache", "true"); + + clearWorkDir(); + + wd = FileUtil.toFileObject(getWorkDir()); + //synchronous reload of maven project asserts sanoty in some tests.. + System.setProperty("test.reload.sync", "false"); + + // This is needed, otherwose the core window's startup code will redirect + // System.out/err to the IOProvider, and its Trivial implementation will redirect + // it back to System.err - loop is formed. Initialize IOProvider first, it gets + // the real System.err/out references. + IOProvider p = IOProvider.getDefault(); + + repo = EmbedderFactory.getProjectEmbedder().getLocalRepositoryFile(); + repoFO = FileUtil.toFileObject(repo); + dataFO = FileUtil.toFileObject(getDataDir()); + + // Configure the DummyFilesLocator with NB harness dir + File destDirF = getTestNBDestDir(); + DummyInstalledFileLocator.registerDestDir(destDirF); + } + + protected @Override Level logLevel() { + return Level.FINE; + } + + protected @Override String logRoot() { + return "org.netbeans.modules.maven"; + } + + + private void cleanMavenRepository() throws IOException { + Path path = Paths.get(System.getProperty("user.home"), ".m2", "repository"); + if (!Files.isDirectory(path)) { + return; + } + FileUtil.toFileObject(path.toFile()).delete(); + } + + /** + * Primes the project including dependency fetch, waits for the operation to complete. + * @throws Exception + */ + void primeProject(Project p) throws Exception { + ActionProvider ap = p.getLookup().lookup(ActionProvider.class); + if (ap == null) { + throw new IllegalStateException("No action provider"); + } + assertTrue(Arrays.asList(ap.getSupportedActions()).contains(ActionProvider.COMMAND_PRIME)); + + CountDownLatch primeLatch = new CountDownLatch(1); + ActionProgress prg = new ActionProgress() { + @Override + protected void started() { + } + + @Override + public void finished(boolean success) { + primeLatch.countDown(); + } + }; + ap.invokeAction(ActionProvider.COMMAND_PRIME, Lookups.fixed(prg)); + primeLatch.await(300, TimeUnit.SECONDS); + } + + public void testSubprojectsReloadAfterPriming() throws Exception { + cleanMavenRepository(); + clearWorkDir(); + + FileUtil.toFileObject(getWorkDir()).refresh(); + + FileObject testApp = dataFO.getFileObject("projects/multiproject/democa"); + FileObject prjCopy = FileUtil.copyFile(testApp, FileUtil.toFileObject(getWorkDir()), "simpleProject"); + + Project p = ProjectManager.getDefault().findProject(prjCopy); + assertNotNull(p); + + Project sub = ProjectManager.getDefault().findProject(prjCopy.getFileObject("lib")); + assertNotNull(sub); + + // check the project's validity: + NbMavenProject parentMaven = p.getLookup().lookup(NbMavenProject.class); + NbMavenProject subMaven = sub.getLookup().lookup(NbMavenProject.class); + assertTrue("Fallback parent project is expected on unpopulated repository", NbMavenProject.isErrorPlaceholder(subMaven.getMavenProject())); + assertTrue("Fallback subproject project is expected on unpopulated repository", NbMavenProject.isErrorPlaceholder(subMaven.getMavenProject())); + + primeProject(sub); + assertFalse("Subproject must recover after priming itself", NbMavenProject.isIncomplete(subMaven.getMavenProject())); + } + + public void testSubprojectsReloadAfterParentPriming() throws Exception { + cleanMavenRepository(); + clearWorkDir(); + + FileUtil.toFileObject(getWorkDir()).refresh(); + + FileObject testApp = dataFO.getFileObject("projects/multiproject/democa"); + FileObject prjCopy = FileUtil.copyFile(testApp, FileUtil.toFileObject(getWorkDir()), "simpleProject"); + + Project p = ProjectManager.getDefault().findProject(prjCopy); + assertNotNull(p); + + Project sub = ProjectManager.getDefault().findProject(prjCopy.getFileObject("lib")); + assertNotNull(sub); + + // check the project's validity: + NbMavenProject parentMaven = p.getLookup().lookup(NbMavenProject.class); + NbMavenProject subMaven = sub.getLookup().lookup(NbMavenProject.class); + assertTrue("Fallback parent project is expected on unpopulated repository", NbMavenProject.isErrorPlaceholder(subMaven.getMavenProject())); + assertTrue("Fallback subproject project is expected on unpopulated repository", NbMavenProject.isErrorPlaceholder(subMaven.getMavenProject())); + + primeProject(p); + // subprojects are reloaded asynchronously. Watch out for child project's property for some time. + CountDownLatch latch = new CountDownLatch(1); + subMaven.addPropertyChangeListener((e) -> { + if (NbMavenProject.PROP_PROJECT.equals(e.getPropertyName())) { + latch.countDown(); + } + }); + latch.await(10, TimeUnit.SECONDS); + assertFalse("Subproject must recover after priming the parent", NbMavenProject.isIncomplete(subMaven.getMavenProject())); + } +} diff --git a/java/maven/test/unit/src/org/netbeans/modules/maven/execute/MockMavenExec.java b/java/maven/test/unit/src/org/netbeans/modules/maven/execute/MockMavenExec.java index cf1217e9a4ae..03e4367210f6 100644 --- a/java/maven/test/unit/src/org/netbeans/modules/maven/execute/MockMavenExec.java +++ b/java/maven/test/unit/src/org/netbeans/modules/maven/execute/MockMavenExec.java @@ -28,14 +28,23 @@ */ public class MockMavenExec extends MavenCommandLineExecutor.ExecuteMaven { - public volatile boolean executed; - public volatile RunConfig executedConfig; - public CountDownLatch executedLatch = new CountDownLatch(1); + public static class Reporter { + public volatile boolean executed; + public volatile RunConfig executedConfig; + public CountDownLatch executedLatch = new CountDownLatch(1); + + public void executed(RunConfig config) { + executed = true; + executedConfig = config; + } + } @Override public ExecutorTask execute(RunConfig config, InputOutput io, AbstractMavenExecutor.TabContext tc) { - executed = true; - executedConfig = config; + Reporter r = config.getActionContext().lookup(Reporter.class); + if (r != null) { + r.executed(config); + } ExecutorTask t = new ExecutorTask(() -> { }) { @Override @@ -53,7 +62,9 @@ public InputOutput getInputOutput() { } }; t.run(); - executedLatch.countDown(); + if (r != null) { + r.executedLatch.countDown(); + } return t; } diff --git a/java/maven/test/unit/src/org/netbeans/modules/maven/problems/PrimingActionTest.java b/java/maven/test/unit/src/org/netbeans/modules/maven/problems/PrimingActionTest.java index 60d6dab6cdf5..f49a5090500a 100644 --- a/java/maven/test/unit/src/org/netbeans/modules/maven/problems/PrimingActionTest.java +++ b/java/maven/test/unit/src/org/netbeans/modules/maven/problems/PrimingActionTest.java @@ -172,13 +172,13 @@ public void testActionNotEnabledOnOKProject() throws Exception { assertFalse(enabled); } - /** * Checks that the priming build does not actually run on OK project, although * the action may be temporarily enabled. */ public void testPrimingBuildNotRunOnOK() throws Exception { MockMavenExec mme = new MockMavenExec(); + MockMavenExec.Reporter r = new MockMavenExec.Reporter(); MockLookup.setLayersAndInstances(mme); CountDownLatch cdl = new CountDownLatch(1); MavenModelProblemsProvider.RP.submit(() -> { @@ -194,7 +194,8 @@ public void testPrimingBuildNotRunOnOK() throws Exception { Collection probs = collectProblems(p); assertEquals(0, probs.size()); ActionProvider ap = p.getLookup().lookup(ActionProvider.class); - boolean enabled = ap.isActionEnabled(ActionProvider.COMMAND_PRIME, Lookup.EMPTY); + + boolean enabled = ap.isActionEnabled(ActionProvider.COMMAND_PRIME, Lookups.fixed(r)); // the actual detection is still broken. assertTrue(enabled); @@ -228,7 +229,7 @@ public void finished(boolean success) { assertTrue(progress.finished); // but the execution was NOT really done - assertFalse(mme.executed); + assertFalse(r.executed); // check that the action is now disabled. assertFalse(ap.isActionEnabled(ActionProvider.COMMAND_PRIME, Lookup.EMPTY)); @@ -244,12 +245,13 @@ public void testPrimingBuildExecutes() throws Exception { System.setProperty("test.reload.sync", "true"); + MockMavenExec.Reporter r = new MockMavenExec.Reporter(); setupBrokenProject(); Project p = ProjectManager.getDefault().findProject(FileUtil.toFileObject(getWorkDir())); Collection probs = collectProblems(p); assertEquals(1, probs.size()); ActionProvider ap = p.getLookup().lookup(ActionProvider.class); - boolean enabled = ap.isActionEnabled(ActionProvider.COMMAND_PRIME, Lookup.EMPTY); + boolean enabled = ap.isActionEnabled(ActionProvider.COMMAND_PRIME, Lookups.fixed(r)); assertTrue(enabled); class Prog extends ActionProgress { CountDownLatch finish = new CountDownLatch(1); @@ -270,10 +272,10 @@ public void finished(boolean success) { Prog progress = new Prog(); - ap.invokeAction(ActionProvider.COMMAND_PRIME, Lookups.fixed(progress)); + ap.invokeAction(ActionProvider.COMMAND_PRIME, Lookups.fixed(progress, r)); progress.finish.await(); // but the execution was NOT really done - assertTrue(mme.executed); + assertTrue(r.executed); } } diff --git a/java/maven/test/unit/src/org/netbeans/modules/maven/spi/actions/ProvidedConfigurationsTest.java b/java/maven/test/unit/src/org/netbeans/modules/maven/spi/actions/ProvidedConfigurationsTest.java index d15793e1be20..1183cfe90e71 100644 --- a/java/maven/test/unit/src/org/netbeans/modules/maven/spi/actions/ProvidedConfigurationsTest.java +++ b/java/maven/test/unit/src/org/netbeans/modules/maven/spi/actions/ProvidedConfigurationsTest.java @@ -241,6 +241,7 @@ public void testContributedProfileActionCanCustomize() throws Exception { */ public void testExampleProviderConfigurationUsage() throws Exception { MockMavenExec mme = new MockMavenExec(); + MockMavenExec.Reporter r = new MockMavenExec.Reporter(); MockLookup.setLayersAndInstances(mme); setupOKProject(); @@ -252,15 +253,15 @@ public void testExampleProviderConfigurationUsage() throws Exception { ProjectConfigurationProvider pcp = p.getLookup().lookup(ProjectConfigurationProvider.class); ProjectConfiguration configToUse = pcp.getConfigurations().stream(). filter(x -> "Micronaut: dev mode".equals(x.getDisplayName())).findAny().get(); - Lookup ctx = Lookups.fixed(theFile, configToUse); + Lookup ctx = Lookups.fixed(theFile, configToUse, r); if (!ap.isActionEnabled(ActionProvider.COMMAND_RUN, ctx)) { // action not enabled return; } ap.invokeAction(ActionProvider.COMMAND_RUN, ctx); - mme.executedLatch.await(); - assertEquals(Arrays.asList("mn:run"), mme.executedConfig.getGoals()); + r.executedLatch.await(); + assertEquals(Arrays.asList("mn:run"), r.executedConfig.getGoals()); } @ProjectServiceProvider(service = MavenActionsProvider.class, projectType = NbMavenProject.TYPE)