devonfw#103: implemented requested changes

removed default getEdition override from tools changed getEdition to non abstract made getIntellijJsonRelease public
MattesMrzik · Feb 19, 2024 · f66c7ea · f66c7ea
1 parent ae52292
commit f66c7ea
Show file tree

Hide file tree

Showing 34 changed files with 28 additions and 188 deletions.
diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/androidstudio/AndroidStudioUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/androidstudio/AndroidStudioUrlUpdater.java
@@ -1,17 +1,18 @@
 package com.devonfw.tools.ide.tool.androidstudio;
 
+import java.util.Collection;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.devonfw.tools.ide.json.mapping.JsonMapping;
 import com.devonfw.tools.ide.url.model.folder.UrlEdition;
 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.JsonUrlUpdater;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Collection;
-import java.util.List;
 
 /**
  * {@link JsonUrlUpdater} for Android Studio.
@@ -40,12 +41,6 @@ protected String getTool() {
     return "android-studio";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   public void update(UrlRepository urlRepository) {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/aws/AwsUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/aws/AwsUrlUpdater.java
@@ -15,12 +15,6 @@ protected String getTool() {
     return "aws";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected String getGithubOrganization() {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/az/AzureUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/az/AzureUrlUpdater.java
@@ -18,12 +18,6 @@ protected String getTool() {
     return "az";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected void addVersion(UrlVersion urlVersion) {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/cobigen/CobigenUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/cobigen/CobigenUrlUpdater.java
@@ -12,12 +12,6 @@ protected String getTool() {
     return "cobigen";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected String getMavenGroupIdPath() {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/docker/DockerDesktopUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/docker/DockerDesktopUrlUpdater.java
@@ -23,12 +23,6 @@ protected String getTool() {
     return "docker";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected void addVersion(UrlVersion urlVersion) {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/dotnet/DotNetUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/dotnet/DotNetUrlUpdater.java
@@ -13,12 +13,6 @@ protected String getTool() {
     return "dotnet";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected String getVersionPrefixToRemove() {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/gcloud/GCloudUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/gcloud/GCloudUrlUpdater.java
@@ -21,12 +21,6 @@ protected String getTool() {
     return "gcloud";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected String getGithubRepository() {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/gcviewer/GcViewerUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/gcviewer/GcViewerUrlUpdater.java
@@ -13,12 +13,6 @@ protected String getTool() {
     return "gcviewer";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected void addVersion(UrlVersion urlVersion) {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/gh/GhUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/gh/GhUrlUpdater.java
@@ -17,12 +17,6 @@ protected String getTool() {
     return "gh";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected String getVersionPrefixToRemove() {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/gradle/GradleUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/gradle/GradleUrlUpdater.java
@@ -44,12 +44,6 @@ protected String getTool() {
     return "gradle";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected void addVersion(UrlVersion urlVersion) {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/helm/HelmUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/helm/HelmUrlUpdater.java
@@ -17,12 +17,6 @@ protected String getTool() {
     return "helm";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected String getVersionPrefixToRemove() {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/intellij/IntellijCommunityUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/intellij/IntellijCommunityUrlUpdater.java
@@ -5,11 +5,11 @@ public class IntellijCommunityUrlUpdater extends IntellijUrlUpdater {
   @Override
   protected String getEdition() {
 
-    return getTool();
+    return "community";
   }
 
   @Override
-  IntellijJsonObject getIntellijJsonRelease(IntellijJsonObject[] releases) {
+  public IntellijJsonObject getIntellijJsonRelease(IntellijJsonObject[] releases) {
 
     return releases[1];
   }

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/intellij/IntellijUltimateUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/intellij/IntellijUltimateUrlUpdater.java
@@ -9,7 +9,7 @@ protected String getEdition() {
   }
 
   @Override
-  IntellijJsonObject getIntellijJsonRelease(IntellijJsonObject[] releases) {
+  public IntellijJsonObject getIntellijJsonRelease(IntellijJsonObject[] releases) {
 
     return releases[0];
   }

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/intellij/IntellijUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/intellij/IntellijUrlUpdater.java
@@ -20,7 +20,7 @@
 /**
  * {@link IntellijUrlUpdater} base class for IntelliJ.
  */
