Skip to content
This repository was archived by the owner on Apr 10, 2024. It is now read-only.

Commit ca1f37b

Browse files
csviricsviri
authored
feat: maven formatters and formatted source code (#16)
1 parent a413475 commit ca1f37b

27 files changed

+1258
-829
lines changed

‎contributing/eclipse-google-style.xml

+337
Large diffs are not rendered by default.

‎contributing/eclipse.importorder

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
0=java
2+
1=javax
3+
2=org
4+
3=io
5+
4=com
6+
5=
7+
6=\#

‎pom.xml

+73
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
<maven.compiler.source>11</maven.compiler.source>
3030
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
3131
<maven-surefire-plugin.version>3.0.0-M9</maven-surefire-plugin.version>
32+
<impsort-maven-plugin.version>1.8.0</impsort-maven-plugin.version>
33+
<formatter-maven-plugin.version>2.22.0</formatter-maven-plugin.version>
34+
<directory-maven-plugin.version>1.0</directory-maven-plugin.version>
3235
</properties>
3336

3437
<dependencyManagement>
@@ -116,13 +119,83 @@
116119
</dependency>
117120
</dependencies>
118121

122+
123+
119124
<build>
125+
<pluginManagement>
126+
<plugins>
127+
<plugin>
128+
<groupId>net.revelc.code.formatter</groupId>
129+
<artifactId>formatter-maven-plugin</artifactId>
130+
<version>${formatter-maven-plugin.version}</version>
131+
<configuration>
132+
<cachedir>.cache</cachedir>
133+
</configuration>
134+
</plugin>
135+
<plugin>
136+
<groupId>net.revelc.code</groupId>
137+
<artifactId>impsort-maven-plugin</artifactId>
138+
<version>${impsort-maven-plugin.version}</version>
139+
<configuration>
140+
<cachedir>.cache</cachedir>
141+
<groups>java.,javax.,org.,io.,com.</groups>
142+
<staticGroups>*</staticGroups>
143+
<staticAfter>true</staticAfter>
144+
<removeUnused>true</removeUnused>
145+
</configuration>
146+
</plugin>
147+
</plugins>
148+
</pluginManagement>
120149
<plugins>
150+
<plugin>
151+
<groupId>org.commonjava.maven.plugins</groupId>
152+
<artifactId>directory-maven-plugin</artifactId>
153+
<version>${directory-maven-plugin.version}</version>
154+
<executions>
155+
<execution>
156+
<id>directories</id>
157+
<goals>
158+
<goal>highest-basedir</goal>
159+
</goals>
160+
<phase>initialize</phase>
161+
<configuration>
162+
<property>jenvtest.project.root</property>
163+
</configuration>
164+
</execution>
165+
</executions>
166+
</plugin>
121167
<plugin>
122168
<groupId>org.apache.maven.plugins</groupId>
123169
<artifactId>maven-surefire-plugin</artifactId>
124170
<version>${maven-surefire-plugin.version}</version>
125171
</plugin>
172+
<plugin>
173+
<groupId>net.revelc.code.formatter</groupId>
174+
<artifactId>formatter-maven-plugin</artifactId>
175+
<executions>
176+
<execution>
177+
<goals>
178+
<goal>format</goal>
179+
</goals>
180+
<configuration>
181+
<!--suppress UnresolvedMavenProperty -->
182+
<configFile>${jenvtest.project.root}/contributing/eclipse-google-style.xml</configFile>
183+
</configuration>
184+
</execution>
185+
</executions>
186+
</plugin>
187+
<plugin>
188+
<groupId>net.revelc.code</groupId>
189+
<artifactId>impsort-maven-plugin</artifactId>
190+
<executions>
191+
<execution>
192+
<id>sort</id>
193+
<goals>
194+
<goal>sort</goal>
195+
</goals>
196+
</execution>
197+
</executions>
198+
</plugin>
126199
</plugins>
127200
</build>
128201
</project>

‎src/main/java/com/csviri/jenvtest/APIServer.java

+53-51
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,61 @@
11
package com.csviri.jenvtest;
22

3-
import com.csviri.jenvtest.binary.BinaryManager;
4-
import com.csviri.jenvtest.process.*;
53
import org.slf4j.Logger;
64
import org.slf4j.LoggerFactory;
75

6+
import com.csviri.jenvtest.binary.BinaryManager;
7+
import com.csviri.jenvtest.process.*;
8+
89
public class APIServer implements UnexpectedProcessStopHandler {
910

10-
private static final Logger log = LoggerFactory.getLogger(APIServer.class);
11-
12-
public static final int STARTUP_TIMEOUT = 10_000;
13-
14-
private final APIServerConfig config;
15-
private final BinaryManager binaryManager;
16-
private final CertManager certManager;
17-
private final KubeConfigManager kubeConfigManager;
18-
private final EtcdProcessManager etcdProcessManager;
19-
private final APIServerProcessManager apiServerProcessManager;
20-
21-
public APIServer() {
22-
this(APIServerConfigBuilder.anAPIServerConfig().build());
23-
}
24-
25-
public APIServer(APIServerConfig config) {
26-
this.config = config;
27-
this.binaryManager = new BinaryManager(config);
28-
this.certManager = new CertManager(config.getJenvtestDir());
29-
this.kubeConfigManager = new KubeConfigManager(certManager, binaryManager);
30-
this.etcdProcessManager = new EtcdProcessManager(binaryManager, this);
31-
this.apiServerProcessManager = new APIServerProcessManager(certManager, binaryManager, this, config);
32-
}
33-
34-
public void start() {
35-
log.debug("Stating API Server. Using jenvtest dir: {}", config.getJenvtestDir());
36-
binaryManager.initAndDownloadIfRequired();
37-
certManager.createCertificatesIfNeeded();
38-
etcdProcessManager.cleanEtcdData();
39-
etcdProcessManager.startEtcd();
40-
apiServerProcessManager.startApiServer();
41-
kubeConfigManager.updateKubeConfig();
42-
apiServerProcessManager.waitUntilDefaultNamespaceCreated();
43-
log.debug("API Server ready to use");
44-
}
45-
46-
public void stop() {
47-
log.debug("Stopping");
48-
apiServerProcessManager.stopApiServer();
49-
etcdProcessManager.stopEtcd();
50-
kubeConfigManager.cleanupFromKubeConfig();
51-
etcdProcessManager.cleanEtcdData();
52-
log.debug("Stopped");
53-
}
54-
55-
@Override
56-
public void processStopped(Process process) {
57-
stop();
58-
}
11+
private static final Logger log = LoggerFactory.getLogger(APIServer.class);
12+
13+
public static final int STARTUP_TIMEOUT = 10_000;
14+
15+
private final APIServerConfig config;
16+
private final BinaryManager binaryManager;
17+
private final CertManager certManager;
18+
private final KubeConfigManager kubeConfigManager;
19+
private final EtcdProcessManager etcdProcessManager;
20+
private final APIServerProcessManager apiServerProcessManager;
21+
22+
public APIServer() {
23+
this(APIServerConfigBuilder.anAPIServerConfig().build());
24+
}
25+
26+
public APIServer(APIServerConfig config) {
27+
this.config = config;
28+
this.binaryManager = new BinaryManager(config);
29+
this.certManager = new CertManager(config.getJenvtestDir());
30+
this.kubeConfigManager = new KubeConfigManager(certManager, binaryManager);
31+
this.etcdProcessManager = new EtcdProcessManager(binaryManager, this);
32+
this.apiServerProcessManager =
33+
new APIServerProcessManager(certManager, binaryManager, this, config);
34+
}
35+
36+
public void start() {
37+
log.debug("Stating API Server. Using jenvtest dir: {}", config.getJenvtestDir());
38+
binaryManager.initAndDownloadIfRequired();
39+
certManager.createCertificatesIfNeeded();
40+
etcdProcessManager.cleanEtcdData();
41+
etcdProcessManager.startEtcd();
42+
apiServerProcessManager.startApiServer();
43+
kubeConfigManager.updateKubeConfig();
44+
apiServerProcessManager.waitUntilDefaultNamespaceCreated();
45+
log.debug("API Server ready to use");
46+
}
47+
48+
public void stop() {
49+
log.debug("Stopping");
50+
apiServerProcessManager.stopApiServer();
51+
etcdProcessManager.stopEtcd();
52+
kubeConfigManager.cleanupFromKubeConfig();
53+
etcdProcessManager.cleanEtcdData();
54+
log.debug("Stopped");
55+
}
56+
57+
@Override
58+
public void processStopped(Process process) {
59+
stop();
60+
}
5961
}

‎src/main/java/com/csviri/jenvtest/APIServerConfig.java

+33-34
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,37 @@
44

55
public class APIServerConfig {
66

7-
/**
8-
* Set directory where binaries and other assets are present. Default is ~/.jenvtest.
9-
**/
10-
private final String jenvtestDir;
11-
12-
/**
13-
* If not set the latest binary will be selected automatically
14-
* Sample: 1.26.1, 1.25.0.
15-
*/
16-
private final String apiServerVersion;
17-
18-
/**
19-
* If true, tries to download binaries. If the apiServerVersion is not set and some local binaries found
20-
* won't try to download them again.
21-
* */
22-
private final boolean downloadBinaries;
23-
24-
APIServerConfig(String jenvtestDir, String apiServerVersion, boolean downloadBinaries) {
25-
this.jenvtestDir = jenvtestDir;
26-
this.apiServerVersion = apiServerVersion;
27-
this.downloadBinaries = downloadBinaries;
28-
}
29-
30-
public String getJenvtestDir() {
31-
return jenvtestDir;
32-
}
33-
34-
public Optional<String> getApiServerVersion() {
35-
return Optional.ofNullable(apiServerVersion);
36-
}
37-
38-
public boolean isDownloadBinaries() {
39-
return downloadBinaries;
40-
}
7+
/**
8+
* Set directory where binaries and other assets are present. Default is ~/.jenvtest.
9+
**/
10+
private final String jenvtestDir;
11+
12+
/**
13+
* If not set the latest binary will be selected automatically Sample: 1.26.1, 1.25.0.
14+
*/
15+
private final String apiServerVersion;
16+
17+
/**
18+
* If true, tries to download binaries. If the apiServerVersion is not set and some local binaries
19+
* found won't try to download them again.
20+
*/
21+
private final boolean downloadBinaries;
22+
23+
APIServerConfig(String jenvtestDir, String apiServerVersion, boolean downloadBinaries) {
24+
this.jenvtestDir = jenvtestDir;
25+
this.apiServerVersion = apiServerVersion;
26+
this.downloadBinaries = downloadBinaries;
27+
}
28+
29+
public String getJenvtestDir() {
30+
return jenvtestDir;
31+
}
32+
33+
public Optional<String> getApiServerVersion() {
34+
return Optional.ofNullable(apiServerVersion);
35+
}
36+
37+
public boolean isDownloadBinaries() {
38+
return downloadBinaries;
39+
}
4140
}

0 commit comments

Comments
 (0)