Skip to content

Commit

Permalink
[#25] Refactoring: Zugangsdatensammler erstellt
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Schubert committed Oct 13, 2019
1 parent e658c6a commit 62a50bf
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,16 @@ public long getPollPeriodInSecond() {
return Long.parseLong(propValue);
}

// public String getAllAbfragedaten() {
// loadPropertiesFromFile(configurationFile);
// configurationProperties
// .stringPropertyNames()
// .stream()
// .filter( (key)->key.startsWith("jenkinsauth"))
// .forEach(key -> {
// });
// return null;
// }
public String getAllAbfragedaten() {
loadPropertiesFromFile(configurationFile);
configurationProperties
.stringPropertyNames()
.stream()
.filter( (key)->key.startsWith("jenkinsauth"))
.forEach(key -> {
});
return null;
}

protected JenkinsZugangsdaten getAbfragedatenOf(final URL jobUrl){
return new JenkinsZugangsdaten(jobUrl,"admin","geheim");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
package com.github.funthomas424242.jenkinsmonitor.config;

import com.github.funthomas424242.jenkinsmonitor.jenkins.JenkinsZugangsdaten;

import java.net.URL;
import java.util.Arrays;
import java.util.HashMap;


public class Zugangsdatensammler {

protected class Zugang {
public URL jenkinsJobURL;
public String userName;
public String password;
}


protected final HashMap<String, Zugang> zugaenge;

public Zugangsdatensammler() {
zugaenge = new HashMap<>();
}

public void addZugangsdatumJenkinsJobUrl(String jenkinsId, URL jenkinsJobUrl) {
checkAllParameterUntilFirstNotNull(jenkinsId, jenkinsJobUrl);
final Zugang zugang = getOrCreateZugang(jenkinsId);
zugang.jenkinsJobURL = jenkinsJobUrl;
}

public void addZugangsdatumJenkinsUserName(String jenkinsId, String userName) {
checkAllParameterUntilFirstNotNull(jenkinsId, userName);
final Zugang zugang = getOrCreateZugang(jenkinsId);
zugang.userName = userName;
}


public void addZugangsdatumJenkinsPassword(String jenkinsId, String password) {
checkAllParameterUntilFirstNotNull(jenkinsId, password);
final Zugang zugang = getOrCreateZugang(jenkinsId);
zugang.userName = password;
}

public JenkinsZugangsdaten[] getJenkinsZugangsdaten() {
return zugaenge
.values()
.stream()
.map((zugang) -> {
return new JenkinsZugangsdaten(zugang.jenkinsJobURL, zugang.userName, zugang.password);
})
.toArray(JenkinsZugangsdaten[]::new);
}

protected void checkAllParameterUntilFirstNotNull(Object... parameter) {
Arrays.stream(parameter)
.filter((part) -> {
if (part == null) {
throw new IllegalArgumentException("jenkinsID und zugangstyp sind erforderlich");
} else {
return false;
}
});
}

protected Zugang getOrCreateZugang(String jenkinsId) {
final Zugang zugang;
if (zugaenge.containsKey(jenkinsId)) {
zugang = zugaenge.get(jenkinsId);
} else {
zugang = new Zugang();
zugaenge.put(jenkinsId, zugang);
}
return zugang;
}



}

0 comments on commit 62a50bf

Please sign in to comment.