[#60feature/#60-restlib] refactoring

Signed-off-by: huluvu424242 <huluvu424242@gmail.com>

src/main/java/com/github/funthomas424242/jenkinsmonitor/JenkinsMonitorRuntimeException.java

@@ -0,0 +1,100 @@
+package com.github.funthomas424242.jenkinsmonitor;
+
+/*-
+ * #%L
+ * Jenkins Monitor
+ * %%
+ * Copyright (C) 2019 - 2023 PIUG
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * #L%
+ */
+
+public class JenkinsMonitorRuntimeException extends RuntimeException {
+    public JenkinsMonitorRuntimeException() {
+        super();
+    }
+
+    /**
+     * Constructs a new runtime exception with the specified detail message.
+     * The cause is not initialized, and may subsequently be initialized by a
+     * call to {@link #initCause}.
+     *
+     * @param message the detail message. The detail message is saved for
+     *                later retrieval by the {@link #getMessage()} method.
+     */
+    public JenkinsMonitorRuntimeException(String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new runtime exception with the specified detail message and
+     * cause.  <p>Note that the detail message associated with
+     * {@code cause} is <i>not</i> automatically incorporated in
+     * this runtime exception's detail message.
+     *
+     * @param message the detail message (which is saved for later retrieval
+     *                by the {@link #getMessage()} method).
+     * @param cause   the cause (which is saved for later retrieval by the
+     *                {@link #getCause()} method).  (A {@code null} value is
+     *                permitted, and indicates that the cause is nonexistent or
+     *                unknown.)
+     * @since 1.4
+     */
+    public JenkinsMonitorRuntimeException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Constructs a new runtime exception with the specified cause and a
+     * detail message of {@code (cause==null ? null : cause.toString())}
+     * (which typically contains the class and detail message of
+     * {@code cause}).  This constructor is useful for runtime exceptions
+     * that are little more than wrappers for other throwables.
+     *
+     * @param cause the cause (which is saved for later retrieval by the
+     *              {@link #getCause()} method).  (A {@code null} value is
+     *              permitted, and indicates that the cause is nonexistent or
+     *              unknown.)
+     * @since 1.4
+     */
+    public JenkinsMonitorRuntimeException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Constructs a new runtime exception with the specified detail
+     * message, cause, suppression enabled or disabled, and writable
+     * stack trace enabled or disabled.
+     *
+     * @param message            the detail message.
+     * @param cause              the cause.  (A {@code null} value is permitted,
+     *                           and indicates that the cause is nonexistent or unknown.)
+     * @param enableSuppression  whether or not suppression is enabled
+     *                           or disabled
+     * @param writableStackTrace whether or not the stack trace should
+     *                           be writable
+     * @since 1.7
+     */
+    protected JenkinsMonitorRuntimeException(String message, Throwable cause,
+                                             boolean enableSuppression,
+                                             boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}
+
+
+
+

src/main/java/com/github/funthomas424242/jenkinsmonitor/config/Configuration.java

@@ -23,6 +23,7 @@
  */
 
 import ch.qos.logback.core.joran.spi.JoranException;
+import com.github.funthomas424242.jenkinsmonitor.JenkinsMonitorRuntimeException;
 import com.github.funthomas424242.jenkinsmonitor.etc.JavaSystemWrapper;
 import com.github.funthomas424242.jenkinsmonitor.etc.NetworkHelper;
 import com.github.funthomas424242.jenkinsmonitor.jenkins.JobAbfragedaten;
@@ -108,9 +109,8 @@ public File getConfigurationfile() {
         return this.configurationFile;
     }
 
-    protected Jenkinszugangskonfiguration[] getAllJenkinszugangskonfigurationen() {
-        //TODO
-        loadPropertiesFromFile(configurationFile);
+    public Jenkinszugangskonfiguration[] getAllJenkinszugangskonfigurationen() {
+//        loadPropertiesFromFile(configurationFile);
         final Zugangsdatensammler zugangsdatensammler = new Zugangsdatensammler();
         configurationProperties
                 .stringPropertyNames()
@@ -120,8 +120,8 @@ protected Jenkinszugangskonfiguration[] getAllJenkinszugangskonfigurationen() {
         return zugangsdatensammler.getJenkinsZugangsdaten();
     }
 
-    protected JobAbfragedaten getAbfragedatenOf(final URL jobUrl) {
-        loadPropertiesFromFile(configurationFile);
+    public JobAbfragedaten getAbfragedatenOf(final URL jobUrl) {
+//        loadPropertiesFromFile(configurationFile);
         final Jenkinszugangskonfiguration[] alleJenkinsZugaenge = getAllJenkinszugangskonfigurationen();
         return Arrays.stream(alleJenkinsZugaenge)
                 .filter(zugang -> jobUrl.toExternalForm().startsWith(zugang.getJenkinsUrl().toExternalForm()))
@@ -195,7 +195,7 @@ public Loaded resetLoggerConfiguration() {
             // Logger Konfiguratin neu laden mit gesetzten Systemproperties
             LogStashConfigManager.reloadDefaultLoggerConfiguration();
         } catch (JoranException e) {
-            throw new RuntimeException(e);
+            throw new JenkinsMonitorRuntimeException(e);
         }
         return this;
     }

src/main/java/com/github/funthomas424242/jenkinsmonitor/config/ConfigurationFluentGrammar.java

@@ -22,8 +22,10 @@
  * #L%
  */
 
+import com.github.funthomas424242.jenkinsmonitor.jenkins.JobAbfragedaten;
 import com.github.funthomas424242.jenkinsmonitor.jenkins.JobBeschreibungen;
 import java.io.File;
+import java.net.URL;
 
 public interface ConfigurationFluentGrammar {
 
@@ -38,9 +40,6 @@ static interface Created {
 
         Loaded reloadFromFile(final File configFile);
 
-        // not public
-        //Loaded loadPropertiesFromFile(final File configFile);
-
         File getConfigurationfile();
 
 
@@ -52,7 +51,10 @@ static interface Loaded extends Created {
 
         long getPollPeriodInSecond();
 
+        Jenkinszugangskonfiguration[] getAllJenkinszugangskonfigurationen();
+        JobAbfragedaten getAbfragedatenOf(final URL jobUrl);
         JobBeschreibungen getJobBeschreibungen();
+
     }
 
 

src/main/java/com/github/funthomas424242/jenkinsmonitor/gui/ImageGenerator.java

@@ -120,10 +120,7 @@ public static Image convertIconToImage(Icon icon) {
         } else {
             int width = icon.getIconWidth();
             int height = icon.getIconHeight();
-            final BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-//            Graphics2D g = (Graphics2D) image.getGraphics();
-//            icon.paintIcon(null, g, 0, 0);
-            return image;
+            return new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
         }
     }