[AB-197] splitting utility maven module into separate maven modules

aligning some package names
removing some unnecessary computed values from liquibase
This commit is contained in:
Sheldan
2021-03-12 17:29:49 +01:00
parent e2da800d84
commit 2ed456c164
835 changed files with 12790 additions and 3310 deletions

View File

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.core.commands.config.features;
import dev.sheldan.abstracto.core.command.execution.CommandContext;
import dev.sheldan.abstracto.core.command.execution.CommandResult;
import dev.sheldan.abstracto.core.config.FeatureEnum;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.config.FeatureMode;
import dev.sheldan.abstracto.core.exception.FeatureModeNotFoundException;
import dev.sheldan.abstracto.core.exception.FeatureNotFoundException;
@@ -43,8 +43,8 @@ public class DisableFeatureModeTest {
public void testExecuteDisable() {
String featureName = "text";
String modeName = "mode";
FeatureEnum featureEnum = Mockito.mock(FeatureEnum.class);
when(featureConfigService.getFeatureEnum(featureName)).thenReturn(featureEnum);
FeatureDefinition featureDefinition = Mockito.mock(FeatureDefinition.class);
when(featureConfigService.getFeatureEnum(featureName)).thenReturn(featureDefinition);
FeatureMode featureMode = Mockito.mock(FeatureMode.class);
when(featureModeService.getFeatureModeForKey(modeName)).thenReturn(featureMode);
CommandContext context = CommandTestUtilities.getWithParameters(Arrays.asList(featureName, modeName));
@@ -52,7 +52,7 @@ public class DisableFeatureModeTest {
when(serverManagementService.loadServer(context.getGuild())).thenReturn(server);
CommandResult commandResultCompletableFuture = testUnit.execute(context);
CommandTestUtilities.checkSuccessfulCompletion(commandResultCompletableFuture);
verify(featureModeService, times(1)).disableFeatureModeForFeature(featureEnum, server, featureMode);
verify(featureModeService, times(1)).disableFeatureModeForFeature(featureDefinition, server, featureMode);
}
@Test(expected = FeatureNotFoundException.class)
@@ -68,8 +68,8 @@ public class DisableFeatureModeTest {
public void testExecuteDisableNotExistingFeatureMode() {
String featureName = "text";
String modeName = "mode";
FeatureEnum featureEnum = Mockito.mock(FeatureEnum.class);
when(featureConfigService.getFeatureEnum(featureName)).thenReturn(featureEnum);
FeatureDefinition featureDefinition = Mockito.mock(FeatureDefinition.class);
when(featureConfigService.getFeatureEnum(featureName)).thenReturn(featureDefinition);
when(featureModeService.getFeatureModeForKey(modeName)).thenThrow(new FeatureModeNotFoundException(modeName, new ArrayList<>()));
CommandContext context = CommandTestUtilities.getWithParameters(Arrays.asList(featureName, modeName));
testUnit.execute(context);

View File

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.core.commands.config.features;
import dev.sheldan.abstracto.core.command.execution.CommandContext;
import dev.sheldan.abstracto.core.command.execution.CommandResult;
import dev.sheldan.abstracto.core.config.FeatureEnum;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.config.FeatureMode;
import dev.sheldan.abstracto.core.exception.FeatureModeNotFoundException;
import dev.sheldan.abstracto.core.exception.FeatureNotFoundException;
@@ -46,8 +46,8 @@ public class EnableFeatureModeTest {
public void testExecuteDisable() {
String featureName = "text";
String modeName = "mode";
FeatureEnum featureEnum = Mockito.mock(FeatureEnum.class);
when(featureConfigService.getFeatureEnum(featureName)).thenReturn(featureEnum);
FeatureDefinition featureDefinition = Mockito.mock(FeatureDefinition.class);
when(featureConfigService.getFeatureEnum(featureName)).thenReturn(featureDefinition);
FeatureMode featureMode = Mockito.mock(FeatureMode.class);
when(featureModeService.getFeatureModeForKey(modeName)).thenReturn(featureMode);
CommandContext context = CommandTestUtilities.getWithParameters(Arrays.asList(featureName, modeName));
@@ -56,7 +56,7 @@ public class EnableFeatureModeTest {
when(serverManagementService.loadServer(SERVER_ID)).thenReturn(server);
CommandResult commandResultCompletableFuture = testUnit.execute(context);
CommandTestUtilities.checkSuccessfulCompletion(commandResultCompletableFuture);
verify(featureModeService, times(1)).enableFeatureModeForFeature(featureEnum, server, featureMode);
verify(featureModeService, times(1)).enableFeatureModeForFeature(featureDefinition, server, featureMode);
}
@Test(expected = FeatureNotFoundException.class)
@@ -72,8 +72,8 @@ public class EnableFeatureModeTest {
public void testExecuteDisableNotExistingFeatureMode() {
String featureName = "text";
String modeName = "mode";
FeatureEnum featureEnum = Mockito.mock(FeatureEnum.class);
when(featureConfigService.getFeatureEnum(featureName)).thenReturn(featureEnum);
FeatureDefinition featureDefinition = Mockito.mock(FeatureDefinition.class);
when(featureConfigService.getFeatureEnum(featureName)).thenReturn(featureDefinition);
when(featureModeService.getFeatureModeForKey(modeName)).thenThrow(new FeatureModeNotFoundException(modeName, new ArrayList<>()));
CommandContext context = CommandTestUtilities.getWithParameters(Arrays.asList(featureName, modeName));
testUnit.execute(context);

View File

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.core.commands.config.features;
import dev.sheldan.abstracto.core.command.execution.CommandContext;
import dev.sheldan.abstracto.core.command.execution.CommandResult;
import dev.sheldan.abstracto.core.command.service.management.FeatureManagementService;
import dev.sheldan.abstracto.core.config.FeatureEnum;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.exception.FeatureNotFoundException;
import dev.sheldan.abstracto.core.models.database.AFeature;
import dev.sheldan.abstracto.core.models.database.AServer;
@@ -77,9 +77,9 @@ public class FeatureModesTest {
public void testExecuteFeatureParameter() {
CommandContext noParameters = CommandTestUtilities.getWithParameters(Arrays.asList(FEATURE_NAME));
FeatureModeDisplay display1 = Mockito.mock(FeatureModeDisplay.class);
FeatureEnum featureEnum = Mockito.mock(FeatureEnum.class);
when(featureEnum.getKey()).thenReturn(FEATURE_NAME);
when(featureConfigService.getFeatureEnum(FEATURE_NAME)).thenReturn(featureEnum);
FeatureDefinition featureDefinition = Mockito.mock(FeatureDefinition.class);
when(featureDefinition.getKey()).thenReturn(FEATURE_NAME);
when(featureConfigService.getFeatureEnum(FEATURE_NAME)).thenReturn(featureDefinition);
AFeature feature = Mockito.mock(AFeature.class);
when(featureManagementService.getFeature(FEATURE_NAME)).thenReturn(feature);
List<FeatureModeDisplay> featureModeDisplays = Arrays.asList(display1);

View File

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.core.service;
import dev.sheldan.abstracto.core.command.service.management.FeatureManagementService;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.config.FeatureEnum;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.config.FeatureMode;
import dev.sheldan.abstracto.core.models.database.*;
import dev.sheldan.abstracto.core.models.property.FeatureModeProperty;
@@ -56,7 +56,7 @@ public class FeatureModeServiceBeanTest {
private AServer server;
@Mock
private FeatureEnum featureEnum;
private FeatureDefinition featureDefinition;
@Mock
private AFeature feature;
@@ -75,79 +75,79 @@ public class FeatureModeServiceBeanTest {
@Test
public void enableFeatureModeForFeatureWhichAlreadyExists() {
when(featureEnum.getKey()).thenReturn(FEATURE_NAME);
when(featureManagementService.getFeature(featureEnum.getKey())).thenReturn(feature);
when(featureDefinition.getKey()).thenReturn(FEATURE_NAME);
when(featureManagementService.getFeature(featureDefinition.getKey())).thenReturn(feature);
when(featureModeManagementService.getFeatureMode(feature, server, featureMode)).thenReturn(Optional.of(aFeatureMode));
testUnit.enableFeatureModeForFeature(featureEnum, server, featureMode);
testUnit.enableFeatureModeForFeature(featureDefinition, server, featureMode);
verify(aFeatureMode, times(1)).setEnabled(true);
}
@Test
public void enableFeatureModeForFeatureCreatingNewMode() {
when(featureEnum.getKey()).thenReturn(FEATURE_NAME);
when(featureManagementService.getFeature(featureEnum.getKey())).thenReturn(feature);
when(featureDefinition.getKey()).thenReturn(FEATURE_NAME);
when(featureManagementService.getFeature(featureDefinition.getKey())).thenReturn(feature);
when(featureModeManagementService.getFeatureMode(feature, server, featureMode)).thenReturn(Optional.empty());
when(featureFlagManagementService.getFeatureFlag(feature, server)).thenReturn(Optional.of(featureFlag));
testUnit.enableFeatureModeForFeature(featureEnum, server, featureMode);
testUnit.enableFeatureModeForFeature(featureDefinition, server, featureMode);
verify(featureModeManagementService, times(1)).createMode(featureFlag, featureMode, true);
}
@Test
public void setFutureModeForFutureEnable() {
when(featureEnum.getKey()).thenReturn(FEATURE_NAME);
when(featureManagementService.getFeature(featureEnum.getKey())).thenReturn(feature);
when(featureDefinition.getKey()).thenReturn(FEATURE_NAME);
when(featureManagementService.getFeature(featureDefinition.getKey())).thenReturn(feature);
when(featureModeManagementService.getFeatureMode(feature, server, featureMode)).thenReturn(Optional.of(aFeatureMode));
testUnit.setFutureModeForFuture(featureEnum, server, featureMode, true);
testUnit.setFutureModeForFuture(featureDefinition, server, featureMode, true);
verify(aFeatureMode, times(1)).setEnabled(true);
}
@Test
public void setFutureModeForFutureDisable() {
when(featureEnum.getKey()).thenReturn(FEATURE_NAME);
when(featureManagementService.getFeature(featureEnum.getKey())).thenReturn(feature);
when(featureDefinition.getKey()).thenReturn(FEATURE_NAME);
when(featureManagementService.getFeature(featureDefinition.getKey())).thenReturn(feature);
when(featureModeManagementService.getFeatureMode(feature, server, featureMode)).thenReturn(Optional.of(aFeatureMode));
testUnit.setFutureModeForFuture(featureEnum, server, featureMode, false);
testUnit.setFutureModeForFuture(featureDefinition, server, featureMode, false);
verify(aFeatureMode, times(1)).setEnabled(false);
}
@Test
public void disableFeatureModeForFeatureWhichAlreadyExists() {
when(featureEnum.getKey()).thenReturn(FEATURE_NAME);
when(featureManagementService.getFeature(featureEnum.getKey())).thenReturn(feature);
when(featureDefinition.getKey()).thenReturn(FEATURE_NAME);
when(featureManagementService.getFeature(featureDefinition.getKey())).thenReturn(feature);
when(featureModeManagementService.getFeatureMode(feature, server, featureMode)).thenReturn(Optional.of(aFeatureMode));
testUnit.disableFeatureModeForFeature(featureEnum, server, featureMode);
testUnit.disableFeatureModeForFeature(featureDefinition, server, featureMode);
verify(aFeatureMode, times(1)).setEnabled(false);
}
@Test
public void disableFeatureModeForFeatureCreatingNewMode() {
when(featureEnum.getKey()).thenReturn(FEATURE_NAME);
when(featureManagementService.getFeature(featureEnum.getKey())).thenReturn(feature);
when(featureDefinition.getKey()).thenReturn(FEATURE_NAME);
when(featureManagementService.getFeature(featureDefinition.getKey())).thenReturn(feature);
when(featureModeManagementService.getFeatureMode(feature, server, featureMode)).thenReturn(Optional.empty());
when(featureFlagManagementService.getFeatureFlag(feature, server)).thenReturn(Optional.of(featureFlag));
testUnit.disableFeatureModeForFeature(featureEnum, server, featureMode);
testUnit.disableFeatureModeForFeature(featureDefinition, server, featureMode);
verify(featureModeManagementService, times(1)).createMode(featureFlag, featureMode, false);
}
@Test
public void testFeatureModeActiveForCustomizedFeatureMode() {
when(featureEnum.getKey()).thenReturn(FEATURE_NAME);
when(featureManagementService.getFeature(featureEnum.getKey())).thenReturn(feature);
when(featureDefinition.getKey()).thenReturn(FEATURE_NAME);
when(featureManagementService.getFeature(featureDefinition.getKey())).thenReturn(feature);
when(featureModeManagementService.doesFeatureModeExist(feature, server, featureMode)).thenReturn(true);
when(featureModeManagementService.isFeatureModeActive(feature, server, featureMode)).thenReturn(true);
boolean actualResult = testUnit.featureModeActive(featureEnum, server, featureMode);
boolean actualResult = testUnit.featureModeActive(featureDefinition, server, featureMode);
Assert.assertTrue(actualResult);
}
@Test
public void testFeatureModeActiveForDefaultFeatureMode() {
when(featureEnum.getKey()).thenReturn(FEATURE_NAME);
when(featureDefinition.getKey()).thenReturn(FEATURE_NAME);
when(featureMode.getKey()).thenReturn(FEATURE_MODE);
when(featureManagementService.getFeature(featureEnum.getKey())).thenReturn(feature);
when(featureManagementService.getFeature(featureDefinition.getKey())).thenReturn(feature);
when(featureModeManagementService.doesFeatureModeExist(feature, server, featureMode)).thenReturn(false);
when(defaultFeatureModeManagement.getFeatureMode(feature, FEATURE_MODE)).thenReturn(defaultFeatureMode);
when(defaultFeatureMode.getEnabled()).thenReturn(true);
boolean actualResult = testUnit.featureModeActive(featureEnum, server, featureMode);
boolean actualResult = testUnit.featureModeActive(featureDefinition, server, featureMode);
Assert.assertTrue(actualResult);
}