From 7af9fc54262d16b5d22b6bd557e8841a4f04720e Mon Sep 17 00:00:00 2001 From: Kian Date: Wed, 2 Oct 2024 14:49:32 +0200 Subject: [PATCH 01/25] #765: Fix typos in DoD asciidoc --- documentation/DoD.adoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/documentation/DoD.adoc b/documentation/DoD.adoc index 4a29de5159..69dce4b52a 100644 --- a/documentation/DoD.adoc +++ b/documentation/DoD.adoc @@ -21,11 +21,11 @@ Otherwise if a check failed (red cross) you need to click the `Details` link, re ** [ ] The build and all automated tests succeeded. If failed and you clicked on `Details` add read the logs to find the error. ** [ ] The contributors license agreement (CLA) is signed by all contributors of the PR. -** [ ] Git-Gardian did not report any security issue +** [ ] Git-Guardian did not report any security issue * [ ] The feature branch of the PR is up-to-date with the `main` branch. If you see `This branch is out-of-date with the base branch` in the PR click the `Update branch` button to fix (or manually merge with the `main` from upstream locally and push your changes). In case you see `This branch has conflicts that must be resolved` instead, you need to resolve conflicts. -Very simple conficts may be resolved in the browser on github. +Very simple conflicts may be resolved in the browser on github. But as a general recommendation you should resolve the conflicts locally with proper merge tool support and rerun tests before you push the merged changes. * [ ] You followed all link:coding-conventions.adoc[coding conventions] * [ ] You have already added the issue implemented by your PR in https://github.com/devonfw/ide/blob/master/CHANGELOG.adoc[CHANGELOG.adoc] to the next open release (see milestones or https://github.com/devonfw/IDEasy/blob/main/.mvn/maven.config[maven.config]). @@ -41,11 +41,11 @@ There are very few tools as exception to this rule like `Docker` that extend `Gl ** [ ] The tool can be configured locally inside `$IDE_HOME/conf` and not from a global location (e.g. in `$HOME`). Note: If a tool reads configuration files from the users home directory this is not given as two IDEasy projects using the same tool then would read the same config so one installation would influence the other. ** [ ] The help page displays information about the commandlet and its properties (CLI parameters) explaining how to use it properly. -There are no warnings logged in the help output (like `Cound not find key 'cmd-gcviewer' in ResourceBundle nls.Ide.properties`). +There are no warnings logged in the help output (like `Could not find key 'cmd-gcviewer' in ResourceBundle nls.Ide.properties`). Therefore add proper help texts for all supported languages https://github.com/devonfw/IDEasy/tree/main/cli/src/main/resources/nls[here]. -** [ ] The new tool is added to the table of tools in https://github.com/devonfw/ide/blob/master/documentation/LICENSE.asciidoc#license[LICENSE.asciidoc] with its according licesne. +** [ ] The new tool is added to the table of tools in https://github.com/devonfw/ide/blob/master/documentation/LICENSE.asciidoc#license[LICENSE.asciidoc] with its according license. If that license is not yet included, the full license text needs to be added. ** [ ] The new commandlet installs potential dependencies automatically (e.g. `getCommandlet(«DependentTool».class).install()` in overridden `install` method). ** [ ] The variables `«TOOL»_VERSION` and `«TOOL»_EDITION` are honored by your commandlet so if present that edition and version will be downloaded and installed (happens by default but important if you implement custom installation logic). -** [ ] The new commandlet is tested on all plattforms it is availible for. +** [ ] The new commandlet is tested on all platforms it is available for. Assuming you are using Windows, testing for Linux can be done with WSL or Virtual Box and for MacOS we have a virtual cloud instance. From 8921a0c880280156c27c88e5e3732c086d62e677 Mon Sep 17 00:00:00 2001 From: KianRolf Date: Mon, 11 Nov 2024 13:46:51 +0100 Subject: [PATCH 02/25] Testprovider --- .../java/com/devonfw/tools/ide/serviceprovider/TestLogger.java | 2 ++ .../devonfw/tools/ide/serviceprovider/TestLoggerFactory.java | 2 ++ .../com/devonfw/tools/ide/serviceprovider/TestProvider.java | 2 ++ .../META-INF/services/org.slf4j.spi.SLF4JServiceProvider | 0 4 files changed, 6 insertions(+) create mode 100644 cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLogger.java create mode 100644 cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLoggerFactory.java create mode 100644 cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestProvider.java create mode 100644 cli/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider diff --git a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLogger.java b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLogger.java new file mode 100644 index 0000000000..37e438ddc3 --- /dev/null +++ b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLogger.java @@ -0,0 +1,2 @@ +package com.devonfw.tools.ide.serviceprovider;public class TestLogger { +} diff --git a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLoggerFactory.java b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLoggerFactory.java new file mode 100644 index 0000000000..bd4899bfd7 --- /dev/null +++ b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLoggerFactory.java @@ -0,0 +1,2 @@ +package com.devonfw.tools.ide.serviceprovider;public class TestLoggerFactory { +} diff --git a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestProvider.java b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestProvider.java new file mode 100644 index 0000000000..5b6dbec7b8 --- /dev/null +++ b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestProvider.java @@ -0,0 +1,2 @@ +package com.devonfw.tools.ide.serviceprovider;public class TestProvider { +} diff --git a/cli/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/cli/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider new file mode 100644 index 0000000000..e69de29bb2 From 6a139b3529d4b81a6512f6651b86867cd5debfbc Mon Sep 17 00:00:00 2001 From: KianRolf Date: Mon, 11 Nov 2024 13:47:11 +0100 Subject: [PATCH 03/25] extension --- .../tools/ide/serviceprovider/TestLogger.java | 329 +++++++++++++++++- .../serviceprovider/TestLoggerFactory.java | 13 +- .../ide/serviceprovider/TestProvider.java | 43 ++- .../org.slf4j.spi.SLF4JServiceProvider | 1 + 4 files changed, 383 insertions(+), 3 deletions(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLogger.java b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLogger.java index 37e438ddc3..5c29fd0d0f 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLogger.java +++ b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLogger.java @@ -1,2 +1,329 @@ -package com.devonfw.tools.ide.serviceprovider;public class TestLogger { +package com.devonfw.tools.ide.serviceprovider; + +import org.slf4j.Marker; + +public class TestLogger implements org.slf4j.Logger { + + private final String name; + + public TestLogger(String name) { + + this.name = name; + } + + @Override + public String getName() { + + return name; + } + + @Override + public boolean isTraceEnabled() { + + return false; + } + + @Override + public void trace(String s) { + + } + + @Override + public void trace(String s, Object o) { + + } + + @Override + public void trace(String s, Object o, Object o1) { + + } + + @Override + public void trace(String s, Object... objects) { + + } + + @Override + public void trace(String s, Throwable throwable) { + + } + + @Override + public boolean isTraceEnabled(Marker marker) { + + return false; + } + + @Override + public void trace(Marker marker, String s) { + + } + + @Override + public void trace(Marker marker, String s, Object o) { + + } + + @Override + public void trace(Marker marker, String s, Object o, Object o1) { + + } + + @Override + public void trace(Marker marker, String s, Object... objects) { + + } + + @Override + public void trace(Marker marker, String s, Throwable throwable) { + + } + + @Override + public boolean isDebugEnabled() { + + return true; + } + + @Override + public void debug(String s) { + + } + + @Override + public void debug(String s, Object o) { + + } + + @Override + public void debug(String s, Object o, Object o1) { + + } + + @Override + public void debug(String s, Object... objects) { + + } + + @Override + public void debug(String s, Throwable throwable) { + + } + + @Override + public boolean isDebugEnabled(Marker marker) { + + return false; + } + + @Override + public void debug(Marker marker, String s) { + + } + + @Override + public void debug(Marker marker, String s, Object o) { + + } + + @Override + public void debug(Marker marker, String s, Object o, Object o1) { + + } + + @Override + public void debug(Marker marker, String s, Object... objects) { + + } + + @Override + public void debug(Marker marker, String s, Throwable throwable) { + + } + + @Override + public boolean isInfoEnabled() { + + return false; + } + + @Override + public void info(String s) { + + } + + @Override + public void info(String s, Object o) { + + } + + @Override + public void info(String s, Object o, Object o1) { + + } + + @Override + public void info(String s, Object... objects) { + + } + + @Override + public void info(String s, Throwable throwable) { + + } + + @Override + public boolean isInfoEnabled(Marker marker) { + + return false; + } + + @Override + public void info(Marker marker, String s) { + + } + + @Override + public void info(Marker marker, String s, Object o) { + + } + + @Override + public void info(Marker marker, String s, Object o, Object o1) { + + } + + @Override + public void info(Marker marker, String s, Object... objects) { + + } + + @Override + public void info(Marker marker, String s, Throwable throwable) { + + } + + @Override + public boolean isWarnEnabled() { + + return false; + } + + @Override + public void warn(String s) { + + } + + @Override + public void warn(String s, Object o) { + + } + + @Override + public void warn(String s, Object... objects) { + + } + + @Override + public void warn(String s, Object o, Object o1) { + + } + + @Override + public void warn(String s, Throwable throwable) { + + } + + @Override + public boolean isWarnEnabled(Marker marker) { + + return false; + } + + @Override + public void warn(Marker marker, String s) { + + } + + @Override + public void warn(Marker marker, String s, Object o) { + + } + + @Override + public void warn(Marker marker, String s, Object o, Object o1) { + + } + + @Override + public void warn(Marker marker, String s, Object... objects) { + + } + + @Override + public void warn(Marker marker, String s, Throwable throwable) { + + } + + @Override + public boolean isErrorEnabled() { + + return false; + } + + @Override + public void error(String s) { + + } + + @Override + public void error(String s, Object o) { + + } + + @Override + public void error(String s, Object o, Object o1) { + + } + + @Override + public void error(String s, Object... objects) { + + } + + @Override + public void error(String s, Throwable throwable) { + + } + + @Override + public boolean isErrorEnabled(Marker marker) { + + return false; + } + + @Override + public void error(Marker marker, String s) { + + } + + @Override + public void error(Marker marker, String s, Object o) { + + } + + @Override + public void error(Marker marker, String s, Object o, Object o1) { + + } + + @Override + public void error(Marker marker, String s, Object... objects) { + + } + + @Override + public void error(Marker marker, String s, Throwable throwable) { + + } } diff --git a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLoggerFactory.java b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLoggerFactory.java index bd4899bfd7..796a69c1df 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLoggerFactory.java +++ b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLoggerFactory.java @@ -1,2 +1,13 @@ -package com.devonfw.tools.ide.serviceprovider;public class TestLoggerFactory { +package com.devonfw.tools.ide.serviceprovider; + +import org.slf4j.ILoggerFactory; +import org.slf4j.Logger; + +public class TestLoggerFactory implements ILoggerFactory { + + @Override + public Logger getLogger(String name) { + + return new TestLogger(name); + } } diff --git a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestProvider.java b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestProvider.java index 5b6dbec7b8..98cea91868 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestProvider.java +++ b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestProvider.java @@ -1,2 +1,43 @@ -package com.devonfw.tools.ide.serviceprovider;public class TestProvider { +package com.devonfw.tools.ide.serviceprovider; + +import org.slf4j.ILoggerFactory; +import org.slf4j.IMarkerFactory; +import org.slf4j.helpers.NOPMDCAdapter; +import org.slf4j.spi.MDCAdapter; +import org.slf4j.spi.SLF4JServiceProvider; + +public class TestProvider implements SLF4JServiceProvider { + + private final String REQUESTED_API_VERSION = "2.0.12"; + private TestLoggerFactory testLoggerFactory; + + + @Override + public ILoggerFactory getLoggerFactory() { + + return testLoggerFactory; + } + + @Override + public IMarkerFactory getMarkerFactory() { + + return null; + } + + @Override + public MDCAdapter getMDCAdapter() { + + return new NOPMDCAdapter(); + } + + @Override + public String getRequestedApiVersion() { + + return REQUESTED_API_VERSION; + } + + @Override + public void initialize() { + testLoggerFactory = new TestLoggerFactory(); + } } diff --git a/cli/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/cli/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider index e69de29bb2..9ea9509eba 100644 --- a/cli/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider +++ b/cli/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider @@ -0,0 +1 @@ +com.devonfw.tools.ide.serviceprovider.TestProvider From fcf4a6463264a7318b19570005fb6618d32314b7 Mon Sep 17 00:00:00 2001 From: KianRolf Date: Wed, 13 Nov 2024 16:09:06 +0100 Subject: [PATCH 04/25] draft pr --- .../main/java/com/devonfw/tools/ide/cli/Ideasy.java | 5 +++++ cli/src/test/resources/xmlmerger/cpathtest/result.xml | 11 +++++++++++ cli/src/test/resources/xmlmerger/cpathtest/source.xml | 10 ++++++++++ cli/src/test/resources/xmlmerger/cpathtest/target.xml | 10 ++++++++++ 4 files changed, 36 insertions(+) create mode 100644 cli/src/test/resources/xmlmerger/cpathtest/result.xml create mode 100644 cli/src/test/resources/xmlmerger/cpathtest/source.xml create mode 100644 cli/src/test/resources/xmlmerger/cpathtest/target.xml diff --git a/cli/src/main/java/com/devonfw/tools/ide/cli/Ideasy.java b/cli/src/main/java/com/devonfw/tools/ide/cli/Ideasy.java index ae148c221a..484b0321d3 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/cli/Ideasy.java +++ b/cli/src/main/java/com/devonfw/tools/ide/cli/Ideasy.java @@ -3,6 +3,9 @@ import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.devonfw.tools.ide.commandlet.ContextCommandlet; import com.devonfw.tools.ide.context.AbstractIdeContext; import com.devonfw.tools.ide.context.IdeContext; @@ -24,6 +27,8 @@ public final class Ideasy { * * @param args the command-line arguments. */ + private static final Logger logger = LoggerFactory.getLogger(Ideasy.class); + public static void main(String... args) { int exitStatus = new Ideasy().run(args); diff --git a/cli/src/test/resources/xmlmerger/cpathtest/result.xml b/cli/src/test/resources/xmlmerger/cpathtest/result.xml new file mode 100644 index 0000000000..33c7c0f471 --- /dev/null +++ b/cli/src/test/resources/xmlmerger/cpathtest/result.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/cli/src/test/resources/xmlmerger/cpathtest/source.xml b/cli/src/test/resources/xmlmerger/cpathtest/source.xml new file mode 100644 index 0000000000..bed7e239e7 --- /dev/null +++ b/cli/src/test/resources/xmlmerger/cpathtest/source.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/cli/src/test/resources/xmlmerger/cpathtest/target.xml b/cli/src/test/resources/xmlmerger/cpathtest/target.xml new file mode 100644 index 0000000000..8626985a45 --- /dev/null +++ b/cli/src/test/resources/xmlmerger/cpathtest/target.xml @@ -0,0 +1,10 @@ + + + + + + From e2b1c2b42f64e153e90673ed028b6af80b12fefe Mon Sep 17 00:00:00 2001 From: KianRolf Date: Wed, 13 Nov 2024 16:12:29 +0100 Subject: [PATCH 05/25] fix --- cli/src/test/resources/xmlmerger/cpathtest/result.xml | 11 ----------- cli/src/test/resources/xmlmerger/cpathtest/source.xml | 10 ---------- cli/src/test/resources/xmlmerger/cpathtest/target.xml | 10 ---------- 3 files changed, 31 deletions(-) delete mode 100644 cli/src/test/resources/xmlmerger/cpathtest/result.xml delete mode 100644 cli/src/test/resources/xmlmerger/cpathtest/source.xml delete mode 100644 cli/src/test/resources/xmlmerger/cpathtest/target.xml diff --git a/cli/src/test/resources/xmlmerger/cpathtest/result.xml b/cli/src/test/resources/xmlmerger/cpathtest/result.xml deleted file mode 100644 index 33c7c0f471..0000000000 --- a/cli/src/test/resources/xmlmerger/cpathtest/result.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/cli/src/test/resources/xmlmerger/cpathtest/source.xml b/cli/src/test/resources/xmlmerger/cpathtest/source.xml deleted file mode 100644 index bed7e239e7..0000000000 --- a/cli/src/test/resources/xmlmerger/cpathtest/source.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/cli/src/test/resources/xmlmerger/cpathtest/target.xml b/cli/src/test/resources/xmlmerger/cpathtest/target.xml deleted file mode 100644 index 8626985a45..0000000000 --- a/cli/src/test/resources/xmlmerger/cpathtest/target.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - From 2fb8f0dc6a2bb78ff14d0f1d5589a6a512cda678 Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Wed, 22 Jan 2025 14:20:40 +0100 Subject: [PATCH 06/25] #404: implemented requested changes renamed TestLogger to IdeLoggerAdapter added missing param to javadoc renamed TestProvider to TestProviderImpl renamed TestLoggerFactory to TestLoggerFactoryImpl --- .../com/devonfw/tools/ide/log/IdeSubLoggerOut.java | 1 + .../{TestLogger.java => IdeLoggerAdapter.java} | 13 +++++++++++-- ...oggerFactory.java => TestLoggerFactoryImpl.java} | 7 +++++-- .../{TestProvider.java => TestProviderImpl.java} | 9 ++++++--- .../services/org.slf4j.spi.SLF4JServiceProvider | 2 +- 5 files changed, 24 insertions(+), 8 deletions(-) rename cli/src/main/java/com/devonfw/tools/ide/serviceprovider/{TestLogger.java => IdeLoggerAdapter.java} (95%) rename cli/src/main/java/com/devonfw/tools/ide/serviceprovider/{TestLoggerFactory.java => TestLoggerFactoryImpl.java} (52%) rename cli/src/main/java/com/devonfw/tools/ide/serviceprovider/{TestProvider.java => TestProviderImpl.java} (75%) diff --git a/cli/src/main/java/com/devonfw/tools/ide/log/IdeSubLoggerOut.java b/cli/src/main/java/com/devonfw/tools/ide/log/IdeSubLoggerOut.java index acd79c75ea..91cae563f1 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/log/IdeSubLoggerOut.java +++ b/cli/src/main/java/com/devonfw/tools/ide/log/IdeSubLoggerOut.java @@ -17,6 +17,7 @@ public class IdeSubLoggerOut extends AbstractIdeSubLogger { * @param out the {@link Appendable} to {@link Appendable#append(CharSequence) write} log messages to. * @param colored - {@code true} for colored output according to {@link IdeLogLevel}, {@code false} otherwise. * @param minLogLevel the minimum log level (threshold). + * @param listener the {@link IdeLogListener} to listen to. */ public IdeSubLoggerOut(IdeLogLevel level, Appendable out, boolean colored, IdeLogLevel minLogLevel, IdeLogListener listener) { diff --git a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLogger.java b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java similarity index 95% rename from cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLogger.java rename to cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java index 5c29fd0d0f..a541dd4367 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLogger.java +++ b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java @@ -1,12 +1,21 @@ package com.devonfw.tools.ide.serviceprovider; +import org.slf4j.Logger; import org.slf4j.Marker; -public class TestLogger implements org.slf4j.Logger { +/** + * Implementation of {@link Logger}. + */ +public class IdeLoggerAdapter implements Logger { private final String name; - public TestLogger(String name) { + /** + * The constructor. + * + * @param name of the logger. + */ + public IdeLoggerAdapter(String name) { this.name = name; } diff --git a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLoggerFactory.java b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLoggerFactoryImpl.java similarity index 52% rename from cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLoggerFactory.java rename to cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLoggerFactoryImpl.java index 796a69c1df..69bf038107 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLoggerFactory.java +++ b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestLoggerFactoryImpl.java @@ -3,11 +3,14 @@ import org.slf4j.ILoggerFactory; import org.slf4j.Logger; -public class TestLoggerFactory implements ILoggerFactory { +/** + * Implementation of {@link ILoggerFactory}. + */ +public class TestLoggerFactoryImpl implements ILoggerFactory { @Override public Logger getLogger(String name) { - return new TestLogger(name); + return new IdeLoggerAdapter(name); } } diff --git a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestProvider.java b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestProviderImpl.java similarity index 75% rename from cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestProvider.java rename to cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestProviderImpl.java index 98cea91868..62fc569181 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestProvider.java +++ b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/TestProviderImpl.java @@ -6,10 +6,13 @@ import org.slf4j.spi.MDCAdapter; import org.slf4j.spi.SLF4JServiceProvider; -public class TestProvider implements SLF4JServiceProvider { +/** + * Implementation of {@link SLF4JServiceProvider}. + */ +public class TestProviderImpl implements SLF4JServiceProvider { private final String REQUESTED_API_VERSION = "2.0.12"; - private TestLoggerFactory testLoggerFactory; + private TestLoggerFactoryImpl testLoggerFactory; @Override @@ -38,6 +41,6 @@ public String getRequestedApiVersion() { @Override public void initialize() { - testLoggerFactory = new TestLoggerFactory(); + testLoggerFactory = new TestLoggerFactoryImpl(); } } diff --git a/cli/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/cli/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider index 9ea9509eba..c70584fc82 100644 --- a/cli/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider +++ b/cli/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider @@ -1 +1 @@ -com.devonfw.tools.ide.serviceprovider.TestProvider +com.devonfw.tools.ide.serviceprovider.TestProviderImpl From aaa9fd33cd5feccef66bcc3c70ec66bf86e3d1c7 Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Mon, 27 Jan 2025 16:37:51 +0100 Subject: [PATCH 07/25] #404: implemented IdeLoggerAdapter added first implementations for IdeLoggerAdapter methods replaced IdeSubLoggerSlf4j with IdeSubLoggerOut --- cli/pom.xml | 6 - .../tools/ide/context/AbstractIdeContext.java | 4 + .../ide/serviceprovider/IdeLoggerAdapter.java | 132 ++++++++---------- .../tools/ide/context/IdeSlf4jContext.java | 4 +- .../devonfw/tools/ide/log/IdeTestLogger.java | 2 +- 5 files changed, 69 insertions(+), 79 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index afb0216403..759259eabc 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -62,12 +62,6 @@ 2.0.12 - - ch.qos.logback - logback-classic - 1.5.3 - - me.tongfei progressbar diff --git a/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java b/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java index 3b4f56d8f7..9dd117dd57 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java +++ b/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java @@ -142,6 +142,9 @@ public abstract class AbstractIdeContext implements IdeContext { private NetworkProxy networkProxy; + /** Context used for logging */ + public static IdeContext loggingContext; + /** * The constructor. * @@ -207,6 +210,7 @@ public AbstractIdeContext(IdeStartContextImpl startContext, Path workingDirector } this.defaultToolRepository = new DefaultToolRepository(this); + loggingContext = this; } private Path findIdeRoot(Path ideHomePath) { diff --git a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java index a541dd4367..ebc9e9851f 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java +++ b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java @@ -1,5 +1,7 @@ package com.devonfw.tools.ide.serviceprovider; +import static com.devonfw.tools.ide.context.AbstractIdeContext.loggingContext; + import org.slf4j.Logger; import org.slf4j.Marker; @@ -28,311 +30,301 @@ public String getName() { @Override public boolean isTraceEnabled() { - - return false; + return loggingContext.trace().isEnabled(); } @Override public void trace(String s) { - + loggingContext.trace(s); } @Override public void trace(String s, Object o) { - + loggingContext.trace(s, o); } @Override public void trace(String s, Object o, Object o1) { - + loggingContext.trace(s, o, o1); } @Override public void trace(String s, Object... objects) { - + loggingContext.trace(s, objects); } @Override public void trace(String s, Throwable throwable) { - + loggingContext.trace(s, throwable); } @Override public boolean isTraceEnabled(Marker marker) { - - return false; + return loggingContext.trace().isEnabled(); } @Override public void trace(Marker marker, String s) { - + loggingContext.trace(s); } @Override public void trace(Marker marker, String s, Object o) { - + loggingContext.trace(s, o); } @Override public void trace(Marker marker, String s, Object o, Object o1) { - + loggingContext.trace(s, o, o1); } @Override public void trace(Marker marker, String s, Object... objects) { - + loggingContext.trace(s, objects); } @Override public void trace(Marker marker, String s, Throwable throwable) { - + loggingContext.trace(s, throwable); } @Override public boolean isDebugEnabled() { - - return true; + return loggingContext.debug().isEnabled(); } @Override public void debug(String s) { - + loggingContext.debug(s); } @Override public void debug(String s, Object o) { - + loggingContext.debug(s, o); } @Override public void debug(String s, Object o, Object o1) { - + loggingContext.debug(s, o, o1); } @Override public void debug(String s, Object... objects) { - + loggingContext.debug(s, objects); } @Override public void debug(String s, Throwable throwable) { - + loggingContext.debug(s, throwable); } @Override public boolean isDebugEnabled(Marker marker) { - - return false; + return loggingContext.debug().isEnabled(); } @Override public void debug(Marker marker, String s) { - + loggingContext.debug(s); } @Override public void debug(Marker marker, String s, Object o) { - + loggingContext.debug(s, o); } @Override public void debug(Marker marker, String s, Object o, Object o1) { - + loggingContext.debug(s, o, o1); } @Override public void debug(Marker marker, String s, Object... objects) { - + loggingContext.debug(s, objects); } @Override public void debug(Marker marker, String s, Throwable throwable) { - + loggingContext.debug(s, throwable); } @Override public boolean isInfoEnabled() { - - return false; + return loggingContext.info().isEnabled(); } @Override public void info(String s) { - + loggingContext.info(s); } @Override public void info(String s, Object o) { - + loggingContext.info(s, o); } @Override public void info(String s, Object o, Object o1) { - + loggingContext.info(s, o, o1); } @Override public void info(String s, Object... objects) { - + loggingContext.info(s, objects); } @Override public void info(String s, Throwable throwable) { - + loggingContext.info(s, throwable); } @Override public boolean isInfoEnabled(Marker marker) { - - return false; + return loggingContext.info().isEnabled(); } @Override public void info(Marker marker, String s) { - + loggingContext.info(s); } @Override public void info(Marker marker, String s, Object o) { - + loggingContext.info(s, o); } @Override public void info(Marker marker, String s, Object o, Object o1) { - + loggingContext.info(s, o, o1); } @Override public void info(Marker marker, String s, Object... objects) { - + loggingContext.info(s, objects); } @Override public void info(Marker marker, String s, Throwable throwable) { - + loggingContext.info(s, throwable); } @Override public boolean isWarnEnabled() { - - return false; + return loggingContext.warning().isEnabled(); } @Override public void warn(String s) { - + loggingContext.warning(s); } @Override public void warn(String s, Object o) { - + loggingContext.warning(s, o); } @Override public void warn(String s, Object... objects) { - + loggingContext.warning(s, objects); } @Override public void warn(String s, Object o, Object o1) { - + loggingContext.warning(s, o, o1); } @Override public void warn(String s, Throwable throwable) { - + loggingContext.warning(s, throwable); } @Override public boolean isWarnEnabled(Marker marker) { - - return false; + return loggingContext.warning().isEnabled(); } @Override public void warn(Marker marker, String s) { - + loggingContext.warning(s); } @Override public void warn(Marker marker, String s, Object o) { - + loggingContext.warning(s, o); } @Override public void warn(Marker marker, String s, Object o, Object o1) { - + loggingContext.warning(s, o, o1); } @Override public void warn(Marker marker, String s, Object... objects) { - + loggingContext.warning(s, objects); } @Override public void warn(Marker marker, String s, Throwable throwable) { - + loggingContext.warning(s, throwable); } @Override public boolean isErrorEnabled() { - - return false; + return loggingContext.error().isEnabled(); } @Override public void error(String s) { - + loggingContext.error(s); } @Override public void error(String s, Object o) { - + loggingContext.error(s, o); } @Override public void error(String s, Object o, Object o1) { - + loggingContext.error(s, o, o1); } @Override public void error(String s, Object... objects) { - + loggingContext.error(s, objects); } @Override public void error(String s, Throwable throwable) { - + loggingContext.error(s, throwable); } @Override public boolean isErrorEnabled(Marker marker) { - - return false; + return loggingContext.error().isEnabled(); } @Override public void error(Marker marker, String s) { - + loggingContext.error(s); } @Override public void error(Marker marker, String s, Object o) { - + loggingContext.error(s, o); } @Override public void error(Marker marker, String s, Object o, Object o1) { - + loggingContext.error(s, o, o1); } @Override public void error(Marker marker, String s, Object... objects) { - + loggingContext.error(s, objects); } @Override public void error(Marker marker, String s, Throwable throwable) { - + loggingContext.error(s, throwable); } } diff --git a/cli/src/test/java/com/devonfw/tools/ide/context/IdeSlf4jContext.java b/cli/src/test/java/com/devonfw/tools/ide/context/IdeSlf4jContext.java index b7413879cc..88cc3b9c84 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/context/IdeSlf4jContext.java +++ b/cli/src/test/java/com/devonfw/tools/ide/context/IdeSlf4jContext.java @@ -3,7 +3,7 @@ import java.nio.file.Path; import com.devonfw.tools.ide.log.IdeLogLevel; -import com.devonfw.tools.ide.log.IdeSubLoggerSlf4j; +import com.devonfw.tools.ide.log.IdeSubLoggerOut; /** * Implementation of {@link IdeContext} for testing. @@ -26,7 +26,7 @@ public IdeSlf4jContext() { */ public IdeSlf4jContext(Path workingDirectory) { - super(new IdeStartContextImpl(IdeLogLevel.TRACE, IdeSubLoggerSlf4j::new), workingDirectory); + super(new IdeStartContextImpl(IdeLogLevel.TRACE, level -> new IdeSubLoggerOut(level, null, true, IdeLogLevel.TRACE, null)), workingDirectory); } } diff --git a/cli/src/test/java/com/devonfw/tools/ide/log/IdeTestLogger.java b/cli/src/test/java/com/devonfw/tools/ide/log/IdeTestLogger.java index ca889bbc22..ed2e3f18c4 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/log/IdeTestLogger.java +++ b/cli/src/test/java/com/devonfw/tools/ide/log/IdeTestLogger.java @@ -24,7 +24,7 @@ public IdeTestLogger(IdeLogLevel minLogLevel) { private IdeTestLogger(List entries, IdeLogLevel minLogLevel, IdeLogListenerCollector collector) { - super(minLogLevel, level -> new IdeSubLoggerSlf4j(level, collector)); + super(minLogLevel, level -> new IdeSubLoggerOut(level, null, true, minLogLevel, collector)); this.collector = collector; } From ef08b4eeeea34c9bb7e275571e67fb32d2ada7da Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Mon, 27 Jan 2025 17:37:44 +0100 Subject: [PATCH 08/25] #404: fixed WireMock tests added null checks to IdeLoggerAdapter debug methods --- .../ide/serviceprovider/IdeLoggerAdapter.java | 37 +++++++++++++++---- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java index ebc9e9851f..f2e298ce42 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java +++ b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java @@ -90,37 +90,56 @@ public void trace(Marker marker, String s, Throwable throwable) { @Override public boolean isDebugEnabled() { - return loggingContext.debug().isEnabled(); + if (loggingContext != null) { + return loggingContext.debug().isEnabled(); + } else { + return false; + } + } @Override public void debug(String s) { - loggingContext.debug(s); + if (loggingContext != null) { + loggingContext.debug(s); + } } @Override public void debug(String s, Object o) { - loggingContext.debug(s, o); + if (loggingContext != null) { + loggingContext.debug(s, o); + } } @Override public void debug(String s, Object o, Object o1) { - loggingContext.debug(s, o, o1); + if (loggingContext != null) { + loggingContext.debug(s, o, o1); + } } @Override public void debug(String s, Object... objects) { - loggingContext.debug(s, objects); + if (loggingContext != null) { + loggingContext.debug(s, objects); + } } @Override public void debug(String s, Throwable throwable) { - loggingContext.debug(s, throwable); + if (loggingContext != null) { + loggingContext.debug(s, throwable); + } } @Override public boolean isDebugEnabled(Marker marker) { - return loggingContext.debug().isEnabled(); + if (loggingContext != null) { + return loggingContext.debug().isEnabled(); + } else { + return false; + } } @Override @@ -170,7 +189,9 @@ public void info(String s, Object o, Object o1) { @Override public void info(String s, Object... objects) { - loggingContext.info(s, objects); + if (loggingContext != null) { + loggingContext.info(s, objects); + } } @Override From 5cd1ab373615a16fb252728c675535182b662494 Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Tue, 28 Jan 2025 10:46:58 +0100 Subject: [PATCH 09/25] #404: fixed WireMock tests added rest of null checks --- .../ide/serviceprovider/IdeLoggerAdapter.java | 46 +++++++++++++++---- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java index f2e298ce42..4f44076a0c 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java +++ b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java @@ -169,22 +169,32 @@ public void debug(Marker marker, String s, Throwable throwable) { @Override public boolean isInfoEnabled() { - return loggingContext.info().isEnabled(); + if (loggingContext != null) { + return loggingContext.info().isEnabled(); + } else { + return false; + } } @Override public void info(String s) { - loggingContext.info(s); + if (loggingContext != null) { + loggingContext.info(s); + } } @Override public void info(String s, Object o) { - loggingContext.info(s, o); + if (loggingContext != null) { + loggingContext.info(s, o); + } } @Override public void info(String s, Object o, Object o1) { - loggingContext.info(s, o, o1); + if (loggingContext != null) { + loggingContext.info(s, o, o1); + } } @Override @@ -291,17 +301,25 @@ public void warn(Marker marker, String s, Throwable throwable) { @Override public boolean isErrorEnabled() { - return loggingContext.error().isEnabled(); + if (loggingContext != null) { + return loggingContext.error().isEnabled(); + } else { + return false; + } } @Override public void error(String s) { - loggingContext.error(s); + if (loggingContext != null) { + loggingContext.error(s); + } } @Override public void error(String s, Object o) { - loggingContext.error(s, o); + if (loggingContext != null) { + loggingContext.error(s, o); + } } @Override @@ -311,17 +329,25 @@ public void error(String s, Object o, Object o1) { @Override public void error(String s, Object... objects) { - loggingContext.error(s, objects); + if (loggingContext != null) { + loggingContext.error(s, objects); + } } @Override public void error(String s, Throwable throwable) { - loggingContext.error(s, throwable); + if (loggingContext != null) { + loggingContext.error(s, throwable); + } } @Override public boolean isErrorEnabled(Marker marker) { - return loggingContext.error().isEnabled(); + if (loggingContext != null) { + return loggingContext.error().isEnabled(); + } else { + return false; + } } @Override From b4669bb355a199d441579f4150374e2cf1b1a899 Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Tue, 28 Jan 2025 12:34:08 +0100 Subject: [PATCH 10/25] #404: fixed WireMock tests fixed compose array out of bounds exception --- .../java/com/devonfw/tools/ide/log/AbstractIdeSubLogger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/log/AbstractIdeSubLogger.java b/cli/src/main/java/com/devonfw/tools/ide/log/AbstractIdeSubLogger.java index 0a4a1e873d..ac1252a2d4 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/log/AbstractIdeSubLogger.java +++ b/cli/src/main/java/com/devonfw/tools/ide/log/AbstractIdeSubLogger.java @@ -143,7 +143,7 @@ public String log(Throwable error, String message, Object... args) { // fail fast if assertions are enabled, so developers of IDEasy will find the bug immediately but in productive use better log the error and continue assert false : actualMessage; } - } else if (args != null) { + } else if (args != null && args.length > 0) { actualMessage = compose(actualMessage, args); } boolean accept = this.listener.onLog(this.level, actualMessage, message, args, error); From 98a0f2e4072f4faa2eeba88778072e78d5d4e1bd Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Tue, 4 Feb 2025 19:02:40 +0100 Subject: [PATCH 11/25] #404: refactored urls into url-updater updated WireMock dependency from 2.35.2 to 3.11.0 added jackson-core dependency to ide-cli added url namespace to tools added LogbackServiceProvider to service --- cli/pom.xml | 11 ++- .../ide/url/model/file/UrlStatusFileTest.java | 15 ++-- .../url/model/file/json/StatusJsonTest.java | 2 +- .../model/file/json/ToolDependenciesTest.java | 14 ++-- pom.xml | 1 + url-updater/pom.xml | 43 +++++++++++ .../tools/ide/url/UpdateInitiator.java | 0 .../AndroidStudioUrlUpdater.java | 5 +- .../ide/url}/tool/aws/AwsUrlUpdater.java | 2 +- .../ide/url}/tool/az/AzureUrlUpdater.java | 2 +- .../tool/docker/DockerDesktopUrlUpdater.java | 2 +- .../DockerRancherDesktopUrlUpdater.java | 2 +- .../url}/tool/dotnet/DotNetUrlUpdater.java | 2 +- .../tool/eclipse/EclipseCppUrlUpdater.java | 2 +- .../tool/eclipse/EclipseJavaUrlUpdater.java | 2 +- .../tool/eclipse/EclipseJeeUrlUpdater.java | 2 +- .../url}/tool/eclipse/EclipseUrlUpdater.java | 2 +- .../url}/tool/gcloud/GCloudUrlUpdater.java | 2 +- .../tool/gcviewer/GcViewerUrlUpdater.java | 2 +- .../tools/ide/url}/tool/gh/GhUrlUpdater.java | 2 +- .../tool/graalvm/GraalVmCommunityUpdater.java | 2 +- .../tool/graalvm/GraalVmOracleUrlUpdater.java | 2 +- .../url}/tool/graalvm/GraalVmUrlUpdater.java | 2 +- .../url}/tool/gradle/GradleUrlUpdater.java | 2 +- .../ide/url}/tool/helm/HelmUrlUpdater.java | 2 +- .../tool/intellij/IntellijUrlUpdater.java | 5 +- .../url}/tool/jasypt/JasyptUrlUpdater.java | 2 +- .../ide/url}/tool/java/JavaUrlUpdater.java | 4 +- .../url}/tool/jenkins/JenkinsUrlUpdater.java | 2 +- .../ide/url}/tool/jmc/JmcUrlUpdater.java | 2 +- .../tool/kotlinc/KotlincNativeUrlUpdater.java | 2 +- .../url}/tool/kotlinc/KotlincUrlUpdater.java | 2 +- .../tool/lazydocker/LazyDockerUrlUpdater.java | 2 +- .../ide/url}/tool/mvn/Mvn4UrlUpdater.java | 2 +- .../ide/url}/tool/mvn/MvnUrlUpdater.java | 2 +- .../ide/url}/tool/node/NodeUrlUpdater.java | 2 +- .../ide/url}/tool/npm/NpmUrlUpdater.java | 2 +- .../tools/ide/url}/tool/oc/OcUrlUpdater.java | 2 +- .../url}/tool/pgadmin/PgAdminUrlUpdater.java | 2 +- .../ide/url}/tool/pip/PipUrlUpdater.java | 2 +- .../url}/tool/python/PythonUrlUpdater.java | 5 +- .../url}/tool/quarkus/QuarkusUrlUpdater.java | 2 +- .../ide/url}/tool/sonar/SonarUrlUpdater.java | 2 +- .../tool/terraform/TerraformUrlUpdater.java | 2 +- .../url}/tool/tomcat/TomcatUrlUpdater.java | 2 +- .../url}/tool/vscode/VsCodeUrlUpdater.java | 2 +- .../updater/AbstractProcessorWithTimeout.java | 0 .../ide/url/updater/AbstractUrlUpdater.java | 4 +- .../ide/url/updater/GithubUrlUpdater.java | 0 .../tools/ide/url/updater/JsonUrlUpdater.java | 0 .../ide/url/updater/MavenBasedUrlUpdater.java | 0 .../ide/url/updater/NpmBasedUrlUpdater.java | 0 .../tools/ide/url/updater/UpdateManager.java | 74 +++++++++---------- .../tools/ide/url/updater/UrlUpdater.java | 0 .../ide/url/updater/WebsiteUrlUpdater.java | 0 .../org.slf4j.spi.SLF4JServiceProvider | 1 + .../ide/url/report/UrlUpdaterReportTest.java | 4 +- .../ide/url}/tool/AbstractUrlUpdaterTest.java | 2 +- .../tools/ide/url}/tool/UrlUpdaterMock.java | 2 +- .../ide/url}/tool/UrlUpdaterMockSingle.java | 2 +- .../tools/ide/url}/tool/UrlUpdaterTest.java | 9 ++- .../AndroidStudioJsonUrlUpdaterTest.java | 2 +- .../AndroidStudioUrlUpdaterMock.java | 2 +- .../intellij/IntellijJsonUrlUpdaterTest.java | 2 +- .../tool/intellij/IntellijUrlUpdaterMock.java | 2 +- .../url}/tool/java/JavaUrlUpdaterMock.java | 2 +- .../url}/tool/java/JavaUrlUpdaterTest.java | 4 +- .../url}/tool/npm/NpmJsonUrlUpdaterTest.java | 2 +- .../ide/url}/tool/npm/NpmUrlUpdaterMock.java | 2 +- .../ide/url}/tool/pip/PipUrlUpdaterMock.java | 2 +- .../ide/url}/tool/pip/PipUrlUpdaterTest.java | 13 ++-- .../tool/python/PythonUrlUpdaterMock.java | 3 +- .../tool/python/PythonUrlUpdaterTest.java | 2 +- .../android-version-without-checksum.json | 0 .../android-version.json | 0 .../intellij-version-without-checksum.json | 0 .../intellij-version.json | 0 .../JavaJsonUrlUpdater/java-version.json | 0 .../NpmJsonUrlUpdater/npm-version.json | 0 .../PythonJsonUrlUpdater/python-version.json | 0 .../mocked/mocked/1.0/status.json | 0 81 files changed, 191 insertions(+), 120 deletions(-) create mode 100644 url-updater/pom.xml rename {cli => url-updater}/src/main/java/com/devonfw/tools/ide/url/UpdateInitiator.java (100%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/androidstudio/AndroidStudioUrlUpdater.java (89%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/aws/AwsUrlUpdater.java (97%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/az/AzureUrlUpdater.java (96%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/docker/DockerDesktopUrlUpdater.java (97%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/docker/DockerRancherDesktopUrlUpdater.java (96%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/dotnet/DotNetUrlUpdater.java (96%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/eclipse/EclipseCppUrlUpdater.java (81%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/eclipse/EclipseJavaUrlUpdater.java (84%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/eclipse/EclipseJeeUrlUpdater.java (81%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/eclipse/EclipseUrlUpdater.java (98%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/gcloud/GCloudUrlUpdater.java (96%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/gcviewer/GcViewerUrlUpdater.java (94%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/gh/GhUrlUpdater.java (97%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/graalvm/GraalVmCommunityUpdater.java (95%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/graalvm/GraalVmOracleUrlUpdater.java (94%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/graalvm/GraalVmUrlUpdater.java (90%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/gradle/GradleUrlUpdater.java (98%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/helm/HelmUrlUpdater.java (96%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/intellij/IntellijUrlUpdater.java (94%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/jasypt/JasyptUrlUpdater.java (94%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/java/JavaUrlUpdater.java (94%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/jenkins/JenkinsUrlUpdater.java (93%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/jmc/JmcUrlUpdater.java (95%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/kotlinc/KotlincNativeUrlUpdater.java (95%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/kotlinc/KotlincUrlUpdater.java (94%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/lazydocker/LazyDockerUrlUpdater.java (96%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/mvn/Mvn4UrlUpdater.java (95%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/mvn/MvnUrlUpdater.java (94%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/node/NodeUrlUpdater.java (97%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/npm/NpmUrlUpdater.java (88%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/oc/OcUrlUpdater.java (95%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/pgadmin/PgAdminUrlUpdater.java (96%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/pip/PipUrlUpdater.java (95%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/python/PythonUrlUpdater.java (93%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/quarkus/QuarkusUrlUpdater.java (95%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/sonar/SonarUrlUpdater.java (93%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/terraform/TerraformUrlUpdater.java (95%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/tomcat/TomcatUrlUpdater.java (93%) rename {cli/src/main/java/com/devonfw/tools/ide => url-updater/src/main/java/com/devonfw/tools/ide/url}/tool/vscode/VsCodeUrlUpdater.java (95%) rename {cli => url-updater}/src/main/java/com/devonfw/tools/ide/url/updater/AbstractProcessorWithTimeout.java (100%) rename {cli => url-updater}/src/main/java/com/devonfw/tools/ide/url/updater/AbstractUrlUpdater.java (99%) rename {cli => url-updater}/src/main/java/com/devonfw/tools/ide/url/updater/GithubUrlUpdater.java (100%) rename {cli => url-updater}/src/main/java/com/devonfw/tools/ide/url/updater/JsonUrlUpdater.java (100%) rename {cli => url-updater}/src/main/java/com/devonfw/tools/ide/url/updater/MavenBasedUrlUpdater.java (100%) rename {cli => url-updater}/src/main/java/com/devonfw/tools/ide/url/updater/NpmBasedUrlUpdater.java (100%) rename {cli => url-updater}/src/main/java/com/devonfw/tools/ide/url/updater/UpdateManager.java (61%) rename {cli => url-updater}/src/main/java/com/devonfw/tools/ide/url/updater/UrlUpdater.java (100%) rename {cli => url-updater}/src/main/java/com/devonfw/tools/ide/url/updater/WebsiteUrlUpdater.java (100%) create mode 100644 url-updater/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider rename {cli => url-updater}/src/test/java/com/devonfw/tools/ide/url/report/UrlUpdaterReportTest.java (98%) rename {cli/src/test/java/com/devonfw/tools/ide => url-updater/src/test/java/com/devonfw/tools/ide/url}/tool/AbstractUrlUpdaterTest.java (96%) rename {cli/src/test/java/com/devonfw/tools/ide => url-updater/src/test/java/com/devonfw/tools/ide/url}/tool/UrlUpdaterMock.java (97%) rename {cli/src/test/java/com/devonfw/tools/ide => url-updater/src/test/java/com/devonfw/tools/ide/url}/tool/UrlUpdaterMockSingle.java (96%) rename {cli/src/test/java/com/devonfw/tools/ide => url-updater/src/test/java/com/devonfw/tools/ide/url}/tool/UrlUpdaterTest.java (96%) rename {cli/src/test/java/com/devonfw/tools/ide => url-updater/src/test/java/com/devonfw/tools/ide/url}/tool/androidstudio/AndroidStudioJsonUrlUpdaterTest.java (99%) rename {cli/src/test/java/com/devonfw/tools/ide => url-updater/src/test/java/com/devonfw/tools/ide/url}/tool/androidstudio/AndroidStudioUrlUpdaterMock.java (92%) rename {cli/src/test/java/com/devonfw/tools/ide => url-updater/src/test/java/com/devonfw/tools/ide/url}/tool/intellij/IntellijJsonUrlUpdaterTest.java (99%) rename {cli/src/test/java/com/devonfw/tools/ide => url-updater/src/test/java/com/devonfw/tools/ide/url}/tool/intellij/IntellijUrlUpdaterMock.java (92%) rename {cli/src/test/java/com/devonfw/tools/ide => url-updater/src/test/java/com/devonfw/tools/ide/url}/tool/java/JavaUrlUpdaterMock.java (92%) rename {cli/src/test/java/com/devonfw/tools/ide => url-updater/src/test/java/com/devonfw/tools/ide/url}/tool/java/JavaUrlUpdaterTest.java (97%) rename {cli/src/test/java/com/devonfw/tools/ide => url-updater/src/test/java/com/devonfw/tools/ide/url}/tool/npm/NpmJsonUrlUpdaterTest.java (99%) rename {cli/src/test/java/com/devonfw/tools/ide => url-updater/src/test/java/com/devonfw/tools/ide/url}/tool/npm/NpmUrlUpdaterMock.java (91%) rename {cli/src/test/java/com/devonfw/tools/ide => url-updater/src/test/java/com/devonfw/tools/ide/url}/tool/pip/PipUrlUpdaterMock.java (95%) rename {cli/src/test/java/com/devonfw/tools/ide => url-updater/src/test/java/com/devonfw/tools/ide/url}/tool/pip/PipUrlUpdaterTest.java (80%) rename {cli/src/test/java/com/devonfw/tools/ide => url-updater/src/test/java/com/devonfw/tools/ide/url}/tool/python/PythonUrlUpdaterMock.java (85%) rename {cli/src/test/java/com/devonfw/tools/ide => url-updater/src/test/java/com/devonfw/tools/ide/url}/tool/python/PythonUrlUpdaterTest.java (98%) rename {cli => url-updater}/src/test/resources/integrationtest/AndroidStudioJsonUrlUpdater/android-version-without-checksum.json (100%) rename {cli => url-updater}/src/test/resources/integrationtest/AndroidStudioJsonUrlUpdater/android-version.json (100%) rename {cli => url-updater}/src/test/resources/integrationtest/IntellijJsonUrlUpdater/intellij-version-without-checksum.json (100%) rename {cli => url-updater}/src/test/resources/integrationtest/IntellijJsonUrlUpdater/intellij-version.json (100%) rename {cli => url-updater}/src/test/resources/integrationtest/JavaJsonUrlUpdater/java-version.json (100%) rename {cli => url-updater}/src/test/resources/integrationtest/NpmJsonUrlUpdater/npm-version.json (100%) rename {cli => url-updater}/src/test/resources/integrationtest/PythonJsonUrlUpdater/python-version.json (100%) rename {cli => url-updater}/src/test/resources/integrationtest/UrlUpdaterTest/mocked/mocked/1.0/status.json (100%) diff --git a/cli/pom.xml b/cli/pom.xml index 759259eabc..e8f68e93df 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -40,6 +40,11 @@ parsson 1.1.7 + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + com.fasterxml.jackson.core jackson-databind @@ -87,9 +92,9 @@ - com.github.tomakehurst - wiremock-jre8 - 2.35.2 + org.wiremock + wiremock + 3.11.0 test diff --git a/cli/src/test/java/com/devonfw/tools/ide/url/model/file/UrlStatusFileTest.java b/cli/src/test/java/com/devonfw/tools/ide/url/model/file/UrlStatusFileTest.java index fa785e79c8..02d9fdb5b6 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/url/model/file/UrlStatusFileTest.java +++ b/cli/src/test/java/com/devonfw/tools/ide/url/model/file/UrlStatusFileTest.java @@ -2,6 +2,7 @@ import java.time.Instant; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import com.devonfw.tools.ide.url.model.AbstractUrlModelTest; @@ -33,16 +34,16 @@ public void testReadJson() { UrlStatusFile status = version.getOrCreateStatus(); StatusJson statusJson = status.getStatusJson(); // then - assertThat(statusJson.getUrls()).hasSize(1); + Assertions.assertThat(statusJson.getUrls()).hasSize(1); UrlStatus urlStatus = statusJson.getUrls().values().iterator().next(); UrlStatusState success = urlStatus.getSuccess(); - assertThat(success.getTimestamp()).isEqualTo(Instant.parse("2023-02-21T15:03:09.387386Z")); - assertThat(success.getCode()).isNull(); - assertThat(success.getMessage()).isNull(); + Assertions.assertThat(success.getTimestamp()).isEqualTo(Instant.parse("2023-02-21T15:03:09.387386Z")); + Assertions.assertThat(success.getCode()).isNull(); + Assertions.assertThat(success.getMessage()).isNull(); UrlStatusState error = urlStatus.getError(); - assertThat(error.getTimestamp()).isEqualTo(Instant.parse("2023-01-01T23:59:59.999999Z")); - assertThat(error.getCode()).isEqualTo(500); - assertThat(error.getMessage()).isEqualTo("core dumped"); + Assertions.assertThat(error.getTimestamp()).isEqualTo(Instant.parse("2023-01-01T23:59:59.999999Z")); + Assertions.assertThat(error.getCode()).isEqualTo(500); + Assertions.assertThat(error.getMessage()).isEqualTo("core dumped"); } } diff --git a/cli/src/test/java/com/devonfw/tools/ide/url/model/file/json/StatusJsonTest.java b/cli/src/test/java/com/devonfw/tools/ide/url/model/file/json/StatusJsonTest.java index 6216b143d4..34e79e562d 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/url/model/file/json/StatusJsonTest.java +++ b/cli/src/test/java/com/devonfw/tools/ide/url/model/file/json/StatusJsonTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; /** - * Test of {@link StatusJson}. + * Test of {@link com.devonfw.tools.ide.url.model.file.json.StatusJson}. */ public class StatusJsonTest extends Assertions { diff --git a/cli/src/test/java/com/devonfw/tools/ide/url/model/file/json/ToolDependenciesTest.java b/cli/src/test/java/com/devonfw/tools/ide/url/model/file/json/ToolDependenciesTest.java index fd7ba382fb..d28862c1d7 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/url/model/file/json/ToolDependenciesTest.java +++ b/cli/src/test/java/com/devonfw/tools/ide/url/model/file/json/ToolDependenciesTest.java @@ -23,10 +23,11 @@ public void testEditionSpecific() { IdeContext context = newContext(); // act - Collection dependencies = context.getDefaultToolRepository().findDependencies("tomcat", "tomcat", VersionIdentifier.of("11.0.0")); + Collection dependencies = context.getDefaultToolRepository() + .findDependencies("tomcat", "tomcat", VersionIdentifier.of("11.0.0")); // assert - assertThat(dependencies).containsExactly(new ToolDependency("java", VersionRange.of("[17,)"))); + assertThat(dependencies).containsExactly(new com.devonfw.tools.ide.url.model.file.json.ToolDependency("java", VersionRange.of("[17,)"))); } @Test @@ -36,10 +37,12 @@ public void testEditionFallback() { IdeContext context = newContext(); // act - Collection dependencies = context.getDefaultToolRepository().findDependencies("tomcat", "undefined", VersionIdentifier.of("11.0.0")); + Collection dependencies = context.getDefaultToolRepository() + .findDependencies("tomcat", "undefined", VersionIdentifier.of("11.0.0")); // assert - assertThat(dependencies).containsExactly(new ToolDependency("this-is-the-wrong-file-only-for-testing", VersionRange.of("[1.0,2.0]"))); + assertThat(dependencies).containsExactly( + new com.devonfw.tools.ide.url.model.file.json.ToolDependency("this-is-the-wrong-file-only-for-testing", VersionRange.of("[1.0,2.0]"))); } @Test @@ -49,7 +52,8 @@ public void testEditionUnspecific() { IdeContext context = newContext(); // act - Collection dependencies = context.getDefaultToolRepository().findDependencies("mvn", "undefined", VersionIdentifier.of("3.9.0")); + Collection dependencies = context.getDefaultToolRepository() + .findDependencies("mvn", "undefined", VersionIdentifier.of("3.9.0")); // assert assertThat(dependencies).containsExactly(new ToolDependency("java", VersionRange.of("[8,)"))); diff --git a/pom.xml b/pom.xml index 5df4e45d93..a3ca7fe706 100644 --- a/pom.xml +++ b/pom.xml @@ -41,6 +41,7 @@ documentation cli gui + url-updater diff --git a/url-updater/pom.xml b/url-updater/pom.xml new file mode 100644 index 0000000000..3cda6ca0ca --- /dev/null +++ b/url-updater/pom.xml @@ -0,0 +1,43 @@ + + + 4.0.0 + + com.devonfw.tools.IDEasy.dev + ide + dev-SNAPSHOT + ../pom.xml + + com.devonfw.tools.IDEasy + url-updater + ${revision} + ${project.artifactId} + + + 21 + 21 + UTF-8 + 2.18.2 + + + + + ${project.groupId} + ide-cli + ${project.version} + + + ch.qos.logback + logback-classic + 1.5.16 + + + org.wiremock + wiremock + 3.11.0 + test + + + + diff --git a/cli/src/main/java/com/devonfw/tools/ide/url/UpdateInitiator.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/UpdateInitiator.java similarity index 100% rename from cli/src/main/java/com/devonfw/tools/ide/url/UpdateInitiator.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/UpdateInitiator.java diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/androidstudio/AndroidStudioUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/androidstudio/AndroidStudioUrlUpdater.java similarity index 89% rename from cli/src/main/java/com/devonfw/tools/ide/tool/androidstudio/AndroidStudioUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/androidstudio/AndroidStudioUrlUpdater.java index 315e32110d..50fa57f41a 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/androidstudio/AndroidStudioUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/androidstudio/AndroidStudioUrlUpdater.java @@ -1,10 +1,13 @@ -package com.devonfw.tools.ide.tool.androidstudio; +package com.devonfw.tools.ide.url.tool.androidstudio; import java.util.Collection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.devonfw.tools.ide.tool.androidstudio.AndroidJsonDownload; +import com.devonfw.tools.ide.tool.androidstudio.AndroidJsonItem; +import com.devonfw.tools.ide.tool.androidstudio.AndroidJsonObject; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.JsonUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/aws/AwsUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/aws/AwsUrlUpdater.java similarity index 97% rename from cli/src/main/java/com/devonfw/tools/ide/tool/aws/AwsUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/aws/AwsUrlUpdater.java index 7f9df6110c..4ebddd4b1a 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/aws/AwsUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/aws/AwsUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.aws; +package com.devonfw.tools.ide.url.tool.aws; import com.devonfw.tools.ide.os.OperatingSystem; import com.devonfw.tools.ide.url.model.folder.UrlVersion; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/az/AzureUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/az/AzureUrlUpdater.java similarity index 96% rename from cli/src/main/java/com/devonfw/tools/ide/tool/az/AzureUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/az/AzureUrlUpdater.java index 9aca421537..b729df51a6 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/az/AzureUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/az/AzureUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.az; +package com.devonfw.tools.ide.url.tool.az; import com.devonfw.tools.ide.os.OperatingSystem; import com.devonfw.tools.ide.url.model.folder.UrlVersion; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/docker/DockerDesktopUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/docker/DockerDesktopUrlUpdater.java similarity index 97% rename from cli/src/main/java/com/devonfw/tools/ide/tool/docker/DockerDesktopUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/docker/DockerDesktopUrlUpdater.java index f4dd68754d..924a21debc 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/docker/DockerDesktopUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/docker/DockerDesktopUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.docker; +package com.devonfw.tools.ide.url.tool.docker; import java.util.Set; import java.util.regex.Matcher; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/docker/DockerRancherDesktopUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/docker/DockerRancherDesktopUrlUpdater.java similarity index 96% rename from cli/src/main/java/com/devonfw/tools/ide/tool/docker/DockerRancherDesktopUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/docker/DockerRancherDesktopUrlUpdater.java index 4c5c820fa6..ced6ae9c6c 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/docker/DockerRancherDesktopUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/docker/DockerRancherDesktopUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.docker; +package com.devonfw.tools.ide.url.tool.docker; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.GithubUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/dotnet/DotNetUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/dotnet/DotNetUrlUpdater.java similarity index 96% rename from cli/src/main/java/com/devonfw/tools/ide/tool/dotnet/DotNetUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/dotnet/DotNetUrlUpdater.java index 237298c394..98b8ca8c78 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/dotnet/DotNetUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/dotnet/DotNetUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.dotnet; +package com.devonfw.tools.ide.url.tool.dotnet; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.GithubUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/eclipse/EclipseCppUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/eclipse/EclipseCppUrlUpdater.java similarity index 81% rename from cli/src/main/java/com/devonfw/tools/ide/tool/eclipse/EclipseCppUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/eclipse/EclipseCppUrlUpdater.java index d1d127e247..02f3a6e2ef 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/eclipse/EclipseCppUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/eclipse/EclipseCppUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.eclipse; +package com.devonfw.tools.ide.url.tool.eclipse; /** * {@link EclipseUrlUpdater} for "cpp" (C++) edition of Eclipse. diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/eclipse/EclipseJavaUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/eclipse/EclipseJavaUrlUpdater.java similarity index 84% rename from cli/src/main/java/com/devonfw/tools/ide/tool/eclipse/EclipseJavaUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/eclipse/EclipseJavaUrlUpdater.java index 07ec659a71..28ad2cf509 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/eclipse/EclipseJavaUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/eclipse/EclipseJavaUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.eclipse; +package com.devonfw.tools.ide.url.tool.eclipse; /** * {@link EclipseUrlUpdater} for "java" edition of Eclipse. diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/eclipse/EclipseJeeUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/eclipse/EclipseJeeUrlUpdater.java similarity index 81% rename from cli/src/main/java/com/devonfw/tools/ide/tool/eclipse/EclipseJeeUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/eclipse/EclipseJeeUrlUpdater.java index d4a4205955..9d410be104 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/eclipse/EclipseJeeUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/eclipse/EclipseJeeUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.eclipse; +package com.devonfw.tools.ide.url.tool.eclipse; /** * {@link EclipseUrlUpdater} for "jee" (C++) edition of Eclipse. diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/eclipse/EclipseUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/eclipse/EclipseUrlUpdater.java similarity index 98% rename from cli/src/main/java/com/devonfw/tools/ide/tool/eclipse/EclipseUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/eclipse/EclipseUrlUpdater.java index ccefb8079f..b98bc3c7c1 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/eclipse/EclipseUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/eclipse/EclipseUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.eclipse; +package com.devonfw.tools.ide.url.tool.eclipse; import java.util.regex.Pattern; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/gcloud/GCloudUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/gcloud/GCloudUrlUpdater.java similarity index 96% rename from cli/src/main/java/com/devonfw/tools/ide/tool/gcloud/GCloudUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/gcloud/GCloudUrlUpdater.java index 45f62d2b6a..6acc212e9e 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/gcloud/GCloudUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/gcloud/GCloudUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.gcloud; +package com.devonfw.tools.ide.url.tool.gcloud; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.GithubUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/gcviewer/GcViewerUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/gcviewer/GcViewerUrlUpdater.java similarity index 94% rename from cli/src/main/java/com/devonfw/tools/ide/tool/gcviewer/GcViewerUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/gcviewer/GcViewerUrlUpdater.java index 44f10a2429..d9d33c68a7 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/gcviewer/GcViewerUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/gcviewer/GcViewerUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.gcviewer; +package com.devonfw.tools.ide.url.tool.gcviewer; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.GithubUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/gh/GhUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/gh/GhUrlUpdater.java similarity index 97% rename from cli/src/main/java/com/devonfw/tools/ide/tool/gh/GhUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/gh/GhUrlUpdater.java index bd8a30dbc4..903541560c 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/gh/GhUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/gh/GhUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.gh; +package com.devonfw.tools.ide.url.tool.gh; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.GithubUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/graalvm/GraalVmCommunityUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/graalvm/GraalVmCommunityUpdater.java similarity index 95% rename from cli/src/main/java/com/devonfw/tools/ide/tool/graalvm/GraalVmCommunityUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/graalvm/GraalVmCommunityUpdater.java index a6a7f70e3d..e1b4234431 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/graalvm/GraalVmCommunityUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/graalvm/GraalVmCommunityUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.graalvm; +package com.devonfw.tools.ide.url.tool.graalvm; import com.devonfw.tools.ide.url.model.folder.UrlVersion; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/graalvm/GraalVmOracleUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/graalvm/GraalVmOracleUrlUpdater.java similarity index 94% rename from cli/src/main/java/com/devonfw/tools/ide/tool/graalvm/GraalVmOracleUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/graalvm/GraalVmOracleUrlUpdater.java index e169436c4f..2abc6f2033 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/graalvm/GraalVmOracleUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/graalvm/GraalVmOracleUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.graalvm; +package com.devonfw.tools.ide.url.tool.graalvm; import com.devonfw.tools.ide.url.model.folder.UrlVersion; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/graalvm/GraalVmUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/graalvm/GraalVmUrlUpdater.java similarity index 90% rename from cli/src/main/java/com/devonfw/tools/ide/tool/graalvm/GraalVmUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/graalvm/GraalVmUrlUpdater.java index 5925ffa030..e4d17b9ef5 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/graalvm/GraalVmUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/graalvm/GraalVmUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.graalvm; +package com.devonfw.tools.ide.url.tool.graalvm; import com.devonfw.tools.ide.url.updater.GithubUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/gradle/GradleUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/gradle/GradleUrlUpdater.java similarity index 98% rename from cli/src/main/java/com/devonfw/tools/ide/tool/gradle/GradleUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/gradle/GradleUrlUpdater.java index 62d441b390..439be91c86 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/gradle/GradleUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/gradle/GradleUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.gradle; +package com.devonfw.tools.ide.url.tool.gradle; import java.util.HashSet; import java.util.Set; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/helm/HelmUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/helm/HelmUrlUpdater.java similarity index 96% rename from cli/src/main/java/com/devonfw/tools/ide/tool/helm/HelmUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/helm/HelmUrlUpdater.java index 6515a3fe23..73f6cf0128 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/helm/HelmUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/helm/HelmUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.helm; +package com.devonfw.tools.ide.url.tool.helm; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.GithubUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/intellij/IntellijUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/intellij/IntellijUrlUpdater.java similarity index 94% rename from cli/src/main/java/com/devonfw/tools/ide/tool/intellij/IntellijUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/intellij/IntellijUrlUpdater.java index 1fc2ca03b6..9ee40b8d88 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/intellij/IntellijUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/intellij/IntellijUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.intellij; +package com.devonfw.tools.ide.url.tool.intellij; import java.util.Collection; import java.util.List; @@ -7,6 +7,9 @@ import com.devonfw.tools.ide.json.JsonVersionItem; import com.devonfw.tools.ide.os.OperatingSystem; import com.devonfw.tools.ide.os.SystemArchitecture; +import com.devonfw.tools.ide.tool.intellij.IntellijJsonDownloadsItem; +import com.devonfw.tools.ide.tool.intellij.IntellijJsonObject; +import com.devonfw.tools.ide.tool.intellij.IntellijJsonRelease; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.JsonUrlUpdater; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/jasypt/JasyptUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/jasypt/JasyptUrlUpdater.java similarity index 94% rename from cli/src/main/java/com/devonfw/tools/ide/tool/jasypt/JasyptUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/jasypt/JasyptUrlUpdater.java index a56caf0e2b..499f66bcdf 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/jasypt/JasyptUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/jasypt/JasyptUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.jasypt; +package com.devonfw.tools.ide.url.tool.jasypt; import com.devonfw.tools.ide.url.updater.MavenBasedUrlUpdater; import com.devonfw.tools.ide.version.VersionIdentifier; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/java/JavaUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/java/JavaUrlUpdater.java similarity index 94% rename from cli/src/main/java/com/devonfw/tools/ide/tool/java/JavaUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/java/JavaUrlUpdater.java index c57f54e0dd..3456396c15 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/java/JavaUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/java/JavaUrlUpdater.java @@ -1,7 +1,9 @@ -package com.devonfw.tools.ide.tool.java; +package com.devonfw.tools.ide.url.tool.java; import java.util.Collection; +import com.devonfw.tools.ide.tool.java.JavaJsonObject; +import com.devonfw.tools.ide.tool.java.JavaJsonVersion; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.JsonUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/jenkins/JenkinsUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/jenkins/JenkinsUrlUpdater.java similarity index 93% rename from cli/src/main/java/com/devonfw/tools/ide/tool/jenkins/JenkinsUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/jenkins/JenkinsUrlUpdater.java index 8736480870..e31123ff36 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/jenkins/JenkinsUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/jenkins/JenkinsUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.jenkins; +package com.devonfw.tools.ide.url.tool.jenkins; import java.util.regex.Pattern; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/jmc/JmcUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/jmc/JmcUrlUpdater.java similarity index 95% rename from cli/src/main/java/com/devonfw/tools/ide/tool/jmc/JmcUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/jmc/JmcUrlUpdater.java index 699b5a9b7a..9f2fcdaae5 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/jmc/JmcUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/jmc/JmcUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.jmc; +package com.devonfw.tools.ide.url.tool.jmc; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.GithubUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/kotlinc/KotlincNativeUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/kotlinc/KotlincNativeUrlUpdater.java similarity index 95% rename from cli/src/main/java/com/devonfw/tools/ide/tool/kotlinc/KotlincNativeUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/kotlinc/KotlincNativeUrlUpdater.java index da7bb9d547..a963559908 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/kotlinc/KotlincNativeUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/kotlinc/KotlincNativeUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.kotlinc; +package com.devonfw.tools.ide.url.tool.kotlinc; import java.util.regex.Pattern; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/kotlinc/KotlincUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/kotlinc/KotlincUrlUpdater.java similarity index 94% rename from cli/src/main/java/com/devonfw/tools/ide/tool/kotlinc/KotlincUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/kotlinc/KotlincUrlUpdater.java index 79968ab7c1..6dba1e8710 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/kotlinc/KotlincUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/kotlinc/KotlincUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.kotlinc; +package com.devonfw.tools.ide.url.tool.kotlinc; import java.util.regex.Pattern; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/lazydocker/LazyDockerUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/lazydocker/LazyDockerUrlUpdater.java similarity index 96% rename from cli/src/main/java/com/devonfw/tools/ide/tool/lazydocker/LazyDockerUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/lazydocker/LazyDockerUrlUpdater.java index 168e359533..24eadc1ff8 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/lazydocker/LazyDockerUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/lazydocker/LazyDockerUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.lazydocker; +package com.devonfw.tools.ide.url.tool.lazydocker; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.GithubUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/mvn/Mvn4UrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/mvn/Mvn4UrlUpdater.java similarity index 95% rename from cli/src/main/java/com/devonfw/tools/ide/tool/mvn/Mvn4UrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/mvn/Mvn4UrlUpdater.java index e6c855e93e..c71e4dfc53 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/mvn/Mvn4UrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/mvn/Mvn4UrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.mvn; +package com.devonfw.tools.ide.url.tool.mvn; import java.util.regex.Pattern; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/mvn/MvnUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/mvn/MvnUrlUpdater.java similarity index 94% rename from cli/src/main/java/com/devonfw/tools/ide/tool/mvn/MvnUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/mvn/MvnUrlUpdater.java index 5c7ab55ef0..423c60e5d4 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/mvn/MvnUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/mvn/MvnUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.mvn; +package com.devonfw.tools.ide.url.tool.mvn; import java.util.regex.Pattern; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/node/NodeUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/node/NodeUrlUpdater.java similarity index 97% rename from cli/src/main/java/com/devonfw/tools/ide/tool/node/NodeUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/node/NodeUrlUpdater.java index 8f0e40b78e..229b90b21b 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/node/NodeUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/node/NodeUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.node; +package com.devonfw.tools.ide.url.tool.node; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.GithubUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/npm/NpmUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/npm/NpmUrlUpdater.java similarity index 88% rename from cli/src/main/java/com/devonfw/tools/ide/tool/npm/NpmUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/npm/NpmUrlUpdater.java index ae910b1ca7..8be230a233 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/npm/NpmUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/npm/NpmUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.npm; +package com.devonfw.tools.ide.url.tool.npm; import com.devonfw.tools.ide.url.updater.NpmBasedUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/oc/OcUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/oc/OcUrlUpdater.java similarity index 95% rename from cli/src/main/java/com/devonfw/tools/ide/tool/oc/OcUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/oc/OcUrlUpdater.java index b8f20c7aa4..e81a814412 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/oc/OcUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/oc/OcUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.oc; +package com.devonfw.tools.ide.url.tool.oc; import java.util.regex.Pattern; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/pgadmin/PgAdminUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/pgadmin/PgAdminUrlUpdater.java similarity index 96% rename from cli/src/main/java/com/devonfw/tools/ide/tool/pgadmin/PgAdminUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/pgadmin/PgAdminUrlUpdater.java index f43600137b..615813863c 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/pgadmin/PgAdminUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/pgadmin/PgAdminUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.pgadmin; +package com.devonfw.tools.ide.url.tool.pgadmin; import java.util.regex.Pattern; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/pip/PipUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/pip/PipUrlUpdater.java similarity index 95% rename from cli/src/main/java/com/devonfw/tools/ide/tool/pip/PipUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/pip/PipUrlUpdater.java index a1a601479a..693b72a6d1 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/pip/PipUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/pip/PipUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.pip; +package com.devonfw.tools.ide.url.tool.pip; import java.util.regex.Pattern; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/python/PythonUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdater.java similarity index 93% rename from cli/src/main/java/com/devonfw/tools/ide/tool/python/PythonUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdater.java index de17bef4ed..f45f64bd1b 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/python/PythonUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.python; +package com.devonfw.tools.ide.url.tool.python; import java.util.Collection; import java.util.List; @@ -7,6 +7,9 @@ import org.slf4j.LoggerFactory; import com.devonfw.tools.ide.json.JsonMapping; +import com.devonfw.tools.ide.tool.python.PythonFile; +import com.devonfw.tools.ide.tool.python.PythonJsonObject; +import com.devonfw.tools.ide.tool.python.PythonRelease; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.JsonUrlUpdater; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/quarkus/QuarkusUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/quarkus/QuarkusUrlUpdater.java similarity index 95% rename from cli/src/main/java/com/devonfw/tools/ide/tool/quarkus/QuarkusUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/quarkus/QuarkusUrlUpdater.java index f79129d332..addffe8d0d 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/quarkus/QuarkusUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/quarkus/QuarkusUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.quarkus; +package com.devonfw.tools.ide.url.tool.quarkus; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.GithubUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/sonar/SonarUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/sonar/SonarUrlUpdater.java similarity index 93% rename from cli/src/main/java/com/devonfw/tools/ide/tool/sonar/SonarUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/sonar/SonarUrlUpdater.java index edb86b50c5..b902afa8a0 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/sonar/SonarUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/sonar/SonarUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.sonar; +package com.devonfw.tools.ide.url.tool.sonar; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.GithubUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/terraform/TerraformUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/terraform/TerraformUrlUpdater.java similarity index 95% rename from cli/src/main/java/com/devonfw/tools/ide/tool/terraform/TerraformUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/terraform/TerraformUrlUpdater.java index 241b73965a..bf16fa0565 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/terraform/TerraformUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/terraform/TerraformUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.terraform; +package com.devonfw.tools.ide.url.tool.terraform; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.GithubUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/tomcat/TomcatUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/tomcat/TomcatUrlUpdater.java similarity index 93% rename from cli/src/main/java/com/devonfw/tools/ide/tool/tomcat/TomcatUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/tomcat/TomcatUrlUpdater.java index 7a33815109..09e800c437 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/tomcat/TomcatUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/tomcat/TomcatUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.tomcat; +package com.devonfw.tools.ide.url.tool.tomcat; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.GithubUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/vscode/VsCodeUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/vscode/VsCodeUrlUpdater.java similarity index 95% rename from cli/src/main/java/com/devonfw/tools/ide/tool/vscode/VsCodeUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/tool/vscode/VsCodeUrlUpdater.java index fc12b3e5bf..a187b2c41a 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/vscode/VsCodeUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/vscode/VsCodeUrlUpdater.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.vscode; +package com.devonfw.tools.ide.url.tool.vscode; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.GithubUrlUpdater; diff --git a/cli/src/main/java/com/devonfw/tools/ide/url/updater/AbstractProcessorWithTimeout.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/updater/AbstractProcessorWithTimeout.java similarity index 100% rename from cli/src/main/java/com/devonfw/tools/ide/url/updater/AbstractProcessorWithTimeout.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/updater/AbstractProcessorWithTimeout.java diff --git a/cli/src/main/java/com/devonfw/tools/ide/url/updater/AbstractUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/updater/AbstractUrlUpdater.java similarity index 99% rename from cli/src/main/java/com/devonfw/tools/ide/url/updater/AbstractUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/updater/AbstractUrlUpdater.java index eba14898f4..29e24e4427 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/url/updater/AbstractUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/updater/AbstractUrlUpdater.java @@ -38,6 +38,7 @@ import com.devonfw.tools.ide.url.model.folder.UrlTool; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.model.report.UrlUpdaterReport; +import com.devonfw.tools.ide.url.tool.pip.PipUrlUpdater; import com.devonfw.tools.ide.util.DateTimeUtil; import com.devonfw.tools.ide.util.HexUtil; @@ -363,8 +364,7 @@ private boolean isValidDownload(String url, String toolWithEdition, String versi } /** - * Checks if the content type was not of type text (this method is required because {@link com.devonfw.tools.ide.tool.pip.PipUrlUpdater} returns text and - * needs to be overridden) + * Checks if the content type was not of type text (this method is required because {@link PipUrlUpdater} returns text and needs to be overridden) *

