Skip to content

Commit 657afa9

Browse files
rjeberhardrjeberhard
authored
Merge pull request #1129 from oracle/checkstyle-enforcement
Checkstyle enforcement
2 parents a2869d8 + 9238049 commit 657afa9

File tree

381 files changed

+11519
-11425
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

381 files changed

+11519
-11425
lines changed

‎build-tools/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<project>
2-
<modelVersion>4.0.0</modelVersion>
3-
<groupId>oracle.kubernetes</groupId>
4-
<artifactId>build-tools</artifactId>
5-
<version>1.0</version>
6-
<name>Build Tools</name>
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>oracle.kubernetes</groupId>
4+
<artifactId>build-tools</artifactId>
5+
<version>1.0</version>
6+
<name>Build Tools</name>
77
</project>

‎buildtime-reports/pom.xml

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="http://maven.apache.org/POM/4.0.0"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

@@ -19,26 +19,6 @@
1919
<plugin>
2020
<groupId>org.apache.maven.plugins</groupId>
2121
<artifactId>maven-enforcer-plugin</artifactId>
22-
<version>${maven-enforcer-plugin-version}</version>
23-
<executions>
24-
<execution>
25-
<id>enforce-maven</id>
26-
<goals>
27-
<goal>enforce</goal>
28-
</goals>
29-
<configuration>
30-
<rules>
31-
<requireMavenVersion>
32-
<version>${maven.version.range}</version>
33-
</requireMavenVersion>
34-
<requireJavaVersion>
35-
<version>${java.version.range}</version>
36-
</requireJavaVersion>
37-
<requirePluginVersions></requirePluginVersions>
38-
</rules>
39-
</configuration>
40-
</execution>
41-
</executions>
4222
</plugin>
4323
</plugins>
4424
</build>
@@ -48,7 +28,7 @@
4828
<id>reports</id>
4929
<activation>
5030
<property>
51-
<name>!no-reports</name>
31+
<name>!no-reports</name>
5232
</property>
5333
</activation>
5434
<build>

‎docs-source/content/developerguide/building.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ $ mvn clean install
1616

1717
This will compile the source files, build JAR files containing the compiled classes and libraries needed to run the operator, and will also execute all of the unit tests.
1818

19-
Contributions must conform to [coding and formatting standards]({{< relref "/developerguide/coding-standards.md" >}}). To automatically update local code to conform to formatting standards, issue the following command:
20-
21-
```
22-
$ mvn fmt:format
23-
```
19+
Contributions must conform to [coding and formatting standards]({{< relref "/developerguide/coding-standards.md" >}}).
2420

2521
#### Building Javadoc
2622

