honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Cleanup] Removed redundant Inject annotations 

Also removed unused constructors

Original commit: elastic/x-pack-elasticsearch@1d1d2dcbad
This commit is contained in:
uboness 2015-01-21 13:44:54 +01:00
parent fb7c731bd1
commit 3bf687e726
5 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/elasticsearch/shield/authc/active_directory/ActiveDirectoryConnectionFactory.java
View File

@ -7,7 +7,6 @@ package org.elasticsearch.shield.authc.active_directory;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.collect.ImmutableMap;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.shield.ShieldSettingsException;
@ -51,7 +50,6 @@ public class ActiveDirectoryConnectionFactory extends ConnectionFactory<ActiveDi
private final TimeValue timeout;
private final AbstractLdapConnection.GroupsResolver groupResolver;
@Inject
public ActiveDirectoryConnectionFactory(RealmConfig config) {
super(ActiveDirectoryConnection.class, config);
Settings settings = config.settings();

1
src/main/java/org/elasticsearch/shield/authc/active_directory/ActiveDirectoryRealm.java
View File

@ -18,7 +18,6 @@ public class ActiveDirectoryRealm extends AbstractLdapRealm {
public static final String TYPE = "active_directory";
@Inject
public ActiveDirectoryRealm(RealmConfig config,
ActiveDirectoryConnectionFactory connectionFactory,
ActiveDirectoryGroupToRoleMapper roleMapper) {

2
src/main/java/org/elasticsearch/shield/authc/ldap/LdapConnectionFactory.java
View File

@ -7,7 +7,6 @@ package org.elasticsearch.shield.authc.ldap;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.collect.ImmutableMap;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.shield.ShieldSettingsException;
@ -40,7 +39,6 @@ public class LdapConnectionFactory extends ConnectionFactory<LdapConnection> {
private final AbstractLdapConnection.GroupsResolver groupResolver;
private final TimeValue timeout;
@Inject
public LdapConnectionFactory(RealmConfig config) {
super(LdapConnection.class, config);
Settings settings = config.settings();

5
src/main/java/org/elasticsearch/shield/authc/ldap/LdapGroupToRoleMapper.java
View File

@ -6,7 +6,6 @@
package org.elasticsearch.shield.authc.ldap;
import org.elasticsearch.shield.authc.RealmConfig;
import org.elasticsearch.shield.authc.support.RefreshListener;
import org.elasticsearch.shield.authc.support.ldap.AbstractGroupToRoleMapper;
import org.elasticsearch.watcher.ResourceWatcherService;
@ -15,10 +14,6 @@ import org.elasticsearch.watcher.ResourceWatcherService;
*/
public class LdapGroupToRoleMapper extends AbstractGroupToRoleMapper {
public LdapGroupToRoleMapper(RealmConfig config, ResourceWatcherService watcherService, RefreshListener listener) {
super(LdapRealm.TYPE, config, watcherService, listener);
}
public LdapGroupToRoleMapper(RealmConfig config, ResourceWatcherService watcherService) {
super(LdapRealm.TYPE, config, watcherService, null);
}

1
src/main/java/org/elasticsearch/shield/authc/ldap/LdapRealm.java
View File

@ -18,7 +18,6 @@ public class LdapRealm extends AbstractLdapRealm {
public static final String TYPE = "ldap";
@Inject
public LdapRealm(RealmConfig config, LdapConnectionFactory ldap, LdapGroupToRoleMapper roleMapper) {
super(TYPE, config, ldap, roleMapper);
}