From 95dfffe3eaeedbd8573f2955fca6ecbcac18cd7b Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 5 Dec 2024 19:57:29 -0800 Subject: [PATCH] RANGER-5020: Fix duplicate ranger-pmd-ruleset and use central ruleset in dev-support --- ranger-examples/conditions-enrichers/pom.xml | 14 ++ .../dev-support/ranger-pmd-ruleset.xml | 121 ------------------ ranger-examples/distro/pom.xml | 14 ++ ranger-examples/plugin-sampleapp/pom.xml | 14 ++ ranger-examples/sample-client/pom.xml | 14 ++ ranger-examples/sampleapp/pom.xml | 14 ++ .../ranger/examples/sampleapp/SampleApp.java | 9 +- 7 files changed, 74 insertions(+), 126 deletions(-) delete mode 100644 ranger-examples/dev-support/ranger-pmd-ruleset.xml diff --git a/ranger-examples/conditions-enrichers/pom.xml b/ranger-examples/conditions-enrichers/pom.xml index 6be7a4829a..771b14a682 100644 --- a/ranger-examples/conditions-enrichers/pom.xml +++ b/ranger-examples/conditions-enrichers/pom.xml @@ -45,4 +45,18 @@ test + + + + org.apache.maven.plugins + maven-pmd-plugin + + + ${project.parent.parent.basedir}/dev-support/ranger-pmd-ruleset.xml + + true + + + + diff --git a/ranger-examples/dev-support/ranger-pmd-ruleset.xml b/ranger-examples/dev-support/ranger-pmd-ruleset.xml deleted file mode 100644 index 9e5ed7a5db..0000000000 --- a/ranger-examples/dev-support/ranger-pmd-ruleset.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - Apache Ranger - PMD rule set - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ranger-examples/distro/pom.xml b/ranger-examples/distro/pom.xml index eda1f4dae9..3da077af94 100644 --- a/ranger-examples/distro/pom.xml +++ b/ranger-examples/distro/pom.xml @@ -51,6 +51,20 @@ ${project.version} + + + + org.apache.maven.plugins + maven-pmd-plugin + + + ${project.parent.parent.basedir}/dev-support/ranger-pmd-ruleset.xml + + true + + + + diff --git a/ranger-examples/plugin-sampleapp/pom.xml b/ranger-examples/plugin-sampleapp/pom.xml index 843b2a22e0..88370b8ce1 100644 --- a/ranger-examples/plugin-sampleapp/pom.xml +++ b/ranger-examples/plugin-sampleapp/pom.xml @@ -134,4 +134,18 @@ test + + + + org.apache.maven.plugins + maven-pmd-plugin + + + ${project.parent.parent.basedir}/dev-support/ranger-pmd-ruleset.xml + + true + + + + diff --git a/ranger-examples/sample-client/pom.xml b/ranger-examples/sample-client/pom.xml index 662a031102..26035fd5b0 100644 --- a/ranger-examples/sample-client/pom.xml +++ b/ranger-examples/sample-client/pom.xml @@ -55,4 +55,18 @@ ${slf4j.version} + + + + org.apache.maven.plugins + maven-pmd-plugin + + + ${project.parent.parent.basedir}/dev-support/ranger-pmd-ruleset.xml + + true + + + + diff --git a/ranger-examples/sampleapp/pom.xml b/ranger-examples/sampleapp/pom.xml index 6f1f5a7224..6e706d39f1 100644 --- a/ranger-examples/sampleapp/pom.xml +++ b/ranger-examples/sampleapp/pom.xml @@ -38,4 +38,18 @@ ${slf4j.version} + + + + org.apache.maven.plugins + maven-pmd-plugin + + + ${project.parent.parent.basedir}/dev-support/ranger-pmd-ruleset.xml + + true + + + + diff --git a/ranger-examples/sampleapp/src/main/java/org/apache/ranger/examples/sampleapp/SampleApp.java b/ranger-examples/sampleapp/src/main/java/org/apache/ranger/examples/sampleapp/SampleApp.java index 155f62fb3d..ad951af120 100644 --- a/ranger-examples/sampleapp/src/main/java/org/apache/ranger/examples/sampleapp/SampleApp.java +++ b/ranger-examples/sampleapp/src/main/java/org/apache/ranger/examples/sampleapp/SampleApp.java @@ -19,6 +19,7 @@ package org.apache.ranger.examples.sampleapp; +import java.util.Arrays; import java.util.HashSet; import java.util.Scanner; import java.util.Set; @@ -52,7 +53,7 @@ public void init() { public void run() { LOG.debug("==> SampleApp.run()"); - do { + while(true) { String input = getInput(); if(input == null) { @@ -69,9 +70,7 @@ public void run() { String userName = getStringArg(args, 2); Set userGroups = new HashSet(); - for(int i = 3; i < args.length; i++) { - userGroups.add(args[i]); - } + userGroups.addAll(Arrays.asList(args).subList(3, args.length)); if(fileName == null || accessType == null || userName == null) { LOG.info("Insufficient arguments. Usage: [userGroup1 userGroup2 userGroup3 ..]"); @@ -90,7 +89,7 @@ public void run() { } else { LOG.info("Not authorized!"); } - } while(true); + } LOG.debug("<== SampleApp.run()"); }