* See: #1343 for reference. * diff --git a/cli/src/main/java/com/devonfw/tools/ide/url/updater/GithubUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/updater/GithubUrlUpdater.java similarity index 100% rename from cli/src/main/java/com/devonfw/tools/ide/url/updater/GithubUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/updater/GithubUrlUpdater.java diff --git a/cli/src/main/java/com/devonfw/tools/ide/url/updater/JsonUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/updater/JsonUrlUpdater.java similarity index 100% rename from cli/src/main/java/com/devonfw/tools/ide/url/updater/JsonUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/updater/JsonUrlUpdater.java diff --git a/cli/src/main/java/com/devonfw/tools/ide/url/updater/MavenBasedUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/updater/MavenBasedUrlUpdater.java similarity index 100% rename from cli/src/main/java/com/devonfw/tools/ide/url/updater/MavenBasedUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/updater/MavenBasedUrlUpdater.java diff --git a/cli/src/main/java/com/devonfw/tools/ide/url/updater/NpmBasedUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/updater/NpmBasedUrlUpdater.java similarity index 100% rename from cli/src/main/java/com/devonfw/tools/ide/url/updater/NpmBasedUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/updater/NpmBasedUrlUpdater.java diff --git a/cli/src/main/java/com/devonfw/tools/ide/url/updater/UpdateManager.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/updater/UpdateManager.java similarity index 61% rename from cli/src/main/java/com/devonfw/tools/ide/url/updater/UpdateManager.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/updater/UpdateManager.java index be8954257b..8fe278f9eb 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/url/updater/UpdateManager.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/updater/UpdateManager.java @@ -8,45 +8,45 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.devonfw.tools.ide.tool.androidstudio.AndroidStudioUrlUpdater; -import com.devonfw.tools.ide.tool.aws.AwsUrlUpdater; -import com.devonfw.tools.ide.tool.az.AzureUrlUpdater; -import com.devonfw.tools.ide.tool.docker.DockerDesktopUrlUpdater; -import com.devonfw.tools.ide.tool.docker.DockerRancherDesktopUrlUpdater; -import com.devonfw.tools.ide.tool.dotnet.DotNetUrlUpdater; -import com.devonfw.tools.ide.tool.eclipse.EclipseCppUrlUpdater; -import com.devonfw.tools.ide.tool.eclipse.EclipseJavaUrlUpdater; -import com.devonfw.tools.ide.tool.eclipse.EclipseJeeUrlUpdater; -import com.devonfw.tools.ide.tool.gcloud.GCloudUrlUpdater; -import com.devonfw.tools.ide.tool.gcviewer.GcViewerUrlUpdater; -import com.devonfw.tools.ide.tool.gh.GhUrlUpdater; -import com.devonfw.tools.ide.tool.graalvm.GraalVmCommunityUpdater; -import com.devonfw.tools.ide.tool.graalvm.GraalVmOracleUrlUpdater; -import com.devonfw.tools.ide.tool.gradle.GradleUrlUpdater; -import com.devonfw.tools.ide.tool.helm.HelmUrlUpdater; -import com.devonfw.tools.ide.tool.intellij.IntellijUrlUpdater; -import com.devonfw.tools.ide.tool.jasypt.JasyptUrlUpdater; -import com.devonfw.tools.ide.tool.java.JavaUrlUpdater; -import com.devonfw.tools.ide.tool.jenkins.JenkinsUrlUpdater; -import com.devonfw.tools.ide.tool.jmc.JmcUrlUpdater; -import com.devonfw.tools.ide.tool.kotlinc.KotlincNativeUrlUpdater; -import com.devonfw.tools.ide.tool.kotlinc.KotlincUrlUpdater; -import com.devonfw.tools.ide.tool.lazydocker.LazyDockerUrlUpdater; -import com.devonfw.tools.ide.tool.mvn.Mvn4UrlUpdater; -import com.devonfw.tools.ide.tool.mvn.MvnUrlUpdater; -import com.devonfw.tools.ide.tool.node.NodeUrlUpdater; -import com.devonfw.tools.ide.tool.npm.NpmUrlUpdater; -import com.devonfw.tools.ide.tool.oc.OcUrlUpdater; -import com.devonfw.tools.ide.tool.pgadmin.PgAdminUrlUpdater; -import com.devonfw.tools.ide.tool.pip.PipUrlUpdater; -import com.devonfw.tools.ide.tool.python.PythonUrlUpdater; -import com.devonfw.tools.ide.tool.quarkus.QuarkusUrlUpdater; -import com.devonfw.tools.ide.tool.sonar.SonarUrlUpdater; -import com.devonfw.tools.ide.tool.terraform.TerraformUrlUpdater; -import com.devonfw.tools.ide.tool.tomcat.TomcatUrlUpdater; -import com.devonfw.tools.ide.tool.vscode.VsCodeUrlUpdater; import com.devonfw.tools.ide.url.model.folder.UrlRepository; import com.devonfw.tools.ide.url.model.report.UrlFinalReport; +import com.devonfw.tools.ide.url.tool.androidstudio.AndroidStudioUrlUpdater; +import com.devonfw.tools.ide.url.tool.aws.AwsUrlUpdater; +import com.devonfw.tools.ide.url.tool.az.AzureUrlUpdater; +import com.devonfw.tools.ide.url.tool.docker.DockerDesktopUrlUpdater; +import com.devonfw.tools.ide.url.tool.docker.DockerRancherDesktopUrlUpdater; +import com.devonfw.tools.ide.url.tool.dotnet.DotNetUrlUpdater; +import com.devonfw.tools.ide.url.tool.eclipse.EclipseCppUrlUpdater; +import com.devonfw.tools.ide.url.tool.eclipse.EclipseJavaUrlUpdater; +import com.devonfw.tools.ide.url.tool.eclipse.EclipseJeeUrlUpdater; +import com.devonfw.tools.ide.url.tool.gcloud.GCloudUrlUpdater; +import com.devonfw.tools.ide.url.tool.gcviewer.GcViewerUrlUpdater; +import com.devonfw.tools.ide.url.tool.gh.GhUrlUpdater; +import com.devonfw.tools.ide.url.tool.graalvm.GraalVmCommunityUpdater; +import com.devonfw.tools.ide.url.tool.graalvm.GraalVmOracleUrlUpdater; +import com.devonfw.tools.ide.url.tool.gradle.GradleUrlUpdater; +import com.devonfw.tools.ide.url.tool.helm.HelmUrlUpdater; +import com.devonfw.tools.ide.url.tool.intellij.IntellijUrlUpdater; +import com.devonfw.tools.ide.url.tool.jasypt.JasyptUrlUpdater; +import com.devonfw.tools.ide.url.tool.java.JavaUrlUpdater; +import com.devonfw.tools.ide.url.tool.jenkins.JenkinsUrlUpdater; +import com.devonfw.tools.ide.url.tool.jmc.JmcUrlUpdater; +import com.devonfw.tools.ide.url.tool.kotlinc.KotlincNativeUrlUpdater; +import com.devonfw.tools.ide.url.tool.kotlinc.KotlincUrlUpdater; +import com.devonfw.tools.ide.url.tool.lazydocker.LazyDockerUrlUpdater; +import com.devonfw.tools.ide.url.tool.mvn.Mvn4UrlUpdater; +import com.devonfw.tools.ide.url.tool.mvn.MvnUrlUpdater; +import com.devonfw.tools.ide.url.tool.node.NodeUrlUpdater; +import com.devonfw.tools.ide.url.tool.npm.NpmUrlUpdater; +import com.devonfw.tools.ide.url.tool.oc.OcUrlUpdater; +import com.devonfw.tools.ide.url.tool.pgadmin.PgAdminUrlUpdater; +import com.devonfw.tools.ide.url.tool.pip.PipUrlUpdater; +import com.devonfw.tools.ide.url.tool.python.PythonUrlUpdater; +import com.devonfw.tools.ide.url.tool.quarkus.QuarkusUrlUpdater; +import com.devonfw.tools.ide.url.tool.sonar.SonarUrlUpdater; +import com.devonfw.tools.ide.url.tool.terraform.TerraformUrlUpdater; +import com.devonfw.tools.ide.url.tool.tomcat.TomcatUrlUpdater; +import com.devonfw.tools.ide.url.tool.vscode.VsCodeUrlUpdater; /** * The {@code UpdateManager} class manages the update process for various tools by using a list of {@link AbstractUrlUpdater}s to update the diff --git a/cli/src/main/java/com/devonfw/tools/ide/url/updater/UrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/updater/UrlUpdater.java similarity index 100% rename from cli/src/main/java/com/devonfw/tools/ide/url/updater/UrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/updater/UrlUpdater.java diff --git a/cli/src/main/java/com/devonfw/tools/ide/url/updater/WebsiteUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/updater/WebsiteUrlUpdater.java similarity index 100% rename from cli/src/main/java/com/devonfw/tools/ide/url/updater/WebsiteUrlUpdater.java rename to url-updater/src/main/java/com/devonfw/tools/ide/url/updater/WebsiteUrlUpdater.java diff --git a/url-updater/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/url-updater/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider new file mode 100644 index 0000000000..0bb90a9c2b --- /dev/null +++ b/url-updater/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider @@ -0,0 +1 @@ +ch.qos.logback.classic.spi.LogbackServiceProvider diff --git a/cli/src/test/java/com/devonfw/tools/ide/url/report/UrlUpdaterReportTest.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/report/UrlUpdaterReportTest.java similarity index 98% rename from cli/src/test/java/com/devonfw/tools/ide/url/report/UrlUpdaterReportTest.java rename to url-updater/src/test/java/com/devonfw/tools/ide/url/report/UrlUpdaterReportTest.java index 7ac5e32a8a..c918208a9f 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/url/report/UrlUpdaterReportTest.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/report/UrlUpdaterReportTest.java @@ -13,11 +13,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import com.devonfw.tools.ide.tool.AbstractUrlUpdaterTest; -import com.devonfw.tools.ide.tool.UrlUpdaterMock; import com.devonfw.tools.ide.url.model.folder.UrlRepository; import com.devonfw.tools.ide.url.model.report.UrlFinalReport; import com.devonfw.tools.ide.url.model.report.UrlUpdaterReport; +import com.devonfw.tools.ide.url.tool.AbstractUrlUpdaterTest; +import com.devonfw.tools.ide.url.tool.UrlUpdaterMock; import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo; import com.github.tomakehurst.wiremock.junit5.WireMockTest; diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/AbstractUrlUpdaterTest.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/AbstractUrlUpdaterTest.java similarity index 96% rename from cli/src/test/java/com/devonfw/tools/ide/tool/AbstractUrlUpdaterTest.java rename to url-updater/src/test/java/com/devonfw/tools/ide/url/tool/AbstractUrlUpdaterTest.java index 09f0fd5c15..0429716572 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/AbstractUrlUpdaterTest.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/AbstractUrlUpdaterTest.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool; +package com.devonfw.tools.ide.url.tool; import org.assertj.core.api.Assertions; diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/UrlUpdaterMock.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/UrlUpdaterMock.java similarity index 97% rename from cli/src/test/java/com/devonfw/tools/ide/tool/UrlUpdaterMock.java rename to url-updater/src/test/java/com/devonfw/tools/ide/url/tool/UrlUpdaterMock.java index 9911aca7c2..cdb98c21b6 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/UrlUpdaterMock.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/UrlUpdaterMock.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool; +package com.devonfw.tools.ide.url.tool; import java.util.Arrays; import java.util.HashSet; diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/UrlUpdaterMockSingle.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/UrlUpdaterMockSingle.java similarity index 96% rename from cli/src/test/java/com/devonfw/tools/ide/tool/UrlUpdaterMockSingle.java rename to url-updater/src/test/java/com/devonfw/tools/ide/url/tool/UrlUpdaterMockSingle.java index b31272829c..3ca4b44072 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/UrlUpdaterMockSingle.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/UrlUpdaterMockSingle.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool; +package com.devonfw.tools.ide.url.tool; import java.util.HashSet; import java.util.List; diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/UrlUpdaterTest.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/UrlUpdaterTest.java similarity index 96% rename from cli/src/test/java/com/devonfw/tools/ide/tool/UrlUpdaterTest.java rename to url-updater/src/test/java/com/devonfw/tools/ide/url/tool/UrlUpdaterTest.java index b312a98a57..45bd77a3a6 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/UrlUpdaterTest.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/UrlUpdaterTest.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool; +package com.devonfw.tools.ide.url.tool; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.any; @@ -27,11 +27,12 @@ import com.devonfw.tools.ide.url.model.folder.UrlRepository; import com.devonfw.tools.ide.url.model.folder.UrlTool; import com.devonfw.tools.ide.url.model.folder.UrlVersion; +import com.devonfw.tools.ide.url.updater.UrlUpdater; import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo; import com.github.tomakehurst.wiremock.junit5.WireMockTest; /** - * Test of {@link com.devonfw.tools.ide.url.updater.UrlUpdater} using wiremock to simulate network downloads. + * Test of {@link UrlUpdater} using wiremock to simulate network downloads. */ @WireMockTest public class UrlUpdaterTest extends AbstractUrlUpdaterTest { @@ -42,7 +43,7 @@ public class UrlUpdaterTest extends AbstractUrlUpdaterTest { private final static String TEST_DATA_ROOT = "src/test/resources/integrationtest/UrlUpdaterTest"; /** - * Tests if the {@link com.devonfw.tools.ide.url.updater.UrlUpdater} can automatically add a missing OS (in this case the linux_x64) + * Tests if the {@link UrlUpdater} can automatically add a missing OS (in this case the linux_x64) * * @param tempDir Temporary directory * @param wmRuntimeInfo wireMock server on a random port @@ -254,7 +255,7 @@ public void testVersionRemovedIfErrorPersists(@TempDir Path tempDir, WireMockRun } /** - * Tests if the {@link com.devonfw.tools.ide.url.updater.UrlUpdater} will fail resolving a server with a Content-Type:text header response. + * Tests if the {@link UrlUpdater} will fail resolving a server with a Content-Type:text header response. *

