Skip to content

Commit

Permalink
[#60feature/#60-restlib] sonar issues fixed
Browse files Browse the repository at this point in the history 
Signed-off-by: huluvu424242 <huluvu424242@gmail.com>
  • Loading branch information
@Huluvu424242
Huluvu424242 committed Jan 25, 2023
1 parent f696ab0 commit bf5ceda
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 24 deletions.
3 changes: 3 additions & 0 deletions src/main/java/com/github/funthomas424242/jenkinsmonitor/etc/NetworkHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ public class NetworkHelper {

protected static final Logger LOG = LoggerFactory.getLogger(NetworkHelper.class);

private NetworkHelper() {
}

public static URL urlOf(final String urlPath) {
try {
return new URL(urlPath);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/funthomas424242/jenkinsmonitor/gui/Statusfenster.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
public class Statusfenster extends JDialog {
public static final Logger LOGGER = LoggerFactory.getLogger(Statusfenster.class);

protected transient final JobStatusBeschreibungen jobStatusBeschreibungen;
protected final transient JobStatusBeschreibungen jobStatusBeschreibungen;

public Statusfenster(final JobStatusBeschreibungen jobStatusBeschreibungen) {
this.jobStatusBeschreibungen = jobStatusBeschreibungen;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/funthomas424242/jenkinsmonitor/gui/Versionsinfofenster.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ protected JPanel createGoldsteinPanel() {
return panel;
}

static protected Image getLogoImage() {
protected static Image getLogoImage() {
return ImageGenerator.getMinervaLogo().getImage();
// return ImageGenerator.convertIconToImage(UIManager.getIcon("FileChooser.detailsViewIcon"));
}
Expand Down
32 changes: 16 additions & 16 deletions src/test/java/com/github/funthomas424242/jenkinsmonitor/gui/JenkinsMonitorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
import static org.junit.jupiter.api.Assumptions.assumeTrue;

@Tag("headfull")
public class JenkinsMonitorTest {
class JenkinsMonitorTest {

protected WireMockServer wireMockServer;

Expand All @@ -71,7 +71,7 @@ public void tearDown() {

@Test
@DisplayName("JenkinsMonitor ist Hauptklasse und enthält eine main Methode.")
protected void checkMainMethod() {
void checkMainMethod() {
final String[] dummyArgs = {"Hallo", "Du da"};
assertDoesNotThrow(() -> {
JenkinsMonitor.main(dummyArgs);
Expand All @@ -81,7 +81,7 @@ protected void checkMainMethod() {

@Test
@DisplayName("JenkinsMonitor ist Hauptklasse und enthält eine main Methode die auch ohne Argumente aufgerufen werden kann.")
protected void checkMainEmptyParaMethod() {
void checkMainEmptyParaMethod() {
assertDoesNotThrow(() -> {
JenkinsMonitor.main(null);
});
Expand All @@ -91,42 +91,42 @@ protected void checkMainEmptyParaMethod() {

@Test
@DisplayName("JenkinsMonitor besitzt eine Tray Instanz nach seiner Erzeugung")
protected void checkTrayInstanz() {
void checkTrayInstanz() {

final JenkinsMonitor monitor = new JenkinsMonitor( ConfigurationMockNoExisting.getOrCreateInstance().reload());
final JenkinsMonitor monitor = new JenkinsMonitor(ConfigurationMockNoExisting.getOrCreateInstance().reload());
assumeTrue(monitor != null);
assertNotNull(monitor.getMonitorTray());
}

@Test
@DisplayName("Initiale Konfiguration enthält keine JobBeschribungen")
protected void initialConfigWithEmptyJobs() {
final JenkinsMonitor jenkinsMonitor = new JenkinsMonitor( ConfigurationMockNoExisting.getOrCreateInstance().reload());
void initialConfigWithEmptyJobs() {
final JenkinsMonitor jenkinsMonitor = new JenkinsMonitor(ConfigurationMockNoExisting.getOrCreateInstance().reload());
assumeTrue(jenkinsMonitor.getMonitorTray() != null);
assumeTrue(jenkinsMonitor.getMonitorTray().configuration != null);
assertEquals(0, jenkinsMonitor.getMonitorTray().configuration.getJobBeschreibungen().size());
}

@Test
@DisplayName("Tray Konfiguration ist identisch zur der dem JenkinsMonitor übergebenen")
protected void equalsConfigWithTrayAndMonitor() {
final Loaded config = ConfigurationMockValidTwoJobs.getOrCreateInstance().reload();
void equalsConfigWithTrayAndMonitor() {
final Loaded config = ConfigurationMockValidTwoJobs.getOrCreateInstance().reload();
final JenkinsMonitor jenkinsMonitor = new JenkinsMonitor(config);
assertSame(config, jenkinsMonitor.getMonitorTray().configuration);
}

@Test
@DisplayName("Nach Erzeugung besitzt der JenkinsMonitor ein Tray Icon")
protected void afterInitTrayIconExists() {
final Loaded config = ConfigurationMockValidTwoJobs.getOrCreateInstance().reload();
void afterInitTrayIconExists() {
final Loaded config = ConfigurationMockValidTwoJobs.getOrCreateInstance().reload();
final JenkinsMonitor jenkinsMonitor = new JenkinsMonitor(config);
assertNotNull(jenkinsMonitor.getMonitorTray().jobStatusDarstellungen.trayWrapper.getTrayIcon());
}

@Test
@DisplayName("Eine leere Konfiguration erzeugt ein graues TrayIcon")
protected void trayIconHasGrayImage() {
final Loaded config = ConfigurationMockEmpty.getOrCreateInstance().reload();
void trayIconHasGrayImage() {
final Loaded config = ConfigurationMockEmpty.getOrCreateInstance().reload();
final JenkinsMonitor jenkinsMonitor = new JenkinsMonitor(config);
final TrayIcon icon = jenkinsMonitor.getMonitorTray().jobStatusDarstellungen.trayWrapper.getTrayIcon();
final BufferedImage image = (BufferedImage) icon.getImage();
Expand All @@ -136,7 +136,7 @@ protected void trayIconHasGrayImage() {

@Test
@DisplayName("Eine Konfiguration mit einem erfolgreichen Job erzeugt ein grünes TrayIcon")
protected void trayIconHasGreenImage() {
void trayIconHasGreenImage() {
final Created config = ConfigurationMockOneJobSuccess.getOrCreateInstance();
final JenkinsMonitor jenkinsMonitor = new JenkinsMonitor(config.reload());
final TrayIcon icon = jenkinsMonitor.getMonitorTray().jobStatusDarstellungen.trayWrapper.getTrayIcon();
Expand All @@ -148,8 +148,8 @@ protected void trayIconHasGreenImage() {

@Test
@DisplayName("Eine Konfiguration mit einem erfolgreichen Job erzeugt ein rotes TrayIcon")
protected void trayIconHasRedImage() {
final Created config = ConfigurationMockOneJobFailed.getOrCreateInstance();
void trayIconHasRedImage() {
final Created config = ConfigurationMockOneJobFailed.getOrCreateInstance();
final JenkinsMonitor jenkinsMonitor = new JenkinsMonitor(config.reload());
final TrayIcon icon = jenkinsMonitor.getMonitorTray().jobStatusDarstellungen.trayWrapper.getTrayIcon();
assertNotNull(icon);
Expand Down
12 changes: 6 additions & 6 deletions .../java/com/github/funthomas424242/jenkinsmonitor/jenkins/JenkinsAPICompatibillityTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;

@Tag("compatibillity")
public class JenkinsAPICompatibillityTest {
class JenkinsAPICompatibillityTest {


protected static URL STATUS_URL_MULTIBRANCH_JOB1_RED;
Expand Down Expand Up @@ -72,7 +72,7 @@ public void tearDown() {

@Test
@DisplayName("Jenkins API Compatibillity: Statusabfrage roter Multibranch Job")
public void statusMultibranchJobRot() {
void statusMultibranchJobRot() {
assertDoesNotThrow(() -> {
when().
get(STATUS_URL_MULTIBRANCH_JOB1_RED).
Expand All @@ -85,7 +85,7 @@ public void statusMultibranchJobRot() {

@Test
@DisplayName("Jenkins API Compatibillity: Statusabfrage grüner Multibranch Job")
public void statusMultibranchJobGruen() {
void statusMultibranchJobGruen() {
assertDoesNotThrow(() -> {
when().
get(STATUS_URL_MULTIBRANCH_JOB1_GREEN).
Expand All @@ -98,7 +98,7 @@ public void statusMultibranchJobGruen() {

@Test
@DisplayName("Jenkins API Compatibillity: Statusabfrage gelber Multibranch Job")
public void statusMultibranchJobGelb() {
void statusMultibranchJobGelb() {
assertDoesNotThrow(() -> {
when().
get(STATUS_URL_MULTIBRANCH_JOB1_YELLOW).
Expand All @@ -112,7 +112,7 @@ public void statusMultibranchJobGelb() {

@Test
@DisplayName("Jenkins API Compatibillity: Statusabfrage im Build befindlicher Multibranch Job")
public void statusMultibranchJobGrauBuildend() {
void statusMultibranchJobGrauBuildend() {
assertDoesNotThrow(() -> {
when().
get(STATUS_URL_MULTIBRANCH_JOB1_GRAY_BUILDING).
Expand All @@ -124,7 +124,7 @@ public void statusMultibranchJobGrauBuildend() {

@Test
@DisplayName("Jenkins API Compatibillity: Statusabfrage unbekannter Multibranch Job")
public void statusMultibranchJobGrauUnbekannt() {
void statusMultibranchJobGrauUnbekannt() {
assertDoesNotThrow(() -> {
when().
get(STATUS_URL_MULTIBRANCH_JOB1_GRAY_UNKNOW).
Expand Down

0 comments on commit bf5ceda

Please sign in to comment.