Skip to content

Commit f6030a6

Browse files
author
Vladimir Kotal
committed
rename plugin files to follow common naming scheme
1 parent 083cbfe commit f6030a6

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

plugins/LdapPlugin/src/opengrok/auth/plugin/LdapAttr.java renamed to plugins/LdapPlugin/src/opengrok/auth/plugin/LdapAttrPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
*
4141
* @author Krystof Tulinger
4242
*/
43-
public class LdapAttr extends AbstractLdapPlugin {
43+
public class LdapAttrPlugin extends AbstractLdapPlugin {
4444

4545
protected static final String ATTR_PARAM = "attribute";
4646
protected static final String FILE_PARAM = "file";
@@ -50,7 +50,7 @@ public class LdapAttr extends AbstractLdapPlugin {
5050
private String ldapAttr;
5151
private final Set<String> whitelist = new TreeSet<>();
5252

53-
public LdapAttr() {
53+
public LdapAttrPlugin() {
5454
SESSION_ALLOWED += "-" + nextId++;
5555
}
5656

plugins/LdapPlugin/src/opengrok/auth/plugin/LdapFilter.java renamed to plugins/LdapPlugin/src/opengrok/auth/plugin/LdapFilterPlugin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@
3939
*
4040
* @author Krystof Tulinger
4141
*/
42-
public class LdapFilter extends AbstractLdapPlugin {
42+
public class LdapFilterPlugin extends AbstractLdapPlugin {
4343

44-
private static final Logger LOGGER = Logger.getLogger(LdapFilter.class.getName());
44+
private static final Logger LOGGER = Logger.getLogger(LdapFilterPlugin.class.getName());
4545

4646
protected static final String FILTER_PARAM = "filter";
4747
protected String SESSION_ALLOWED = "opengrok-filter-plugin-allowed";
4848

4949
private String ldapFilter;
5050

51-
public LdapFilter() {
51+
public LdapFilterPlugin() {
5252
SESSION_ALLOWED += "-" + nextId++;
5353
}
5454

plugins/LdapPlugin/test/opengrok/auth/plugin/LdapAttrTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
public class LdapAttrTest {
4949

5050
private HttpServletRequest dummyRequest;
51-
private LdapAttr plugin;
51+
private LdapAttrPlugin plugin;
5252
private AuthorizationFramework framework;
5353

5454
private static File whitelistFile;
@@ -70,11 +70,12 @@ public static void afterClass() {
7070

7171
@Before
7272
public void setUp() {
73-
plugin = new LdapAttr();
73+
plugin = new LdapAttrPlugin();
7474
Map<String, Object> parameters = new TreeMap<>();
75+
7576
parameters.put(AbstractLdapPlugin.FAKE_PARAM, true);
76-
parameters.put(LdapAttr.FILE_PARAM, whitelistFile.getAbsolutePath());
77-
parameters.put(LdapAttr.ATTR_PARAM, "mail");
77+
parameters.put(LdapAttrPlugin.FILE_PARAM, whitelistFile.getAbsolutePath());
78+
parameters.put(LdapAttrPlugin.ATTR_PARAM, "mail");
7879

7980
plugin.load(parameters);
8081

plugins/LdapPlugin/test/opengrok/auth/plugin/LdapFilterTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333

3434
public class LdapFilterTest {
3535

36-
private LdapFilter plugin;
36+
private LdapFilterPlugin plugin;
3737

3838
@Before
3939
public void setUp() {
40-
plugin = new LdapFilter();
40+
plugin = new LdapFilterPlugin();
4141
}
4242

4343
@Test

0 commit comments

Comments
 (0)