* See: #1343 for reference. * diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/androidstudio/AndroidStudioJsonUrlUpdaterTest.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/androidstudio/AndroidStudioJsonUrlUpdaterTest.java similarity index 99% rename from cli/src/test/java/com/devonfw/tools/ide/tool/androidstudio/AndroidStudioJsonUrlUpdaterTest.java rename to url-updater/src/test/java/com/devonfw/tools/ide/url/tool/androidstudio/AndroidStudioJsonUrlUpdaterTest.java index bb88cd62d6..2190f18180 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/androidstudio/AndroidStudioJsonUrlUpdaterTest.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/androidstudio/AndroidStudioJsonUrlUpdaterTest.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.androidstudio; +package com.devonfw.tools.ide.url.tool.androidstudio; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.any; diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/androidstudio/AndroidStudioUrlUpdaterMock.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/androidstudio/AndroidStudioUrlUpdaterMock.java similarity index 92% rename from cli/src/test/java/com/devonfw/tools/ide/tool/androidstudio/AndroidStudioUrlUpdaterMock.java rename to url-updater/src/test/java/com/devonfw/tools/ide/url/tool/androidstudio/AndroidStudioUrlUpdaterMock.java index 67fd8919ef..7d7dcb13f2 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/androidstudio/AndroidStudioUrlUpdaterMock.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/androidstudio/AndroidStudioUrlUpdaterMock.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.androidstudio; +package com.devonfw.tools.ide.url.tool.androidstudio; import com.devonfw.tools.ide.url.updater.JsonUrlUpdater; import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo; diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/intellij/IntellijJsonUrlUpdaterTest.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/intellij/IntellijJsonUrlUpdaterTest.java similarity index 99% rename from cli/src/test/java/com/devonfw/tools/ide/tool/intellij/IntellijJsonUrlUpdaterTest.java rename to url-updater/src/test/java/com/devonfw/tools/ide/url/tool/intellij/IntellijJsonUrlUpdaterTest.java index 523b1b6dd9..683994e841 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/intellij/IntellijJsonUrlUpdaterTest.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/intellij/IntellijJsonUrlUpdaterTest.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.intellij; +package com.devonfw.tools.ide.url.tool.intellij; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.any; diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/intellij/IntellijUrlUpdaterMock.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/intellij/IntellijUrlUpdaterMock.java similarity index 92% rename from cli/src/test/java/com/devonfw/tools/ide/tool/intellij/IntellijUrlUpdaterMock.java rename to url-updater/src/test/java/com/devonfw/tools/ide/url/tool/intellij/IntellijUrlUpdaterMock.java index 4c570ac310..65f8983287 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/intellij/IntellijUrlUpdaterMock.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/intellij/IntellijUrlUpdaterMock.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.intellij; +package com.devonfw.tools.ide.url.tool.intellij; import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo; diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/java/JavaUrlUpdaterMock.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/java/JavaUrlUpdaterMock.java similarity index 92% rename from cli/src/test/java/com/devonfw/tools/ide/tool/java/JavaUrlUpdaterMock.java rename to url-updater/src/test/java/com/devonfw/tools/ide/url/tool/java/JavaUrlUpdaterMock.java index a697779277..8fc377c562 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/java/JavaUrlUpdaterMock.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/java/JavaUrlUpdaterMock.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.java; +package com.devonfw.tools.ide.url.tool.java; import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo; diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/java/JavaUrlUpdaterTest.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/java/JavaUrlUpdaterTest.java similarity index 97% rename from cli/src/test/java/com/devonfw/tools/ide/tool/java/JavaUrlUpdaterTest.java rename to url-updater/src/test/java/com/devonfw/tools/ide/url/tool/java/JavaUrlUpdaterTest.java index bd89e5285f..648bbba3ba 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/java/JavaUrlUpdaterTest.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/java/JavaUrlUpdaterTest.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.java; +package com.devonfw.tools.ide.url.tool.java; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.any; @@ -14,8 +14,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import com.devonfw.tools.ide.tool.npm.NpmUrlUpdater; import com.devonfw.tools.ide.url.model.folder.UrlRepository; +import com.devonfw.tools.ide.url.tool.npm.NpmUrlUpdater; import com.devonfw.tools.ide.url.updater.JsonUrlUpdater; import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo; import com.github.tomakehurst.wiremock.junit5.WireMockTest; diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/npm/NpmJsonUrlUpdaterTest.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/npm/NpmJsonUrlUpdaterTest.java similarity index 99% rename from cli/src/test/java/com/devonfw/tools/ide/tool/npm/NpmJsonUrlUpdaterTest.java rename to url-updater/src/test/java/com/devonfw/tools/ide/url/tool/npm/NpmJsonUrlUpdaterTest.java index 0c740bc981..68575ad22c 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/npm/NpmJsonUrlUpdaterTest.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/npm/NpmJsonUrlUpdaterTest.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.npm; +package com.devonfw.tools.ide.url.tool.npm; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.any; diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/npm/NpmUrlUpdaterMock.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/npm/NpmUrlUpdaterMock.java similarity index 91% rename from cli/src/test/java/com/devonfw/tools/ide/tool/npm/NpmUrlUpdaterMock.java rename to url-updater/src/test/java/com/devonfw/tools/ide/url/tool/npm/NpmUrlUpdaterMock.java index c54b024af2..d27158d122 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/npm/NpmUrlUpdaterMock.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/npm/NpmUrlUpdaterMock.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.npm; +package com.devonfw.tools.ide.url.tool.npm; import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo; diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/pip/PipUrlUpdaterMock.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/pip/PipUrlUpdaterMock.java similarity index 95% rename from cli/src/test/java/com/devonfw/tools/ide/tool/pip/PipUrlUpdaterMock.java rename to url-updater/src/test/java/com/devonfw/tools/ide/url/tool/pip/PipUrlUpdaterMock.java index c84ffc177d..9fa92a0c27 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/pip/PipUrlUpdaterMock.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/pip/PipUrlUpdaterMock.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.pip; +package com.devonfw.tools.ide.url.tool.pip; import java.util.HashSet; import java.util.List; diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/pip/PipUrlUpdaterTest.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/pip/PipUrlUpdaterTest.java similarity index 80% rename from cli/src/test/java/com/devonfw/tools/ide/tool/pip/PipUrlUpdaterTest.java rename to url-updater/src/test/java/com/devonfw/tools/ide/url/tool/pip/PipUrlUpdaterTest.java index dcb0477046..ad1dac8f77 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/pip/PipUrlUpdaterTest.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/pip/PipUrlUpdaterTest.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.pip; +package com.devonfw.urls.tool.pip; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.any; @@ -8,13 +8,16 @@ import java.nio.file.Path; import java.time.Instant; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import com.devonfw.tools.ide.tool.AbstractUrlUpdaterTest; import com.devonfw.tools.ide.url.model.file.json.StatusJson; import com.devonfw.tools.ide.url.model.file.json.UrlStatus; import com.devonfw.tools.ide.url.model.folder.UrlRepository; +import com.devonfw.tools.ide.url.tool.AbstractUrlUpdaterTest; +import com.devonfw.tools.ide.url.tool.pip.PipUrlUpdater; +import com.devonfw.tools.ide.url.tool.pip.PipUrlUpdaterMock; import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo; import com.github.tomakehurst.wiremock.junit5.WireMockTest; @@ -25,7 +28,7 @@ public class PipUrlUpdaterTest extends AbstractUrlUpdaterTest { /** - * Tests if the {@link com.devonfw.tools.ide.tool.pip.PipUrlUpdater} will successfully resolve a server with a Content-Type:text header response. + * Tests if the {@link PipUrlUpdater} will successfully resolve a server with a Content-Type:text header response. *