-public abstract class IntellijUrlUpdater extends JsonUrlUpdater<IntellijJsonObject> {
+public class IntellijUrlUpdater extends JsonUrlUpdater<IntellijJsonObject> {
 
   private static final String VERSION_BASE_URL = "https://data.services.jetbrains.com";
 
@@ -56,7 +56,10 @@ public void update(UrlRepository urlRepository) {
    * @param releases Has 2 elements, 1. Ultimate Edition, 2. Community Edition
    * @return The release for the {@link #getEdition() edition}.
    */
-  abstract IntellijJsonObject getIntellijJsonRelease(IntellijJsonObject[] releases);
+  public IntellijJsonObject getIntellijJsonRelease(IntellijJsonObject[] releases) {
+
+    return releases[1];
+  }
 
   /**
    * Adds a version for the provided {@link UrlEdition}
@@ -141,6 +144,12 @@ protected String getTool() {
     return "intellij";
   }
 
+  @Override
+  protected String getEdition() {
+
+    return "community";
+  }
+
   @Override
   protected String doGetVersionUrl() {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/jasypt/JasyptUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/jasypt/JasyptUrlUpdater.java
@@ -12,12 +12,6 @@ protected String getTool() {
     return "jasypt";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected String getMavenGroupIdPath() {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/java/JavaUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/java/JavaUrlUpdater.java
@@ -16,12 +16,6 @@ protected String getTool() {
     return "java";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected String mapVersion(String version) {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/jenkins/JenkinsUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/jenkins/JenkinsUrlUpdater.java
@@ -16,12 +16,6 @@ protected String getTool() {
     return "jenkins";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected String getVersionUrl() {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/jmc/JmcUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/jmc/JmcUrlUpdater.java
@@ -14,12 +14,6 @@ protected String getTool() {
     return "jmc";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected String getGithubOrganization() {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/kotlinc/KotlincNativeUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/kotlinc/KotlincNativeUrlUpdater.java
@@ -15,12 +15,6 @@ protected String getTool() {
     return "kotlinc-native";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected void addVersion(UrlVersion urlVersion) {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/kotlinc/KotlincUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/kotlinc/KotlincUrlUpdater.java
@@ -15,12 +15,6 @@ protected String getTool() {
     return "kotlinc";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected void addVersion(UrlVersion urlVersion) {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/lazydocker/LazyDockerUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/lazydocker/LazyDockerUrlUpdater.java
@@ -19,12 +19,6 @@ protected String getTool() {
     return "lazydocker";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected String getGithubOrganization() {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/mvn/MvnUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/mvn/MvnUrlUpdater.java
@@ -15,12 +15,6 @@ protected String getTool() {
     return "mvn";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected void addVersion(UrlVersion urlVersion) {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/node/NodeUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/node/NodeUrlUpdater.java
@@ -21,12 +21,6 @@ protected String getTool() {
     return "node";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected String getVersionPrefixToRemove() {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/npm/NpmUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/npm/NpmUrlUpdater.java
@@ -15,12 +15,6 @@ protected String getTool() {
     return "npm";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected void addVersion(UrlVersion urlVersion) {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/oc/OcUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/oc/OcUrlUpdater.java
@@ -15,12 +15,6 @@ protected String getTool() {
     return "oc";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected void addVersion(UrlVersion urlVersion) {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/pip/PipUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/pip/PipUrlUpdater.java
@@ -15,12 +15,6 @@ protected String getTool() {
     return "pip";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected void addVersion(UrlVersion urlVersion) {
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/python/PythonUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/python/PythonUrlUpdater.java
@@ -35,12 +35,6 @@ protected String getTool() {
     return "python";
   }
 
-  @Override
-  protected String getEdition() {
-
-    return getTool();
-  }
-
   @Override
   protected void addVersion(UrlVersion urlVersion) {