Skip to content

Commit

Permalink
Remove manager instance cache (#2106)
Browse files Browse the repository at this point in the history
  • Loading branch information
duncte123 committed Apr 27, 2022
1 parent b88e322 commit 3364789
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 38 deletions.
Expand Up @@ -55,8 +55,6 @@ public class Template
private final TemplateGuild guild;
private final boolean synced;

protected TemplateManager manager;

public Template(final JDAImpl api, final String code, final String name, final String description,
final int uses, final User creator, final OffsetDateTime createdAt, final OffsetDateTime updatedAt,
final TemplateGuild guild, final boolean synced)
Expand Down Expand Up @@ -277,9 +275,7 @@ public boolean isSynced()
public TemplateManager getManager()
{
checkInteraction();
if (manager == null)
return manager = new TemplateManagerImpl(this);
return manager;
return new TemplateManagerImpl(this);
}

private void checkInteraction()
Expand Down
Expand Up @@ -46,8 +46,6 @@ public class EmoteImpl implements ListedEmote
private final JDAImpl api;
private final Set<Role> roles;

private EmoteManager manager;

private GuildImpl guild;
private boolean managed = false;
private boolean available = true;
Expand Down Expand Up @@ -148,9 +146,7 @@ public boolean hasUser()
@Override
public EmoteManager getManager()
{
if (manager == null)
return manager = new EmoteManagerImpl(this);
return manager;
return new EmoteManagerImpl(this);
}

@Override
Expand Down
Expand Up @@ -92,7 +92,6 @@ public class GuildImpl implements Guild
private final MemberCacheViewImpl memberCache = new MemberCacheViewImpl();
private final CacheView.SimpleCacheView<MemberPresenceImpl> memberPresences;

private GuildManager manager;
private CompletableFuture<Void> pendingRequestToSpeak;

private Member owner;
Expand Down Expand Up @@ -882,9 +881,7 @@ public BaseGuildMessageChannel getDefaultChannel()
@Override
public GuildManager getManager()
{
if (manager == null)
return manager = new GuildManagerImpl(this);
return manager;
return new GuildManagerImpl(this);
}

@Override
Expand Down
Expand Up @@ -39,8 +39,6 @@ public class PermissionOverrideImpl implements PermissionOverride
private final JDAImpl api;
private IPermissionContainer channel;

protected PermissionOverrideAction manager;

private long allow;
private long deny;

Expand Down Expand Up @@ -150,10 +148,7 @@ public boolean isRoleOverride()
public PermissionOverrideAction getManager()
{
checkPermissions();

if (manager == null)
return manager = new PermissionOverrideActionImpl(this).setOverride(false);
return manager;
return new PermissionOverrideActionImpl(this).setOverride(false);
}

@Nonnull
Expand Down
Expand Up @@ -50,8 +50,6 @@ public class RoleImpl implements Role
private final JDAImpl api;
private Guild guild;

private RoleManager manager;

private RoleTagsImpl tags;
private String name;
private boolean managed;
Expand Down Expand Up @@ -299,9 +297,7 @@ public RoleAction createCopy(@Nonnull Guild guild)
@Override
public RoleManager getManager()
{
if (manager == null)
return manager = new RoleManagerImpl(this);
return manager;
return new RoleManagerImpl(this);
}

@Nonnull
Expand Down
Expand Up @@ -27,8 +27,6 @@

public class SelfUserImpl extends UserImpl implements SelfUser
{
protected AccountManager manager;

private boolean verified;
private boolean mfaEnabled;
private long applicationId;
Expand Down Expand Up @@ -95,9 +93,7 @@ public long getAllowedFileSize()
@Override
public AccountManager getManager()
{
if (manager == null)
return manager = new AccountManagerImpl(this);
return manager;
return new AccountManagerImpl(this);
}

public SelfUserImpl setVerified(boolean verified)
Expand Down
Expand Up @@ -34,7 +34,6 @@ public class StageInstanceImpl implements StageInstance
{
private final long id;
private StageChannel channel;
private StageInstanceManager manager;

private String topic;
private PrivacyLevel privacyLevel;
Expand Down Expand Up @@ -96,9 +95,7 @@ public RestAction<Void> delete()
public StageInstanceManager getManager()
{
checkPermissions();
if (manager == null)
manager = new StageInstanceManagerImpl(this);
return manager;
return new StageInstanceManagerImpl(this);
}

public StageInstanceImpl setTopic(String topic)
Expand Down
Expand Up @@ -42,7 +42,6 @@ public class WebhookImpl extends AbstractWebhookClient<Void> implements Webhook
{
private final BaseGuildMessageChannel channel;
private final WebhookType type;
private WebhookManager manager;

private Member owner;
private User user, ownerUser;
Expand Down Expand Up @@ -179,9 +178,7 @@ public AuditableRestAction<Void> delete(@Nonnull String token)
@Override
public WebhookManager getManager()
{
if (manager == null)
return manager = new WebhookManagerImpl(this);
return manager;
return new WebhookManagerImpl(this);
}

@Override
Expand Down

0 comments on commit 3364789

Please sign in to comment.