* See: #1343 for reference. * @@ -53,13 +56,13 @@ public void testPipUrlUpdaterWithTextContentTypeWillSucceed(@TempDir Path tempDi Path versionsPath = tempDir.resolve(toolName).resolve(editionName).resolve(versionName); // then - assertThat(versionsPath.resolve("status.json")).exists(); + Assertions.assertThat(versionsPath.resolve("status.json")).exists(); StatusJson statusJson = retrieveStatusJson(urlRepository, toolName, editionName, versionName); UrlStatus urlStatus = statusJson.getOrCreateUrlStatus(statusUrl); Instant successTimestamp = urlStatus.getSuccess().getTimestamp(); - assertThat(successTimestamp).isNotNull(); + Assertions.assertThat(successTimestamp).isNotNull(); } } diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/python/PythonUrlUpdaterMock.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdaterMock.java similarity index 85% rename from cli/src/test/java/com/devonfw/tools/ide/tool/python/PythonUrlUpdaterMock.java rename to url-updater/src/test/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdaterMock.java index 9de6ee14e2..0b9121f525 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/python/PythonUrlUpdaterMock.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdaterMock.java @@ -1,5 +1,6 @@ -package com.devonfw.tools.ide.tool.python; +package com.devonfw.urls.tool.python; +import com.devonfw.tools.ide.url.tool.python.PythonUrlUpdater; import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo; /** diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/python/PythonUrlUpdaterTest.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdaterTest.java similarity index 98% rename from cli/src/test/java/com/devonfw/tools/ide/tool/python/PythonUrlUpdaterTest.java rename to url-updater/src/test/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdaterTest.java index df7dd3c727..8ef536a451 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/python/PythonUrlUpdaterTest.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdaterTest.java @@ -1,4 +1,4 @@ -package com.devonfw.tools.ide.tool.python; +package com.devonfw.urls.tool.python; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.any; diff --git a/cli/src/test/resources/integrationtest/AndroidStudioJsonUrlUpdater/android-version-without-checksum.json b/url-updater/src/test/resources/integrationtest/AndroidStudioJsonUrlUpdater/android-version-without-checksum.json similarity index 100% rename from cli/src/test/resources/integrationtest/AndroidStudioJsonUrlUpdater/android-version-without-checksum.json rename to url-updater/src/test/resources/integrationtest/AndroidStudioJsonUrlUpdater/android-version-without-checksum.json diff --git a/cli/src/test/resources/integrationtest/AndroidStudioJsonUrlUpdater/android-version.json b/url-updater/src/test/resources/integrationtest/AndroidStudioJsonUrlUpdater/android-version.json similarity index 100% rename from cli/src/test/resources/integrationtest/AndroidStudioJsonUrlUpdater/android-version.json rename to url-updater/src/test/resources/integrationtest/AndroidStudioJsonUrlUpdater/android-version.json diff --git a/cli/src/test/resources/integrationtest/IntellijJsonUrlUpdater/intellij-version-without-checksum.json b/url-updater/src/test/resources/integrationtest/IntellijJsonUrlUpdater/intellij-version-without-checksum.json similarity index 100% rename from cli/src/test/resources/integrationtest/IntellijJsonUrlUpdater/intellij-version-without-checksum.json rename to url-updater/src/test/resources/integrationtest/IntellijJsonUrlUpdater/intellij-version-without-checksum.json diff --git a/cli/src/test/resources/integrationtest/IntellijJsonUrlUpdater/intellij-version.json b/url-updater/src/test/resources/integrationtest/IntellijJsonUrlUpdater/intellij-version.json similarity index 100% rename from cli/src/test/resources/integrationtest/IntellijJsonUrlUpdater/intellij-version.json rename to url-updater/src/test/resources/integrationtest/IntellijJsonUrlUpdater/intellij-version.json diff --git a/cli/src/test/resources/integrationtest/JavaJsonUrlUpdater/java-version.json b/url-updater/src/test/resources/integrationtest/JavaJsonUrlUpdater/java-version.json similarity index 100% rename from cli/src/test/resources/integrationtest/JavaJsonUrlUpdater/java-version.json rename to url-updater/src/test/resources/integrationtest/JavaJsonUrlUpdater/java-version.json diff --git a/cli/src/test/resources/integrationtest/NpmJsonUrlUpdater/npm-version.json b/url-updater/src/test/resources/integrationtest/NpmJsonUrlUpdater/npm-version.json similarity index 100% rename from cli/src/test/resources/integrationtest/NpmJsonUrlUpdater/npm-version.json rename to url-updater/src/test/resources/integrationtest/NpmJsonUrlUpdater/npm-version.json diff --git a/cli/src/test/resources/integrationtest/PythonJsonUrlUpdater/python-version.json b/url-updater/src/test/resources/integrationtest/PythonJsonUrlUpdater/python-version.json similarity index 100% rename from cli/src/test/resources/integrationtest/PythonJsonUrlUpdater/python-version.json rename to url-updater/src/test/resources/integrationtest/PythonJsonUrlUpdater/python-version.json diff --git a/cli/src/test/resources/integrationtest/UrlUpdaterTest/mocked/mocked/1.0/status.json b/url-updater/src/test/resources/integrationtest/UrlUpdaterTest/mocked/mocked/1.0/status.json similarity index 100% rename from cli/src/test/resources/integrationtest/UrlUpdaterTest/mocked/mocked/1.0/status.json rename to url-updater/src/test/resources/integrationtest/UrlUpdaterTest/mocked/mocked/1.0/status.json From 793417a834470f01371112ae2297b32136a16228 Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Wed, 5 Feb 2025 11:07:03 +0100 Subject: [PATCH 12/25] #404: fixed github actions workflow --- .github/workflows/update-urls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-urls.yml b/.github/workflows/update-urls.yml index 491077e5aa..56f89e71d2 100644 --- a/.github/workflows/update-urls.yml +++ b/.github/workflows/update-urls.yml @@ -25,7 +25,7 @@ jobs: cache: 'maven' - name: Build and run url updater run: | - cd cli + cd url-updater mvn -B -ntp -Dstyle.color=always install mvn -B -ntp -Dstyle.color=always exec:java -Dexec.mainClass="com.devonfw.tools.ide.url.UpdateInitiator" -Dexec.args="../ide-urls PT5H30M" - name: Commit and push to ide-urls From 72f20001bc7f630c11a973b2e68b6a3f2d3c5044 Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Wed, 5 Feb 2025 11:49:32 +0100 Subject: [PATCH 13/25] #404: fixed test package names --- .../com/devonfw/tools/ide/url/tool/pip/PipUrlUpdaterTest.java | 4 +--- .../tools/ide/url/tool/python/PythonUrlUpdaterMock.java | 3 +-- .../tools/ide/url/tool/python/PythonUrlUpdaterTest.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/pip/PipUrlUpdaterTest.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/pip/PipUrlUpdaterTest.java index ad1dac8f77..f6feb87bf3 100644 --- a/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/pip/PipUrlUpdaterTest.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/pip/PipUrlUpdaterTest.java @@ -1,4 +1,4 @@ -package com.devonfw.urls.tool.pip; +package com.devonfw.tools.ide.url.tool.pip; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.any; @@ -16,8 +16,6 @@ import com.devonfw.tools.ide.url.model.file.json.UrlStatus; import com.devonfw.tools.ide.url.model.folder.UrlRepository; import com.devonfw.tools.ide.url.tool.AbstractUrlUpdaterTest; -import com.devonfw.tools.ide.url.tool.pip.PipUrlUpdater; -import com.devonfw.tools.ide.url.tool.pip.PipUrlUpdaterMock; import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo; import com.github.tomakehurst.wiremock.junit5.WireMockTest; diff --git a/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdaterMock.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdaterMock.java index 0b9121f525..393f1488d6 100644 --- a/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdaterMock.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdaterMock.java @@ -1,6 +1,5 @@ -package com.devonfw.urls.tool.python; +package com.devonfw.tools.ide.url.tool.python; -import com.devonfw.tools.ide.url.tool.python.PythonUrlUpdater; import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo; /** diff --git a/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdaterTest.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdaterTest.java index 8ef536a451..a6f56ffd9c 100644 --- a/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdaterTest.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdaterTest.java @@ -1,4 +1,4 @@ -package com.devonfw.urls.tool.python; +package com.devonfw.tools.ide.url.tool.python; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.any; From e70b96e8e2443e2d03256649125544ae5ff6f734 Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Wed, 5 Feb 2025 11:52:27 +0100 Subject: [PATCH 14/25] #404: fixed assertThat import --- .../ide/url/model/file/UrlStatusFileTest.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/cli/src/test/java/com/devonfw/tools/ide/url/model/file/UrlStatusFileTest.java b/cli/src/test/java/com/devonfw/tools/ide/url/model/file/UrlStatusFileTest.java index 02d9fdb5b6..fa785e79c8 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/url/model/file/UrlStatusFileTest.java +++ b/cli/src/test/java/com/devonfw/tools/ide/url/model/file/UrlStatusFileTest.java @@ -2,7 +2,6 @@ import java.time.Instant; -import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import com.devonfw.tools.ide.url.model.AbstractUrlModelTest; @@ -34,16 +33,16 @@ public void testReadJson() { UrlStatusFile status = version.getOrCreateStatus(); StatusJson statusJson = status.getStatusJson(); // then - Assertions.assertThat(statusJson.getUrls()).hasSize(1); + assertThat(statusJson.getUrls()).hasSize(1); UrlStatus urlStatus = statusJson.getUrls().values().iterator().next(); UrlStatusState success = urlStatus.getSuccess(); - Assertions.assertThat(success.getTimestamp()).isEqualTo(Instant.parse("2023-02-21T15:03:09.387386Z")); - Assertions.assertThat(success.getCode()).isNull(); - Assertions.assertThat(success.getMessage()).isNull(); + assertThat(success.getTimestamp()).isEqualTo(Instant.parse("2023-02-21T15:03:09.387386Z")); + assertThat(success.getCode()).isNull(); + assertThat(success.getMessage()).isNull(); UrlStatusState error = urlStatus.getError(); - Assertions.assertThat(error.getTimestamp()).isEqualTo(Instant.parse("2023-01-01T23:59:59.999999Z")); - Assertions.assertThat(error.getCode()).isEqualTo(500); - Assertions.assertThat(error.getMessage()).isEqualTo("core dumped"); + assertThat(error.getTimestamp()).isEqualTo(Instant.parse("2023-01-01T23:59:59.999999Z")); + assertThat(error.getCode()).isEqualTo(500); + assertThat(error.getMessage()).isEqualTo("core dumped"); } } From eca4217e183a226281616e18310857adc8121aff Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Wed, 5 Feb 2025 11:57:00 +0100 Subject: [PATCH 15/25] #404: removed FQN --- .../ide/url/model/file/json/StatusJsonTest.java | 2 +- .../url/model/file/json/ToolDependenciesTest.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cli/src/test/java/com/devonfw/tools/ide/url/model/file/json/StatusJsonTest.java b/cli/src/test/java/com/devonfw/tools/ide/url/model/file/json/StatusJsonTest.java index 34e79e562d..6216b143d4 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/url/model/file/json/StatusJsonTest.java +++ b/cli/src/test/java/com/devonfw/tools/ide/url/model/file/json/StatusJsonTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; /** - * Test of {@link com.devonfw.tools.ide.url.model.file.json.StatusJson}. + * Test of {@link StatusJson}. */ public class StatusJsonTest extends Assertions { diff --git a/cli/src/test/java/com/devonfw/tools/ide/url/model/file/json/ToolDependenciesTest.java b/cli/src/test/java/com/devonfw/tools/ide/url/model/file/json/ToolDependenciesTest.java index d28862c1d7..91a307e724 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/url/model/file/json/ToolDependenciesTest.java +++ b/cli/src/test/java/com/devonfw/tools/ide/url/model/file/json/ToolDependenciesTest.java @@ -11,7 +11,7 @@ import com.devonfw.tools.ide.version.VersionRange; /** - * Test of {@link com.devonfw.tools.ide.url.model.file.json.ToolDependencies} and {@link AbstractUrlToolOrEdition#getDependencyFile()}. + * Test of {@link ToolDependencies} and {@link AbstractUrlToolOrEdition#getDependencyFile()}. */ public class ToolDependenciesTest extends AbstractUrlModelTest { @@ -23,11 +23,11 @@ public void testEditionSpecific() { IdeContext context = newContext(); // act - Collection dependencies = context.getDefaultToolRepository() + Collection dependencies = context.getDefaultToolRepository() .findDependencies("tomcat", "tomcat", VersionIdentifier.of("11.0.0")); // assert - assertThat(dependencies).containsExactly(new com.devonfw.tools.ide.url.model.file.json.ToolDependency("java", VersionRange.of("[17,)"))); + assertThat(dependencies).containsExactly(new ToolDependency("java", VersionRange.of("[17,)"))); } @Test @@ -37,12 +37,12 @@ public void testEditionFallback() { IdeContext context = newContext(); // act - Collection dependencies = context.getDefaultToolRepository() + Collection dependencies = context.getDefaultToolRepository() .findDependencies("tomcat", "undefined", VersionIdentifier.of("11.0.0")); // assert assertThat(dependencies).containsExactly( - new com.devonfw.tools.ide.url.model.file.json.ToolDependency("this-is-the-wrong-file-only-for-testing", VersionRange.of("[1.0,2.0]"))); + new ToolDependency("this-is-the-wrong-file-only-for-testing", VersionRange.of("[1.0,2.0]"))); } @Test @@ -52,7 +52,7 @@ public void testEditionUnspecific() { IdeContext context = newContext(); // act - Collection dependencies = context.getDefaultToolRepository() + Collection dependencies = context.getDefaultToolRepository() .findDependencies("mvn", "undefined", VersionIdentifier.of("3.9.0")); // assert From cc145f3e99a50908248bc74865d5ae308f806be4 Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Wed, 5 Feb 2025 12:02:55 +0100 Subject: [PATCH 16/25] #404: fixed assertThat import --- .../devonfw/tools/ide/url/tool/pip/PipUrlUpdaterTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/pip/PipUrlUpdaterTest.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/pip/PipUrlUpdaterTest.java index f6feb87bf3..007f47cc7e 100644 --- a/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/pip/PipUrlUpdaterTest.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/tool/pip/PipUrlUpdaterTest.java @@ -8,7 +8,6 @@ import java.nio.file.Path; import java.time.Instant; -import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -54,13 +53,13 @@ public void testPipUrlUpdaterWithTextContentTypeWillSucceed(@TempDir Path tempDi Path versionsPath = tempDir.resolve(toolName).resolve(editionName).resolve(versionName); // then - Assertions.assertThat(versionsPath.resolve("status.json")).exists(); + assertThat(versionsPath.resolve("status.json")).exists(); StatusJson statusJson = retrieveStatusJson(urlRepository, toolName, editionName, versionName); UrlStatus urlStatus = statusJson.getOrCreateUrlStatus(statusUrl); Instant successTimestamp = urlStatus.getSuccess().getTimestamp(); - Assertions.assertThat(successTimestamp).isNotNull(); + assertThat(successTimestamp).isNotNull(); } } From 1beb57d7c7b43edb5a49ee245b711e544dd27d5a Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Fri, 7 Feb 2025 11:27:00 +0100 Subject: [PATCH 17/25] #404: implemented requested changes applied reformat --- .../com/devonfw/tools/ide/log/AbstractIdeSubLogger.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/log/AbstractIdeSubLogger.java b/cli/src/main/java/com/devonfw/tools/ide/log/AbstractIdeSubLogger.java index bb8215482a..a1c2080673 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/log/AbstractIdeSubLogger.java +++ b/cli/src/main/java/com/devonfw/tools/ide/log/AbstractIdeSubLogger.java @@ -141,7 +141,7 @@ public String log(Throwable error, String message, Object... args) { String actualMessage = message; if (error != null) { if (isOmitStacktrace(error)) { - if (message == null) { + if (message == null) { actualMessage = error.getMessage(); } error = null; @@ -150,9 +150,9 @@ public String log(Throwable error, String message, Object... args) { } } if (actualMessage == null) { - actualMessage = "Internal error: Both message and error is null - nothing to log!"; - // fail fast if assertions are enabled, so developers of IDEasy will find the bug immediately but in productive use better log the error and continue - assert false : actualMessage; + actualMessage = "Internal error: Both message and error is null - nothing to log!"; + // fail fast if assertions are enabled, so developers of IDEasy will find the bug immediately but in productive use better log the error and continue + assert false : actualMessage; } else if ((args != null) && (args.length > 0)) { actualMessage = compose(actualMessage, args); } From b87d21a9cff73e2422850f960d49845d5149d39f Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Mon, 31 Mar 2025 12:39:10 +0200 Subject: [PATCH 18/25] #404: removed outdated imports --- .../ide/url/tool/androidstudio/AndroidStudioUrlUpdater.java | 3 --- .../tools/ide/url/tool/intellij/IntellijUrlUpdater.java | 3 --- .../com/devonfw/tools/ide/url/tool/java/JavaUrlUpdater.java | 2 -- .../devonfw/tools/ide/url/tool/python/PythonUrlUpdater.java | 3 --- .../com/devonfw/tools/ide/url/updater/AbstractUrlUpdater.java | 1 - 5 files changed, 12 deletions(-) diff --git a/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/androidstudio/AndroidStudioUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/androidstudio/AndroidStudioUrlUpdater.java index 50fa57f41a..5c956c0df2 100644 --- a/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/androidstudio/AndroidStudioUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/androidstudio/AndroidStudioUrlUpdater.java @@ -5,9 +5,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.devonfw.tools.ide.tool.androidstudio.AndroidJsonDownload; -import com.devonfw.tools.ide.tool.androidstudio.AndroidJsonItem; -import com.devonfw.tools.ide.tool.androidstudio.AndroidJsonObject; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.JsonUrlUpdater; diff --git a/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/intellij/IntellijUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/intellij/IntellijUrlUpdater.java index 9ee40b8d88..e62c383dc2 100644 --- a/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/intellij/IntellijUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/intellij/IntellijUrlUpdater.java @@ -7,9 +7,6 @@ import com.devonfw.tools.ide.json.JsonVersionItem; import com.devonfw.tools.ide.os.OperatingSystem; import com.devonfw.tools.ide.os.SystemArchitecture; -import com.devonfw.tools.ide.tool.intellij.IntellijJsonDownloadsItem; -import com.devonfw.tools.ide.tool.intellij.IntellijJsonObject; -import com.devonfw.tools.ide.tool.intellij.IntellijJsonRelease; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.JsonUrlUpdater; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/java/JavaUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/java/JavaUrlUpdater.java index 3456396c15..a28e111a26 100644 --- a/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/java/JavaUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/java/JavaUrlUpdater.java @@ -2,8 +2,6 @@ import java.util.Collection; -import com.devonfw.tools.ide.tool.java.JavaJsonObject; -import com.devonfw.tools.ide.tool.java.JavaJsonVersion; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.JsonUrlUpdater; diff --git a/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdater.java index f45f64bd1b..4afad2944a 100644 --- a/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/tool/python/PythonUrlUpdater.java @@ -7,9 +7,6 @@ import org.slf4j.LoggerFactory; import com.devonfw.tools.ide.json.JsonMapping; -import com.devonfw.tools.ide.tool.python.PythonFile; -import com.devonfw.tools.ide.tool.python.PythonJsonObject; -import com.devonfw.tools.ide.tool.python.PythonRelease; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.updater.JsonUrlUpdater; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/url-updater/src/main/java/com/devonfw/tools/ide/url/updater/AbstractUrlUpdater.java b/url-updater/src/main/java/com/devonfw/tools/ide/url/updater/AbstractUrlUpdater.java index f2e34a8bb5..67e5751dee 100644 --- a/url-updater/src/main/java/com/devonfw/tools/ide/url/updater/AbstractUrlUpdater.java +++ b/url-updater/src/main/java/com/devonfw/tools/ide/url/updater/AbstractUrlUpdater.java @@ -38,7 +38,6 @@ import com.devonfw.tools.ide.url.model.folder.UrlTool; import com.devonfw.tools.ide.url.model.folder.UrlVersion; import com.devonfw.tools.ide.url.model.report.UrlUpdaterReport; -import com.devonfw.tools.ide.url.tool.pip.PipUrlUpdater; import com.devonfw.tools.ide.util.DateTimeUtil; import com.devonfw.tools.ide.util.HexUtil; From e21c0a29016d3cec352f4a4cdebd1fb54ec618dc Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Tue, 1 Apr 2025 09:56:18 +0200 Subject: [PATCH 19/25] #404: removed jackson-core dependency --- cli/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index bfe5dc3c7f..894134a1c2 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -31,11 +31,6 @@ org.eclipse.parsson parsson - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - com.fasterxml.jackson.core jackson-databind From 1b924df4013cda3f2c38cc685c41734e52b0959f Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Mon, 28 Apr 2025 22:08:03 +0200 Subject: [PATCH 20/25] #404 implemented requested changes fixed code format --- .../tools/ide/context/AbstractIdeContext.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java b/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java index 6e83b6a0c5..f30d79fb69 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java +++ b/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java @@ -183,7 +183,7 @@ public AbstractIdeContext(IdeStartContextImpl startContext, Path workingDirector if ((ideRootPath != null) && (ideRootPath.equals(currentDir))) { // prevent that during tests we traverse to the real IDE project of IDEasy developer currentDir = null; - } + } } // detection completed, initializing variables @@ -415,7 +415,7 @@ public Path getIdePath() { Path myIdeRoot = getIdeRoot(); if (myIdeRoot == null) { return null; - } + } return myIdeRoot.resolve(FOLDER_UNDERSCORE_IDE); } @@ -431,7 +431,7 @@ public Path getTempPath() { Path idePath = getIdePath(); if (idePath == null) { return null; - } + } return idePath.resolve("tmp"); } @@ -441,7 +441,7 @@ public Path getTempDownloadPath() { Path tmp = getTempPath(); if (tmp == null) { return null; - } + } return tmp.resolve(FOLDER_DOWNLOADS); } @@ -502,7 +502,7 @@ public Path getSoftwarePath() { if (this.ideHome == null) { return null; - } + } return this.ideHome.resolve(FOLDER_SOFTWARE); } @@ -512,7 +512,7 @@ public Path getSoftwareExtraPath() { Path softwarePath = getSoftwarePath(); if (softwarePath == null) { return null; - } + } return softwarePath.resolve(FOLDER_EXTRA); } @@ -522,7 +522,7 @@ public Path getSoftwareRepositoryPath() { Path idePath = getIdePath(); if (idePath == null) { return null; - } + } return idePath.resolve(FOLDER_SOFTWARE); } @@ -556,7 +556,7 @@ public Path getUrlsPath() { Path idePath = getIdePath(); if (idePath == null) { return null; - } + } return idePath.resolve(FOLDER_URLS); } @@ -566,7 +566,7 @@ public Path getToolRepositoryPath() { Path idePath = getIdePath(); if (idePath == null) { return null; - } + } return idePath.resolve(FOLDER_SOFTWARE); } From 31486250676c8b9af2464bd37c06c42e1629bc4d Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Mon, 28 Apr 2025 22:09:41 +0200 Subject: [PATCH 21/25] #404 implemented requested changes removed unused code --- cli/src/main/java/com/devonfw/tools/ide/cli/Ideasy.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/cli/Ideasy.java b/cli/src/main/java/com/devonfw/tools/ide/cli/Ideasy.java index ba608c01f3..49ed9b548b 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/cli/Ideasy.java +++ b/cli/src/main/java/com/devonfw/tools/ide/cli/Ideasy.java @@ -3,9 +3,6 @@ import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.devonfw.tools.ide.commandlet.ContextCommandlet; import com.devonfw.tools.ide.context.AbstractIdeContext; import com.devonfw.tools.ide.context.IdeContext; @@ -22,8 +19,6 @@ public final class Ideasy { private AbstractIdeContext context; - private static final Logger logger = LoggerFactory.getLogger(Ideasy.class); - /** * The default constructor. */ From 32e2ac835b191ce93f90b25ce877990d754381e0 Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Mon, 7 Jul 2025 15:19:26 +0200 Subject: [PATCH 22/25] #404: implemented requested changes set loggingContext to private added getter for loggingContext added check to ignore WireMock specific log messages removed logback-classic from dependencies --- cli/pom.xml | 5 ----- .../tools/ide/context/AbstractIdeContext.java | 12 +++++++++++- .../ide/serviceprovider/IdeLoggerAdapter.java | 17 ++++++++++++++--- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 894134a1c2..1609facee8 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -49,11 +49,6 @@ slf4j-api - - ch.qos.logback - logback-classic - - org.graalvm.sdk nativeimage diff --git a/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java b/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java index 6d8e718560..816dfd44d2 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java +++ b/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java @@ -147,7 +147,7 @@ public abstract class AbstractIdeContext implements IdeContext, IdeLogArgFormatt private final Map privacyMap; /** Context used for logging */ - public static IdeContext loggingContext; + private static IdeContext loggingContext; /** * The constructor. @@ -1465,4 +1465,14 @@ public void writeVersionFile(VersionIdentifier version, Path installationPath) { getFileAccess().writeFileContent(version.toString(), versionFile); } + /** + * Gets the logging context. + * + * @return {@link IdeContext}. + */ + public static IdeContext getLoggingContext() { + + return loggingContext; + } + } diff --git a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java index 4f44076a0c..3dd361e418 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java +++ b/cli/src/main/java/com/devonfw/tools/ide/serviceprovider/IdeLoggerAdapter.java @@ -1,10 +1,11 @@ package com.devonfw.tools.ide.serviceprovider; -import static com.devonfw.tools.ide.context.AbstractIdeContext.loggingContext; - import org.slf4j.Logger; import org.slf4j.Marker; +import com.devonfw.tools.ide.context.AbstractIdeContext; +import com.devonfw.tools.ide.context.IdeContext; + /** * Implementation of {@link Logger}. */ @@ -12,6 +13,8 @@ public class IdeLoggerAdapter implements Logger { private final String name; + private final IdeContext loggingContext; + /** * The constructor. * @@ -20,6 +23,12 @@ public class IdeLoggerAdapter implements Logger { public IdeLoggerAdapter(String name) { this.name = name; + // TODO: check for WireMock, com.github.jknack.handlebars.Handlebars, org.eclipse.jetty.util.Jetty + if (name.equals("WireMock") || name.contains("jknack") || name.contains("jetty")) { + loggingContext = null; + return; + } + loggingContext = AbstractIdeContext.getLoggingContext(); } @Override @@ -266,7 +275,9 @@ public void warn(String s, Object o, Object o1) { @Override public void warn(String s, Throwable throwable) { - loggingContext.warning(s, throwable); + if (loggingContext != null) { + loggingContext.warning(s, throwable); + } } @Override From 540717d63558bf1b6c2e56691b56a7e742780ce0 Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Mon, 7 Jul 2025 15:28:18 +0200 Subject: [PATCH 23/25] #404: fixed gui --- gui/src/main/java/com/devonfw/ide/gui/MainController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gui/src/main/java/com/devonfw/ide/gui/MainController.java b/gui/src/main/java/com/devonfw/ide/gui/MainController.java index 6e94acd8aa..a096c2a231 100644 --- a/gui/src/main/java/com/devonfw/ide/gui/MainController.java +++ b/gui/src/main/java/com/devonfw/ide/gui/MainController.java @@ -1,7 +1,5 @@ package com.devonfw.ide.gui; -import static ch.qos.logback.core.util.OptionHelper.getEnv; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -35,7 +33,7 @@ public class MainController { @FXML private Button vsCodeOpen; - private final String directoryPath = getEnv(IdeVariables.IDE_ROOT.getName()); + private final String directoryPath = IdeVariables.IDE_ROOT.getName(); private Path projectValue; private Path workspaceValue; From 8237ccbd88f04cb72b96f534e9c30d315349fe8c Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Mon, 11 Aug 2025 11:21:08 +0200 Subject: [PATCH 24/25] #404 fixed javadocs in UrlUpdaterTest --- .../com/devonfw/tools/ide/url/updater/UrlUpdaterTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/url-updater/src/test/java/com/devonfw/tools/ide/url/updater/UrlUpdaterTest.java b/url-updater/src/test/java/com/devonfw/tools/ide/url/updater/UrlUpdaterTest.java index 854395c1fd..0e7fb2d2aa 100644 --- a/url-updater/src/test/java/com/devonfw/tools/ide/url/updater/UrlUpdaterTest.java +++ b/url-updater/src/test/java/com/devonfw/tools/ide/url/updater/UrlUpdaterTest.java @@ -27,7 +27,6 @@ import com.devonfw.tools.ide.url.model.folder.UrlRepository; import com.devonfw.tools.ide.url.model.folder.UrlTool; import com.devonfw.tools.ide.url.model.folder.UrlVersion; -import com.devonfw.tools.ide.url.updater.UrlUpdater; import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo; import com.github.tomakehurst.wiremock.junit5.WireMockTest; @@ -210,7 +209,7 @@ public void testSuccessStateUpdatedAfterError(@TempDir Path tempDir, WireMockRun } /** - * Tests if the the tool version gets entirely removed if all versions are broken for a long time. + * Tests if the tool version gets entirely removed if all versions are broken for a long time. * * @param tempDir Temporary directory * @param wmRuntimeInfo wireMock server on a random port @@ -282,7 +281,7 @@ public void testUrlUpdaterWithTextContentTypeWillNotCreateStatusJson(@TempDir Pa } /** - * Tests if the {@link com.devonfw.tools.ide.url.updater.UrlUpdater} will handle the literally latest version of a tool correctly + * Tests if the {@link UrlUpdater} will handle the literally latest version of a tool correctly * * @param tempDir Temporary directory * @param wmRuntimeInfo wireMock server on a random port From 577c1cbd9f0f62c58b8413f84accb9ac60bcb6b2 Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Mon, 13 Oct 2025 23:26:18 +0200 Subject: [PATCH 25/25] #404: Removed old mavenRepository --- .../com/devonfw/tools/ide/context/AbstractIdeContext.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java b/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java index 0edd726633..8961d773fb 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java +++ b/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java @@ -224,7 +224,6 @@ public AbstractIdeContext(IdeStartContextImpl startContext, Path workingDirector this.defaultToolRepository = new DefaultToolRepository(this); loggingContext = this; - this.mavenRepository = new MavenRepository(this); this.mvnRepository = new MvnRepository(this); this.npmRepository = new NpmRepository(this); } @@ -270,8 +269,8 @@ protected Path getIdeRootPathFromEnv(boolean withSanityCheck) { warning("IDE_ROOT is set to {} but was expanded to absolute path {} and does not match for segment {} and {} - fix your IDEasy installation!", rootPath, absoluteRootPath, rootName, absoluteRootName); break; - } - } + } + } } else { warning("IDE_ROOT is set to {} but was expanded to a shorter absolute path {}", rootPath, absoluteRootPath); @@ -322,7 +321,7 @@ private String getMessageIdeHomeFound() { String wks = this.workspaceName; if (isPrivacyMode() && !WORKSPACE_MAIN.equals(wks)) { wks = "*".repeat(wks.length()); - } + } return "IDE environment variables have been set for " + formatArgument(this.ideHome) + " in workspace " + wks; }