Skip to content

Adding DataCenter support #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kutsal wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding DataCenter support #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ target
*.iml
*.ipr
*.iws
.idea
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.thundermoose.plugins</groupId>
<artifactId>stash-token-auth</artifactId>
<version>2.2</version>
<version>2.3-SNAPSHOT</version>
<packaging>atlassian-plugin</packaging>

<name>Token Authenticator</name>
Expand Down
127 changes: 56 additions & 71 deletions src/main/java/com/thundermoose/plugins/admin/AdminConfigDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
public class AdminConfigDao {
private final PluginSettingsFactory pluginSettingsFactory;
private final TransactionTemplate transactionTemplate;
private AdminConfig cachedConfig;

public AdminConfigDao(PluginSettingsFactory pluginSettingsFactory, TransactionTemplate transactionTemplate) {
this.pluginSettingsFactory = pluginSettingsFactory;
Expand Down Expand Up @@ -49,68 +48,63 @@ private void setDefaults() {
}

public AdminConfig getAdminConfig() {
AdminConfig config = getCache();
if(config != null) {
return config;
} else {
return transactionTemplate.execute(new TransactionCallback<AdminConfig>() {
public AdminConfig doInTransaction() {
PluginSettings settings = pluginSettingsFactory.createGlobalSettings();
AdminConfig config = new AdminConfig();
config.setEnabled(BooleanUtils.toBoolean((String) settings.get(BASE + ".enabled")));
config.setKey((String) settings.get(BASE + ".key"));
String ttl = (String) settings.get(BASE + ".ttl");
if(ttl != null) {
config.setTtl(Integer.valueOf(ttl));
}

if(settings.get(adminPathPrefix) != null) {
config.setAdminPaths(new AdminPaths(
BooleanUtils.toBoolean((String) settings.get(adminPermissions)),
BooleanUtils.toBoolean((String) settings.get(adminUsers)),
BooleanUtils.toBoolean((String) settings.get(adminGroups)),
BooleanUtils.toBoolean((String) settings.get(adminLogs)),
BooleanUtils.toBoolean((String) settings.get(adminAllRestApi)),
BooleanUtils.toBoolean((String) settings.get(adminAllBranchUtilsApi)),
BooleanUtils.toBoolean((String) settings.get(adminAllKeysApi)),
BooleanUtils.toBoolean((String) settings.get(adminAllDefaultReviewersApi)),
BooleanUtils.toBoolean((String) settings.get(adminAllBranchPermissionsApi))
));
}

if(settings.get(projectPathPrefix) != null) {
config.setProjectPaths(new ProjectPaths(
BooleanUtils.toBoolean((String) settings.get(projectList)),
BooleanUtils.toBoolean((String) settings.get(projectPermissions)),
BooleanUtils.toBoolean((String) settings.get(projectRepoList))
));
}

if(settings.get(repoPathPrefix) != null) {
config.setRepoPaths(new RepoPaths(
BooleanUtils.toBoolean((String) settings.get(repoPermissions)),
BooleanUtils.toBoolean((String) settings.get(repoCommitHistory)),
BooleanUtils.toBoolean((String) settings.get(repoFiles)),
BooleanUtils.toBoolean((String) settings.get(repoPullRequests)),
BooleanUtils.toBoolean((String) settings.get(repoParticipants)),
BooleanUtils.toBoolean((String) settings.get(repoBranchPermissions)),
BooleanUtils.toBoolean((String) settings.get(repoBuildStatus)),
BooleanUtils.toBoolean((String) settings.get(repoBaseDetails)),
BooleanUtils.toBoolean((String) settings.get(repoSync))
));
}

if(settings.get(sshPathPrefix) != null) {
config.setSSHPaths(new SSHPaths(
BooleanUtils.toBoolean((String) settings.get(sshUserKeys)),
BooleanUtils.toBoolean((String) settings.get(sshRepoKeys))
));
}

return config;
return transactionTemplate.execute(new TransactionCallback<AdminConfig>() {
public AdminConfig doInTransaction() {
PluginSettings settings = pluginSettingsFactory.createGlobalSettings();
AdminConfig config = new AdminConfig();
config.setEnabled(BooleanUtils.toBoolean((String) settings.get(BASE + ".enabled")));
config.setKey((String) settings.get(BASE + ".key"));
String ttl = (String) settings.get(BASE + ".ttl");
if(ttl != null) {
config.setTtl(Integer.valueOf(ttl));
}
});
}

if(settings.get(adminPathPrefix) != null) {
config.setAdminPaths(new AdminPaths(
BooleanUtils.toBoolean((String) settings.get(adminPermissions)),
BooleanUtils.toBoolean((String) settings.get(adminUsers)),
BooleanUtils.toBoolean((String) settings.get(adminGroups)),
BooleanUtils.toBoolean((String) settings.get(adminLogs)),
BooleanUtils.toBoolean((String) settings.get(adminAllRestApi)),
BooleanUtils.toBoolean((String) settings.get(adminAllBranchUtilsApi)),
BooleanUtils.toBoolean((String) settings.get(adminAllKeysApi)),
BooleanUtils.toBoolean((String) settings.get(adminAllDefaultReviewersApi)),
BooleanUtils.toBoolean((String) settings.get(adminAllBranchPermissionsApi))
));
}

if(settings.get(projectPathPrefix) != null) {
config.setProjectPaths(new ProjectPaths(
BooleanUtils.toBoolean((String) settings.get(projectList)),
BooleanUtils.toBoolean((String) settings.get(projectPermissions)),
BooleanUtils.toBoolean((String) settings.get(projectRepoList))
));
}

if(settings.get(repoPathPrefix) != null) {
config.setRepoPaths(new RepoPaths(
BooleanUtils.toBoolean((String) settings.get(repoPermissions)),
BooleanUtils.toBoolean((String) settings.get(repoCommitHistory)),
BooleanUtils.toBoolean((String) settings.get(repoFiles)),
BooleanUtils.toBoolean((String) settings.get(repoPullRequests)),
BooleanUtils.toBoolean((String) settings.get(repoParticipants)),
BooleanUtils.toBoolean((String) settings.get(repoBranchPermissions)),
BooleanUtils.toBoolean((String) settings.get(repoBuildStatus)),
BooleanUtils.toBoolean((String) settings.get(repoBaseDetails)),
BooleanUtils.toBoolean((String) settings.get(repoSync))
));
}

if(settings.get(sshPathPrefix) != null) {
config.setSSHPaths(new SSHPaths(
BooleanUtils.toBoolean((String) settings.get(sshUserKeys)),
BooleanUtils.toBoolean((String) settings.get(sshRepoKeys))
));
}

return config;
}
});
}

public void setAdminConfig(final AdminConfig config) {
Expand Down Expand Up @@ -159,20 +153,11 @@ public AdminConfig doInTransaction() {
settings.put(sshRepoKeys, BooleanUtils.toStringTrueFalse(config.getSSHPaths().getRepoKeys()));
}

setCache(config);
return config;
}
});
}

private synchronized void setCache(AdminConfig config) {
this.cachedConfig = config;
}

private synchronized AdminConfig getCache() {
return this.cachedConfig;
}

public static final String BASE = AdminConfig.class.getName();

public static final String adminPathPrefix = BASE + ".adminPaths";
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/atlassian-plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<vendor name="${project.organization.name}" url="${project.organization.url}"/>
<param name="plugin-icon">images/pluginIcon.png</param>
<param name="plugin-logo">images/pluginIcon.png</param>
<param name="atlassian-data-center-compatible">true</param>
</plugin-info>

<component-import key="i18nService" interface="com.atlassian.bitbucket.i18n.I18nService"/>
Expand Down