Skip to content

Commit

Permalink
Remove obsolete configuration parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
mederly committed Nov 23, 2019
1 parent 9eaa7f0 commit 8d410ad
Showing 1 changed file with 0 additions and 37 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ public class GrouperConfiguration extends AbstractConfiguration implements State

private static final Log LOG = Log.getLog(GrouperConfiguration.class);

private static final String DEFAULT_GROUP_SOURCE_ID = "g:gsa";

private String baseUrl;
private String username;
private GuardedString password;
Expand All @@ -49,10 +47,6 @@ public class GrouperConfiguration extends AbstractConfiguration implements State
private String testStem;
private String testGroup;

// deprecated (to be removed)
private String superGroup;
private String groupSource;

@ConfigurationProperty(order = 10, displayMessageKey = "baseUrl.display", helpMessageKey = "baseUrl.help", required = true)
public String getBaseUrl() {
return baseUrl;
Expand Down Expand Up @@ -170,35 +164,6 @@ public void setTestGroup(String testGroup) {
this.testGroup = testGroup;
}

/**
* Currently unused. It is kept here just to avoid breaking older configurations. Will be removed eventually.
*/
@Deprecated
@ConfigurationProperty(order = 9900, displayMessageKey = "superGroup.display", helpMessageKey = "superGroup.help")
public String getSuperGroup() {
return superGroup;
}

@Deprecated
public void setSuperGroup(String superGroup) {
this.superGroup = superGroup;
}

/**
* Currently unused. It is kept here just to avoid breaking older configurations. Will be removed eventually.
*/
@Deprecated
@ConfigurationProperty(order = 9901, displayMessageKey = "groupSource.display", helpMessageKey = "groupSource.help")
public String getGroupSource() {
return groupSource != null ? groupSource : DEFAULT_GROUP_SOURCE_ID;
}

@Deprecated
public void setGroupSource(String groupSource) {
this.groupSource = groupSource;
}


@Override
public void validate() {
String exceptionMsg;
Expand Down Expand Up @@ -228,8 +193,6 @@ public void release() {
this.groupExcludePattern = null;
this.subjectSource = null;
this.testGroup = null;
this.superGroup = null;
this.groupSource = null;
}

@Override
Expand Down

0 comments on commit 8d410ad

Please sign in to comment.