‎docs/domains/Domain.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,6 @@
145145
"description": "Unique, one-word, CamelCase reason for the condition\u0027s last transition.",
146146
"type": "string"
147147
},
148-
"lastTransitionTime": {
149-
"description": "Last time the condition transitioned from one status to another.",
150-
"$ref": "#/definitions/DateTime"
151-
},
152-
"message": {
153-
"description": "Human-readable message indicating details about last transition.",
154-
"type": "string"
155-
},
156148
"type": {
157149
"description": "The type of the condition. Valid types are Progressing, Available, and Failed. Required",
158150
"type": "string",
@@ -162,6 +154,14 @@
162154
"Failed"
163155
]
164156
},
157+
"lastTransitionTime": {
158+
"description": "Last time the condition transitioned from one status to another.",
159+
"$ref": "#/definitions/DateTime"
160+
},
161+
"message": {
162+
"description": "Human-readable message indicating details about last transition.",
163+
"type": "string"
164+
},
165165
"lastProbeTime": {
166166
"description": "Last time we probed the condition.",
167167
"$ref": "#/definitions/DateTime"
@@ -274,18 +274,18 @@
274274
"description": "If true (the default), the server .out file will be included in the pod\u0027s stdout.",
275275
"type": "boolean"
276276
},
277-
"managedServers": {
278-
"description": "Configuration for the managed servers.",
277+
"clusters": {
278+
"description": "Configuration for the clusters.",
279279
"type": "array",
280280
"items": {
281-
"$ref": "#/definitions/ManagedServer"
281+
"$ref": "#/definitions/Cluster"
282282
}
283283
},
284-
"clusters": {
285-
"description": "Configuration for the clusters.",
284+
"managedServers": {
285+
"description": "Configuration for the managed servers.",
286286
"type": "array",
287287
"items": {
288-
"$ref": "#/definitions/Cluster"
288+
"$ref": "#/definitions/ManagedServer"
289289
}
290290
}
291291
}

‎docs/domains/index.html

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,14 +1065,6 @@
10651065
"description": "Unique, one-word, CamelCase reason for the condition\u0027s last transition.",
10661066
"type": "string"
10671067
},
1068-
"lastTransitionTime": {
1069-
"description": "Last time the condition transitioned from one status to another.",
1070-
"$ref": "#/definitions/DateTime"
1071-
},
1072-
"message": {
1073-
"description": "Human-readable message indicating details about last transition.",
1074-
"type": "string"
1075-
},
10761068
"type": {
10771069
"description": "The type of the condition. Valid types are Progressing, Available, and Failed. Required",
10781070
"type": "string",
@@ -1082,6 +1074,14 @@
10821074
"Failed"
10831075
]
10841076
},
1077+
"lastTransitionTime": {
1078+
"description": "Last time the condition transitioned from one status to another.",
1079+
"$ref": "#/definitions/DateTime"
1080+
},
1081+
"message": {
1082+
"description": "Human-readable message indicating details about last transition.",
1083+
"type": "string"
1084+
},
10851085
"lastProbeTime": {
10861086
"description": "Last time we probed the condition.",
10871087
"$ref": "#/definitions/DateTime"
@@ -1194,18 +1194,18 @@
11941194
"description": "If true (the default), the server .out file will be included in the pod\u0027s stdout.",
11951195
"type": "boolean"
11961196
},
1197-
"managedServers": {
1198-
"description": "Configuration for the managed servers.",
1197+
"clusters": {
1198+
"description": "Configuration for the clusters.",
11991199
"type": "array",
12001200
"items": {
1201-
"$ref": "#/definitions/ManagedServer"
1201+
"$ref": "#/definitions/Cluster"
12021202
}
12031203
},
1204-
"clusters": {
1205-
"description": "Configuration for the clusters.",
1204+
"managedServers": {
1205+
"description": "Configuration for the managed servers.",
12061206
"type": "array",
12071207
"items": {
1208-
"$ref": "#/definitions/Cluster"
1208+
"$ref": "#/definitions/ManagedServer"
12091209
}
12101210
}
12111211
}

‎integration-tests/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,11 @@ When the tests are run with mvn command,
152152
- archive logs and results
153153
- cleanup the tmp files, PV dir and k8s artifacts created for the test
154154

155-
All the tests that start with IT*.java in integration-tests/src/test/java are run.
155+
All the tests that start with It*.java in integration-tests/src/test/java are run.
156156

157157
**Integration test classes:**
158158

159-
When the integration test class ITOperator is executed, staticPrepare() method is called once before any of the test methods in the class and staticUnPrepare() method once at the end.
159+
When the integration test class ItOperator is executed, staticPrepare() method is called once before any of the test methods in the class and staticUnPrepare() method once at the end.
160160

161161
staticPrepare() - initializes the application properties from OperatorIT.properties and creates resultRoot, pvRoot, userprojectsDir directories by calling initialize() method from the base class BaseTest.
162162

@@ -266,7 +266,7 @@ Failed run will have the output like
266266
[INFO] Results:
267267
[INFO]
268268
[ERROR] Errors:
269-
[ERROR] ITOperator.testDomainOnPVUsingWLST:145 ? Runtime FAILURE: Couldn't create serv...
269+
[ERROR] ItOperator.testDomainOnPVUsingWLST:145 ? Runtime FAILURE: Couldn't create serv...
270270
[INFO]
271271
[ERROR] Tests run: 9, Failures: 0, Errors: 1, Skipped: 0
272272
[INFO]
@@ -292,7 +292,7 @@ Failed run will have the output like
292292
[INFO] Finished at: 2019-02-11T09:42:08-08:00
293293
[INFO] Final Memory: 124M/1534M
294294
```
295-
JUnit test results can be seen at "integration-tests/target/failsafe-reports/TEST-oracle.kubernetes.operator.ITOperator.xml". This file shows how much time each test case took to run and the failed test results if any.
295+
JUnit test results can be seen at "integration-tests/target/failsafe-reports/TEST-oracle.kubernetes.operator.ItOperator.xml". This file shows how much time each test case took to run and the failed test results if any.
296296

297297
# How to run JRF domain In Operator related tests
298298
* Setup docker access to FMW Infrastructure 12c Image and Oracle Database 12c Image
@@ -318,11 +318,11 @@ mvn clean verify -P jrf-integration-tests 2>&1 | tee log.txt
318318
319319
# How to run a single test
320320
321-
mvn -Dit.test="ITOperator#testDomainOnPVUsingWLST" -DfailIfNoTests=false integration-test -P java-integration-tests
321+
mvn -Dit.test="ItOperator#testDomainOnPVUsingWLST" -DfailIfNoTests=false integration-test -P java-integration-tests
322322
323323
# How to run multiple tests
324324
325-
mvn -Dit.test="ITOperator#testDomainOnPVUsingWLST+testDomainOnPVUsingWDT" -DfailIfNoTests=false integration-test -P java-integration-tests
325+
mvn -Dit.test="ItOperator#testDomainOnPVUsingWLST+testDomainOnPVUsingWDT" -DfailIfNoTests=false integration-test -P java-integration-tests
326326
327327
# How to run cleanup script
328328
@@ -343,9 +343,9 @@ $PV_ROOT/acceptance_test_pv is archived under $PV_ROOT/acceptance_test_pv_archiv
343343
344344
Add a new JUnit test under integration-tests/src/test/java/oracle/kubernetes/operator.
345345
346-
class name must start with IT(Integration Test), IT*.java
346+
class name must start with It(Integration Test), It*.java
347347
348-
ITOperator.java - take a look at this test for reference
348+
ItOperator.java - take a look at this test for reference
349349
350350
# Future enhancement
351351

0 commit comments

Comments
 (0)