Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 0b01230

Browse files
committedDec 6, 2024·
RANGER-5020: Fix duplicate ranger-pmd-ruleset and use central ruleset in dev-support
1 parent 5c8d4d0 commit 0b01230

File tree

8 files changed

+75
-127
lines changed

8 files changed

+75
-127
lines changed
 

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@
543543
<version>${maven.pmd.plugin.version}</version>
544544
<configuration>
545545
<rulesets>
546-
<ruleset>${project.parent.basedir}/dev-support/ranger-pmd-ruleset.xml</ruleset>
546+
<ruleset>dev-support/ranger-pmd-ruleset.xml</ruleset>
547547
</rulesets>
548548
<sourceEncoding>UTF-8</sourceEncoding>
549549
<failOnViolation>true</failOnViolation>

‎ranger-examples/conditions-enrichers/pom.xml

+14
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,18 @@
4545
<scope>test</scope>
4646
</dependency>
4747
</dependencies>
48+
<build>
49+
<plugins>
50+
<plugin>
51+
<groupId>org.apache.maven.plugins</groupId>
52+
<artifactId>maven-pmd-plugin</artifactId>
53+
<configuration>
54+
<rulesets>
55+
<ruleset>${project.parent.parent.basedir}/dev-support/ranger-pmd-ruleset.xml</ruleset>
56+
</rulesets>
57+
<failOnViolation>true</failOnViolation>
58+
</configuration>
59+
</plugin>
60+
</plugins>
61+
</build>
4862
</project>

‎ranger-examples/dev-support/ranger-pmd-ruleset.xml

-121
This file was deleted.

‎ranger-examples/distro/pom.xml

+14
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,20 @@
5151
<version>${project.version}</version>
5252
</dependency>
5353
</dependencies>
54+
<build>
55+
<plugins>
56+
<plugin>
57+
<groupId>org.apache.maven.plugins</groupId>
58+
<artifactId>maven-pmd-plugin</artifactId>
59+
<configuration>
60+
<rulesets>
61+
<ruleset>${project.parent.parent.basedir}/dev-support/ranger-pmd-ruleset.xml</ruleset>
62+
</rulesets>
63+
<failOnViolation>true</failOnViolation>
64+
</configuration>
65+
</plugin>
66+
</plugins>
67+
</build>
5468

5569
<profiles>
5670
<profile>

‎ranger-examples/plugin-sampleapp/pom.xml

+14
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,18 @@
134134
<scope>test</scope>
135135
</dependency>
136136
</dependencies>
137+
<build>
138+
<plugins>
139+
<plugin>
140+
<groupId>org.apache.maven.plugins</groupId>
141+
<artifactId>maven-pmd-plugin</artifactId>
142+
<configuration>
143+
<rulesets>
144+
<ruleset>${project.parent.parent.basedir}/dev-support/ranger-pmd-ruleset.xml</ruleset>
145+
</rulesets>
146+
<failOnViolation>true</failOnViolation>
147+
</configuration>
148+
</plugin>
149+
</plugins>
150+
</build>
137151
</project>

‎ranger-examples/sample-client/pom.xml

+14
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,18 @@
5555
<version>${slf4j.version}</version>
5656
</dependency>
5757
</dependencies>
58+
<build>
59+
<plugins>
60+
<plugin>
61+
<groupId>org.apache.maven.plugins</groupId>
62+
<artifactId>maven-pmd-plugin</artifactId>
63+
<configuration>
64+
<rulesets>
65+
<ruleset>${project.parent.parent.basedir}/dev-support/ranger-pmd-ruleset.xml</ruleset>
66+
</rulesets>
67+
<failOnViolation>true</failOnViolation>
68+
</configuration>
69+
</plugin>
70+
</plugins>
71+
</build>
5872
</project>

‎ranger-examples/sampleapp/pom.xml

+14
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,18 @@
3838
<version>${slf4j.version}</version>
3939
</dependency>
4040
</dependencies>
41+
<build>
42+
<plugins>
43+
<plugin>
44+
<groupId>org.apache.maven.plugins</groupId>
45+
<artifactId>maven-pmd-plugin</artifactId>
46+
<configuration>
47+
<rulesets>
48+
<ruleset>${project.parent.parent.basedir}/dev-support/ranger-pmd-ruleset.xml</ruleset>
49+
</rulesets>
50+
<failOnViolation>true</failOnViolation>
51+
</configuration>
52+
</plugin>
53+
</plugins>
54+
</build>
4155
</project>

‎ranger-examples/sampleapp/src/main/java/org/apache/ranger/examples/sampleapp/SampleApp.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
package org.apache.ranger.examples.sampleapp;
2121

22+
import java.util.Arrays;
2223
import java.util.HashSet;
2324
import java.util.Scanner;
2425
import java.util.Set;
@@ -52,7 +53,7 @@ public void init() {
5253
public void run() {
5354
LOG.debug("==> SampleApp.run()");
5455

55-
do {
56+
while(true) {
5657
String input = getInput();
5758

5859
if(input == null) {
@@ -69,9 +70,7 @@ public void run() {
6970
String userName = getStringArg(args, 2);
7071
Set<String> userGroups = new HashSet<String>();
7172

72-
for(int i = 3; i < args.length; i++) {
73-
userGroups.add(args[i]);
74-
}
73+
userGroups.addAll(Arrays.asList(args).subList(3, args.length));
7574

7675
if(fileName == null || accessType == null || userName == null) {
7776
LOG.info("Insufficient arguments. Usage: <accessType> <fileName> <userName> [userGroup1 userGroup2 userGroup3 ..]");
@@ -90,7 +89,7 @@ public void run() {
9089
} else {
9190
LOG.info("Not authorized!");
9291
}
93-
} while(true);
92+
}
9493

9594
LOG.debug("<== SampleApp.run()");
9695
}

0 commit comments

Comments
 (0)
Please sign in to comment.