Skip to content
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

feat(CO-625): briefcase removal #221

Merged
merged 6 commits into from
May 12, 2023
Merged

feat(CO-625): briefcase removal #221

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8e7c69a
feat(CO-626): remove LDAP attributes for Briefcase (#188)
Polpetta Apr 3, 2023
90741c3
feat(CO-629): remove core briefcase functionalities (#219)
Polpetta May 12, 2023
f44aa68
Merge branch 'devel' into feature/CO-625-briefcase-removal
Polpetta May 12, 2023
3774b38
Merge branch 'devel' into feature/CO-625-briefcase-removal
Polpetta May 12, 2023
df334bb
fix: remove dangling reference to attribute
Polpetta May 12, 2023
46421a4
fix: broken test
Polpetta May 12, 2023
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
7 changes: 7 additions & 0 deletions .run/All tests via Maven.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="All tests via Maven" type="CompoundRunConfigurationType">
<toRun name="IT" type="MavenRunConfiguration" />
<toRun name="UT" type="MavenRunConfiguration" />
<method v="2" />
</configuration>
</component>
37 changes: 37 additions & 0 deletions .run/Just Package.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Just Package" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
<option name="myGeneralSettings" />
<option name="myRunnerSettings" />
<option name="myRunnerParameters">
<MavenRunnerParameters>
<option name="profiles">
<set />
</option>
<option name="goals">
<list>
<option value="clean" />
<option value="package" />
<option value="-DskipTests=true" />
<option value="-Dmaven.test.skip=true" />
<option value="-Dmaven.site.skip=true" />
<option value="-Dmaven.javadoc.skip=true" />
</list>
</option>
<option name="pomFileName" value="pom.xml" />
<option name="profilesMap">
<map />
</option>
<option name="resolveToWorkspace" value="false" />
<option name="workingDirPath" value="$PROJECT_DIR$" />
</MavenRunnerParameters>
</option>
</MavenSettings>
<extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
<option name="credential" />
<option name="region" />
<option name="useCurrentConnection" value="false" />
</extension>
<method v="2" />
</configuration>
</component>
34 changes: 34 additions & 0 deletions .run/UT & IT.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="UT &amp; IT" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
<option name="myGeneralSettings" />
<option name="myRunnerSettings" />
<option name="myRunnerParameters">
<MavenRunnerParameters>
<option name="profiles">
<set />
</option>
<option name="goals">
<list>
<option value="clean" />
<option value="test" />
<option value="verify" />
</list>
</option>
<option name="pomFileName" />
<option name="profilesMap">
<map />
</option>
<option name="resolveToWorkspace" value="false" />
<option name="workingDirPath" value="$PROJECT_DIR$" />
</MavenRunnerParameters>
</option>
</MavenSettings>
<extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
<option name="credential" />
<option name="region" />
<option name="useCurrentConnection" value="false" />
</extension>
<method v="2" />
</configuration>
</component>
281 changes: 182 additions & 99 deletions client/src/main/java/com/zimbra/client/ZFeatures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,129 +5,212 @@

package com.zimbra.client;

import java.util.Collection;
import java.util.Map;

import com.google.common.collect.Iterables;
import com.zimbra.common.account.ProvisioningConstants;
import com.zimbra.common.account.ZAttrProvisioning;
import java.util.Collection;
import java.util.Map;

public class ZFeatures {

private Map<String, Collection<String>> mAttrs;

public ZFeatures(Map<String, Collection<String>> attrs) {
mAttrs = attrs;
}

/**
* @param name name of attr to get
* @return null if unset, or first value in list
*/
private String get(String name) {
Collection<String> value = mAttrs.get(name);
if (value == null || value.isEmpty()) {
return null;
}
return Iterables.get(value, 0);
private Map<String, Collection<String>> mAttrs;

}
public ZFeatures(Map<String, Collection<String>> attrs) {
mAttrs = attrs;
}

public boolean getBool(String name) {
return ProvisioningConstants.TRUE.equals(get(name));
/**
* @param name name of attr to get
* @return null if unset, or first value in list
*/
private String get(String name) {
Collection<String> value = mAttrs.get(name);
if (value == null || value.isEmpty()) {
return null;
}
return Iterables.get(value, 0);
}

public Map<String, Collection<String>> getAttrs() { return mAttrs; }

public boolean getContacts() { return getBool(ZAttrProvisioning.A_zimbraFeatureContactsEnabled); }

public boolean getMail() { return getBool(ZAttrProvisioning.A_zimbraFeatureMailEnabled); }

public boolean getAdminMail() {return getBool(ZAttrProvisioning.A_zimbraFeatureAdminMailEnabled); }

public boolean getVoice() { return getBool(ZAttrProvisioning.A_zimbraFeatureVoiceEnabled); }

public boolean getCalendar() { return getBool(ZAttrProvisioning.A_zimbraFeatureCalendarEnabled); }

public boolean getCalendarUpsell() { return getBool(ZAttrProvisioning.A_zimbraFeatureCalendarUpsellEnabled); }

public String getCalendarUpsellURL() { return get(ZAttrProvisioning.A_zimbraFeatureCalendarUpsellURL); }
public boolean getBool(String name) {
return ProvisioningConstants.TRUE.equals(get(name));
}

public boolean getTasks() { return getBool(ZAttrProvisioning.A_zimbraFeatureTasksEnabled); }
public Map<String, Collection<String>> getAttrs() {
return mAttrs;
}

public boolean getTagging() { return getBool(ZAttrProvisioning.A_zimbraFeatureTaggingEnabled); }
public boolean getContacts() {
return getBool(ZAttrProvisioning.A_zimbraFeatureContactsEnabled);
}

public boolean getOptions() { return getBool(ZAttrProvisioning.A_zimbraFeatureOptionsEnabled); }
public boolean getMail() {
return getBool(ZAttrProvisioning.A_zimbraFeatureMailEnabled);
}

public boolean getSavedSearches() { return getBool(ZAttrProvisioning.A_zimbraFeatureSavedSearchesEnabled); }
public boolean getAdminMail() {
return getBool(ZAttrProvisioning.A_zimbraFeatureAdminMailEnabled);
}

public boolean getConversations() { return getBool(ZAttrProvisioning.A_zimbraFeatureConversationsEnabled); }
public boolean getVoice() {
return getBool(ZAttrProvisioning.A_zimbraFeatureVoiceEnabled);
}

public boolean getChangePassword() { return getBool(ZAttrProvisioning.A_zimbraFeatureChangePasswordEnabled); }
public boolean getCalendar() {
return getBool(ZAttrProvisioning.A_zimbraFeatureCalendarEnabled);
}

public boolean getInitialSearchPreference() { return getBool(ZAttrProvisioning.A_zimbraFeatureInitialSearchPreferenceEnabled); }
public boolean getCalendarUpsell() {
return getBool(ZAttrProvisioning.A_zimbraFeatureCalendarUpsellEnabled);
}

public boolean getFilters() { return getBool(ZAttrProvisioning.A_zimbraFeatureFiltersEnabled); }
public String getCalendarUpsellURL() {
return get(ZAttrProvisioning.A_zimbraFeatureCalendarUpsellURL);
}

public boolean getGal() { return getBool(ZAttrProvisioning.A_zimbraFeatureGalEnabled); }
public boolean getTasks() {
return getBool(ZAttrProvisioning.A_zimbraFeatureTasksEnabled);
}

public boolean getHtmlCompose() { return getBool(ZAttrProvisioning.A_zimbraFeatureHtmlComposeEnabled); }
public boolean getTagging() {
return getBool(ZAttrProvisioning.A_zimbraFeatureTaggingEnabled);
}

public boolean getViewInHtml() { return getBool(ZAttrProvisioning.A_zimbraFeatureViewInHtmlEnabled); }
public boolean getOptions() {
return getBool(ZAttrProvisioning.A_zimbraFeatureOptionsEnabled);
}

public boolean getSharing() { return getBool(ZAttrProvisioning.A_zimbraFeatureSharingEnabled); }
public boolean getSavedSearches() {
return getBool(ZAttrProvisioning.A_zimbraFeatureSavedSearchesEnabled);
}

public boolean getMailForwarding() { return getBool(ZAttrProvisioning.A_zimbraFeatureMailForwardingEnabled); }
public boolean getConversations() {
return getBool(ZAttrProvisioning.A_zimbraFeatureConversationsEnabled);
}

public boolean getMailForwardingInFilter() { return getBool(ZAttrProvisioning.A_zimbraFeatureMailForwardingInFiltersEnabled); }
public boolean getChangePassword() {
return getBool(ZAttrProvisioning.A_zimbraFeatureChangePasswordEnabled);
}

public boolean getMobileSync() { return getBool(ZAttrProvisioning.A_zimbraFeatureMobileSyncEnabled); }
public boolean getInitialSearchPreference() {
return getBool(ZAttrProvisioning.A_zimbraFeatureInitialSearchPreferenceEnabled);
}

public boolean getSkinChange() { return getBool(ZAttrProvisioning.A_zimbraFeatureSkinChangeEnabled); }

public boolean getNotebook() { return false; } //bug:56196 getBool(ZAttrProvisioning.A_zimbraFeatureNotebookEnabled);

public boolean getBriefcases() { return getBool(ZAttrProvisioning.A_zimbraFeatureBriefcasesEnabled); }

public boolean getGalAutoComplete() { return getBool(ZAttrProvisioning.A_zimbraFeatureGalAutoCompleteEnabled); }

public boolean getOutOfOfficeReply() { return getBool(ZAttrProvisioning.A_zimbraFeatureOutOfOfficeReplyEnabled); }

public boolean getNewMailNotification() { return getBool(ZAttrProvisioning.A_zimbraFeatureNewMailNotificationEnabled); }

public boolean getIdentities() { return getBool(ZAttrProvisioning.A_zimbraFeatureIdentitiesEnabled); }

public boolean getPop3DataSource() { return getBool(ZAttrProvisioning.A_zimbraFeaturePop3DataSourceEnabled); }

public boolean getGroupcalendarEnabled() { return getBool(ZAttrProvisioning.A_zimbraFeatureGroupCalendarEnabled); }

public boolean getDataSourceImportOnLogin() { return getBool(ZAttrProvisioning.A_zimbraDataSourceImportOnLogin); }

public boolean getFlagging() { return getBool(ZAttrProvisioning.A_zimbraFeatureFlaggingEnabled); }

public boolean getMailPriority() { return getBool(ZAttrProvisioning.A_zimbraFeatureMailPriorityEnabled); }

public boolean getPortalEnabled() { return getBool(ZAttrProvisioning.A_zimbraFeaturePortalEnabled); }

public boolean getContactsDetailedSearch() { return getBool(ZAttrProvisioning.A_zimbraFeatureContactsDetailedSearchEnabled); }

public boolean getDiscardFilterEnabled() { return getBool(ZAttrProvisioning.A_zimbraFeatureDiscardInFiltersEnabled); }

// defaults to TRUE
public boolean getWebClientShowOfflineLink() { return get(ZAttrProvisioning.A_zimbraWebClientShowOfflineLink) == null ||
getBool(ZAttrProvisioning.A_zimbraWebClientShowOfflineLink); }

// defaults to TRUE
public boolean getNewAddrBookEnabled() { return get(ZAttrProvisioning.A_zimbraFeatureNewAddrBookEnabled) == null ||
getBool(ZAttrProvisioning.A_zimbraFeatureNewAddrBookEnabled); }
// defaults to TRUE
public boolean getPop3Enabled() { return get(ZAttrProvisioning.A_zimbraPop3Enabled) == null ||
getBool(ZAttrProvisioning.A_zimbraPop3Enabled); }
// defaults to TRUE
public boolean getSpam() { return get(ZAttrProvisioning.A_zimbraFeatureAntispamEnabled) == null ||
getBool(ZAttrProvisioning.A_zimbraFeatureAntispamEnabled); }
// defaults to TRUE
public boolean getWebClientEnabled() { return get(ZAttrProvisioning.A_zimbraFeatureWebClientEnabled) == null ||
getBool(ZAttrProvisioning.A_zimbraFeatureWebClientEnabled); }
public boolean getFilters() {
return getBool(ZAttrProvisioning.A_zimbraFeatureFiltersEnabled);
}

public boolean getGal() {
return getBool(ZAttrProvisioning.A_zimbraFeatureGalEnabled);
}

public boolean getHtmlCompose() {
return getBool(ZAttrProvisioning.A_zimbraFeatureHtmlComposeEnabled);
}

public boolean getViewInHtml() {
return getBool(ZAttrProvisioning.A_zimbraFeatureViewInHtmlEnabled);
}

public boolean getSharing() {
return getBool(ZAttrProvisioning.A_zimbraFeatureSharingEnabled);
}

public boolean getMailForwarding() {
return getBool(ZAttrProvisioning.A_zimbraFeatureMailForwardingEnabled);
}

public boolean getMailForwardingInFilter() {
return getBool(ZAttrProvisioning.A_zimbraFeatureMailForwardingInFiltersEnabled);
}

public boolean getMobileSync() {
return getBool(ZAttrProvisioning.A_zimbraFeatureMobileSyncEnabled);
}

public boolean getSkinChange() {
return getBool(ZAttrProvisioning.A_zimbraFeatureSkinChangeEnabled);
}

public boolean getNotebook() {
return false;
} // bug:56196 getBool(ZAttrProvisioning.A_zimbraFeatureNotebookEnabled);

public boolean getBriefcases() {
return getBool(ZAttrProvisioning.A_zimbraFeatureBriefcasesEnabled);
}

public boolean getGalAutoComplete() {
return getBool(ZAttrProvisioning.A_zimbraFeatureGalAutoCompleteEnabled);
}

public boolean getOutOfOfficeReply() {
return getBool(ZAttrProvisioning.A_zimbraFeatureOutOfOfficeReplyEnabled);
}

public boolean getNewMailNotification() {
return getBool(ZAttrProvisioning.A_zimbraFeatureNewMailNotificationEnabled);
}

public boolean getIdentities() {
return getBool(ZAttrProvisioning.A_zimbraFeatureIdentitiesEnabled);
}

public boolean getPop3DataSource() {
return getBool(ZAttrProvisioning.A_zimbraFeaturePop3DataSourceEnabled);
}

public boolean getGroupcalendarEnabled() {
return getBool(ZAttrProvisioning.A_zimbraFeatureGroupCalendarEnabled);
}

public boolean getDataSourceImportOnLogin() {
return getBool(ZAttrProvisioning.A_zimbraDataSourceImportOnLogin);
}

public boolean getFlagging() {
return getBool(ZAttrProvisioning.A_zimbraFeatureFlaggingEnabled);
}

public boolean getMailPriority() {
return getBool(ZAttrProvisioning.A_zimbraFeatureMailPriorityEnabled);
}

public boolean getPortalEnabled() {
return getBool(ZAttrProvisioning.A_zimbraFeaturePortalEnabled);
}

public boolean getContactsDetailedSearch() {
return getBool(ZAttrProvisioning.A_zimbraFeatureContactsDetailedSearchEnabled);
}

public boolean getDiscardFilterEnabled() {
return getBool(ZAttrProvisioning.A_zimbraFeatureDiscardInFiltersEnabled);
}

// defaults to TRUE
public boolean getWebClientShowOfflineLink() {
return get(ZAttrProvisioning.A_zimbraWebClientShowOfflineLink) == null
|| getBool(ZAttrProvisioning.A_zimbraWebClientShowOfflineLink);
}

// defaults to TRUE
public boolean getNewAddrBookEnabled() {
return get(ZAttrProvisioning.A_zimbraFeatureNewAddrBookEnabled) == null
|| getBool(ZAttrProvisioning.A_zimbraFeatureNewAddrBookEnabled);
}
// defaults to TRUE
public boolean getPop3Enabled() {
return get(ZAttrProvisioning.A_zimbraPop3Enabled) == null
|| getBool(ZAttrProvisioning.A_zimbraPop3Enabled);
}
// defaults to TRUE
public boolean getSpam() {
return get(ZAttrProvisioning.A_zimbraFeatureAntispamEnabled) == null
|| getBool(ZAttrProvisioning.A_zimbraFeatureAntispamEnabled);
}
// defaults to TRUE
public boolean getWebClientEnabled() {
return get(ZAttrProvisioning.A_zimbraFeatureWebClientEnabled) == null
|| getBool(ZAttrProvisioning.A_zimbraFeatureWebClientEnabled);
}
}

Loading