Skip to content

Commit

Permalink
Extract class refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@Meghna-15
Meghna-15 committed Mar 26, 2022
1 parent b1378ec commit 5982c2d
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 34 deletions.
48 changes: 27 additions & 21 deletions src/pom.xml
View file
Expand Up @@ -111,6 +111,12 @@
<version>1.10.19</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.28</version>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -169,7 +175,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<argLine>${argLine}</argLine>

<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
Expand Down Expand Up @@ -247,7 +253,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.3</version>
<version>4.0.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -258,28 +264,28 @@
</executions>
</plugin>

<plugin>
<!-- Warning: there is another block maven-javadoc-plugin above -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<doclint>none</doclint>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- <plugin>-->
<!-- &lt;!&ndash; Warning: there is another block maven-javadoc-plugin above &ndash;&gt;-->
<!--&lt;!&ndash; <groupId>org.apache.maven.plugins</groupId>&ndash;&gt;-->
<!--&lt;!&ndash; <artifactId>maven-javadoc-plugin</artifactId>&ndash;&gt;-->
<!--&lt;!&ndash; <version>3.1.1</version>&ndash;&gt;-->
<!-- <configuration>-->
<!-- <doclint>none</doclint>-->
<!-- </configuration>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>attach-javadocs</id>-->
<!-- <goals>-->
<!-- <goal>jar</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<version>3.0.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
5 changes: 5 additions & 0 deletions src/repairnator-core/pom.xml
View file
Expand Up @@ -30,5 +30,10 @@
<artifactId>docker-client</artifactId>
<version>8.11.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.28</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions ...epairnator-jenkins-plugin/src/main/java/io/jenkins/plugins/main/RepairnatorPostBuild.java
View file
Expand Up @@ -359,8 +359,8 @@ public void runRepairnator(EnvVars env) throws IOException,InterruptedException{
.withMavenHome(config.getMavenHome())
.atWorkSpace(config.getWorkspaceDir().getAbsolutePath())
.withOutputDir(config.getWorkspaceDir().getAbsolutePath());

ProcessBuilder builder = repProcBuilder.build().directory(config.getWorkspaceDir());
ProcessNew p = new ProcessNew();
ProcessBuilder builder = p.build().directory(config.getWorkspaceDir());
builder.redirectErrorStream(true);
builder.inheritIO().redirectOutput(ProcessBuilder.Redirect.PIPE);
Process process = builder.start();
Expand Down
46 changes: 35 additions & 11 deletions ...nator-jenkins-plugin/src/main/java/io/jenkins/plugins/main/RepairnatorProcessBuilder.java
View file
Expand Up @@ -9,7 +9,7 @@

/* Build subprocess to run repairnator Jar */
public class RepairnatorProcessBuilder {
private final ArrayList<String> cmdList = new ArrayList<String>();
final ArrayList<String> cmdList = new ArrayList<String>();
private static RepairnatorProcessBuilder repairnatorProcessBuilder;
private String javaExec;
private String jarLocation;
Expand All @@ -30,7 +30,8 @@ public class RepairnatorProcessBuilder {
private boolean useSmtpTLS;
private boolean noTravisRepair;

public RepairnatorProcessBuilder(){}
public RepairnatorProcessBuilder() {
}

public RepairnatorProcessBuilder useJavaExec(String javaExec) {
this.javaExec = javaExec;
Expand Down Expand Up @@ -123,7 +124,30 @@ public RepairnatorProcessBuilder withSonarRules(String sonarRules) {
return this;
}

}
// Extract class
class ProcessNew {
private static RepairnatorProcessBuilder repairnatorProcessBuilder;
private String javaExec;
private String gitOAuth;
private String jarLocation;
private String gitUrl;
private String gitBranch;

private final ArrayList<String> cmdList = new ArrayList<String>();
private String smtpUsername;
private String smtpPassword;
private String smtpServer;
private String smtpPort;
private String notifyTo;
private String workspace;
private String mavenHome;
private String outputDir;
private String sonarRules;
private boolean createPR;
private boolean useSmtpTLS;
private boolean noTravisRepair;
private String[] repairTools;
public void checkValid() {
if (this.javaExec == null || this.javaExec.equals("")) {
throw new IllegalArgumentException("Repairnator Process building failed: java executable location is null");
Expand All @@ -145,8 +169,8 @@ public void checkValid() {
throw new IllegalArgumentException("Repairnator Process building failed: no repair tools specified");
}
}
public ProcessBuilder build() {

public ProcessBuilder build() {
this.checkValid();

cmdList.add(this.javaExec);
Expand All @@ -171,9 +195,9 @@ public ProcessBuilder build() {
cmdList.add("--gitrepobranch");
cmdList.add(this.gitBranch);
}

cmdList.add("--repairTools");
cmdList.add(String.join(",",this.repairTools));
cmdList.add(String.join(",", this.repairTools));


if (!sonarRules.equals("") || sonarRules != null) {
Expand All @@ -183,8 +207,8 @@ public ProcessBuilder build() {

if (this.notifyTo != null && !this.notifyTo.equals("")) {
if (this.smtpUsername != null && !this.smtpUsername.equals("")) {
cmdList.add("--smtpUsername");
cmdList.add(this.smtpUsername);
cmdList.add("--smtpUsername");
cmdList.add(this.smtpUsername);
}

if (this.smtpPassword != null && !this.smtpPassword.equals("")) {
Expand All @@ -203,18 +227,18 @@ public ProcessBuilder build() {
}

cmdList.add("--notifyto");
cmdList.add(String.join(",",this.notifyTo));
cmdList.add(String.join(",", this.notifyTo));
}

if (this.useSmtpTLS) {
cmdList.add("--smtpTLS");
}
if(!(this.gitOAuth.equals("") || this.gitOAuth == null)) {

if (!(this.gitOAuth.equals("") || this.gitOAuth == null)) {
cmdList.add("--ghOauth");
cmdList.add(this.gitOAuth);
cmdList.add("--createPR");
}
return new ProcessBuilder(this.cmdList).inheritIO();
}
}
}

0 comments on commit 5982c2d

Please sign in to comment.