diff --git a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/commands/ListDisabledExperienceRoles.java b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/commands/ListDisabledExperienceRoles.java index d151d6cfe..93cce1e0c 100644 --- a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/commands/ListDisabledExperienceRoles.java +++ b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/commands/ListDisabledExperienceRoles.java @@ -19,6 +19,7 @@ import dev.sheldan.abstracto.experience.models.database.ADisabledExpRole; import dev.sheldan.abstracto.experience.models.templates.DisabledExperienceRolesModel; import dev.sheldan.abstracto.experience.service.management.DisabledExpRoleManagementService; import net.dv8tion.jda.api.entities.Message; +import net.dv8tion.jda.api.entities.Role; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -51,10 +52,14 @@ public class ListDisabledExperienceRoles extends AbstractConditionableCommand { List disabledRolesForServer = disabledExpRoleManagementService.getDisabledRolesForServer(server); DisabledExperienceRolesModel disabledExperienceRolesModel = (DisabledExperienceRolesModel) ContextConverter.fromCommandContext(commandContext, DisabledExperienceRolesModel.class); disabledRolesForServer.forEach(aDisabledExpRole -> { + Role jdaRole = null; + if(!aDisabledExpRole.getRole().getDeleted()) { + jdaRole = roleService.getRoleFromGuild(aDisabledExpRole.getRole()); + } FullRole role = FullRole .builder() .role(aDisabledExpRole.getRole()) - .serverRole(roleService.getRoleFromGuild(aDisabledExpRole.getRole())) + .serverRole(jdaRole) .build(); disabledExperienceRolesModel.getRoles().add(role); }); diff --git a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/converter/LeaderBoardModelConverter.java b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/converter/LeaderBoardModelConverter.java index 7a23e19a6..9950a911a 100644 --- a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/converter/LeaderBoardModelConverter.java +++ b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/converter/LeaderBoardModelConverter.java @@ -4,11 +4,14 @@ import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.core.service.MemberService; import dev.sheldan.abstracto.experience.models.LeaderBoard; import dev.sheldan.abstracto.experience.models.LeaderBoardEntry; +import dev.sheldan.abstracto.experience.models.database.AUserExperience; import dev.sheldan.abstracto.experience.models.templates.LeaderBoardEntryModel; +import dev.sheldan.abstracto.experience.service.management.UserExperienceManagementService; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.entities.Member; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @@ -24,6 +27,12 @@ public class LeaderBoardModelConverter { @Autowired private MemberService memberService; + @Autowired + private UserExperienceManagementService userExperienceManagementService; + + @Autowired + private LeaderBoardModelConverter self; + /** * Converts the complete {@link LeaderBoard leaderBoard} into a list of {@link LeaderBoardEntryModel leaderbaordEntryModels} which contain additional * information available for rendering the leader board ({@link Member member} reference and more) @@ -50,13 +59,21 @@ public class LeaderBoardModelConverter { */ public CompletableFuture fromLeaderBoardEntry(LeaderBoardEntry leaderBoardEntry) { AUserInAServer entryUser = leaderBoardEntry.getExperience().getUser(); - return memberService.getMemberInServerAsync(entryUser.getServerReference().getId(), entryUser.getUserReference().getId()).thenApply(member -> - LeaderBoardEntryModel - .builder() - .experience(leaderBoardEntry.getExperience()) - .member(member).rank(leaderBoardEntry.getRank()) - .rank(leaderBoardEntry.getRank()) - .build() - ); + Long userInServerId = leaderBoardEntry.getExperience().getUser().getUserInServerId(); + Integer rank = leaderBoardEntry.getRank(); + return memberService.getMemberInServerAsync(entryUser.getServerReference().getId(), entryUser.getUserReference().getId()) + .thenApply(member -> self.buildLeaderBoardModel(userInServerId, member, rank)) + .exceptionally(throwable -> self.buildLeaderBoardModel(userInServerId, null, rank)); + } + + @Transactional + public LeaderBoardEntryModel buildLeaderBoardModel(Long userInServerId, Member member, Integer rank) { + AUserExperience experience = userExperienceManagementService.findByUserInServerId(userInServerId); + return LeaderBoardEntryModel + .builder() + .experience(experience) + .member(member) + .rank(rank) + .build(); } } diff --git a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/management/DisabledExpRoleManagementServiceBean.java b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/management/DisabledExpRoleManagementServiceBean.java index a1d6a9d51..d3c434ddd 100644 --- a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/management/DisabledExpRoleManagementServiceBean.java +++ b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/management/DisabledExpRoleManagementServiceBean.java @@ -21,6 +21,7 @@ public class DisabledExpRoleManagementServiceBean implements DisabledExpRoleMana public ADisabledExpRole setRoleToBeDisabledForExp(ARole role) { ADisabledExpRole newRole = ADisabledExpRole .builder() + .id(role.getId()) .role(role) .build(); log.info("Adding disabled exp role {} for server {}.", role.getId(), role.getServer().getId()); @@ -39,7 +40,7 @@ public class DisabledExpRoleManagementServiceBean implements DisabledExpRoleMana @Override public boolean isExperienceDisabledForRole(ARole role) { - return disabledExpRoleRepository.existsByRole(role); + return disabledExpRoleRepository.existsById(role.getId()); } diff --git a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/test/java/dev/sheldan/abstracto/experience/commands/ListDisabledExperienceRolesTest.java b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/test/java/dev/sheldan/abstracto/experience/commands/ListDisabledExperienceRolesTest.java index 61752f3ae..e49516710 100644 --- a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/test/java/dev/sheldan/abstracto/experience/commands/ListDisabledExperienceRolesTest.java +++ b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/test/java/dev/sheldan/abstracto/experience/commands/ListDisabledExperienceRolesTest.java @@ -44,10 +44,12 @@ public class ListDisabledExperienceRolesTest { @Mock private ServerManagementService serverManagementService; + @Mock + private AServer server; + @Test public void testCommandExecutionNoRolesFound() { CommandContext context = CommandTestUtilities.getNoParameters(); - AServer server = Mockito.mock(AServer.class); when(serverManagementService.loadServer(context.getGuild())).thenReturn(server); when(disabledExpRoleManagementService.getDisabledRolesForServer(server)).thenReturn(new ArrayList<>()); when(channelService.sendEmbedTemplateInTextChannelList(eq("list_disabled_experience_roles"), @@ -60,14 +62,20 @@ public class ListDisabledExperienceRolesTest { @Test public void testCommandExecutionRolesFound() { CommandContext context = CommandTestUtilities.getNoParameters(); - AServer server = Mockito.mock(AServer.class); ADisabledExpRole disabledExpRole1 = Mockito.mock(ADisabledExpRole.class); ADisabledExpRole disabledExpRole2 = Mockito.mock(ADisabledExpRole.class); when(disabledExpRoleManagementService.getDisabledRolesForServer(server)).thenReturn(Arrays.asList(disabledExpRole1, disabledExpRole2)); Role role1 = Mockito.mock(Role.class); Role role2 = Mockito.mock(Role.class); - when(roleService.getRoleFromGuild(disabledExpRole1.getRole())).thenReturn(role1); - when(roleService.getRoleFromGuild(disabledExpRole2.getRole())).thenReturn(role2); + + ARole aRole = Mockito.mock(ARole.class); + ARole aRole2 = Mockito.mock(ARole.class); + when(roleService.getRoleFromGuild(aRole)).thenReturn(role1); + when(roleService.getRoleFromGuild(aRole2)).thenReturn(role2); + when(aRole.getDeleted()).thenReturn(false); + when(aRole2.getDeleted()).thenReturn(false); + when(disabledExpRole1.getRole()).thenReturn(aRole); + when(disabledExpRole2.getRole()).thenReturn(aRole2); when(serverManagementService.loadServer(context.getGuild())).thenReturn(server); when(channelService.sendEmbedTemplateInTextChannelList(eq("list_disabled_experience_roles"), any(DisabledExperienceRolesModel.class), eq(context.getChannel()))).thenReturn(CommandTestUtilities.messageFutureList()); diff --git a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/test/java/dev/sheldan/abstracto/experience/converter/LeaderBoardModelConverterTest.java b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/test/java/dev/sheldan/abstracto/experience/converter/LeaderBoardModelConverterTest.java index 7820f5b6b..b3b117314 100644 --- a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/test/java/dev/sheldan/abstracto/experience/converter/LeaderBoardModelConverterTest.java +++ b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/test/java/dev/sheldan/abstracto/experience/converter/LeaderBoardModelConverterTest.java @@ -9,7 +9,6 @@ import dev.sheldan.abstracto.experience.models.LeaderBoardEntry; import dev.sheldan.abstracto.experience.models.database.AUserExperience; import dev.sheldan.abstracto.experience.models.templates.LeaderBoardEntryModel; import net.dv8tion.jda.api.entities.Member; -import net.dv8tion.jda.api.entities.User; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -33,58 +32,60 @@ public class LeaderBoardModelConverterTest { @Mock private MemberService memberService; + @Mock + private LeaderBoardModelConverter self; + private static final Long SERVER_ID = 4L; private static final Long USER_ID = 5L; private static final Long USER_ID_2 = 6L; + private static final Long USER_IN_SERVER_ID = 7L; + private static final Long USER_IN_SERVER_ID_2 = 8L; @Test public void testFromLeaderBoard() { Integer firstRank = 1; - Long firstExperience = 1L; - LeaderBoardEntry entry = getEntry(firstExperience, firstRank, USER_ID); + LeaderBoardEntry entry = getEntry(firstRank, USER_ID, USER_IN_SERVER_ID); Integer secondRank = 2; - Long secondExperience = 2L; - LeaderBoardEntry entry2 = getEntry(secondExperience, secondRank, USER_ID_2); + LeaderBoardEntryModel firstEntryModel = Mockito.mock(LeaderBoardEntryModel.class); + LeaderBoardEntryModel secondEntryModel = Mockito.mock(LeaderBoardEntryModel.class); + LeaderBoardEntry entry2 = getEntry(secondRank, USER_ID_2, USER_IN_SERVER_ID_2); List entries = Arrays.asList(entry, entry2); LeaderBoard leaderBoard = Mockito.mock(LeaderBoard.class); when(leaderBoard.getEntries()).thenReturn(entries); Member member = Mockito.mock(Member.class); when(memberService.getMemberInServerAsync(SERVER_ID, USER_ID)).thenReturn(CompletableFuture.completedFuture(member)); when(memberService.getMemberInServerAsync(SERVER_ID, USER_ID_2)).thenReturn(CompletableFuture.completedFuture(member)); + when(self.buildLeaderBoardModel(USER_IN_SERVER_ID, member, firstRank)).thenReturn(firstEntryModel); + when(self.buildLeaderBoardModel(USER_IN_SERVER_ID_2, member, secondRank)).thenReturn(secondEntryModel); List> leaderBoardEntryModels = testUnit.fromLeaderBoard(leaderBoard); LeaderBoardEntryModel firstEntry = leaderBoardEntryModels.get(0).join(); - Assert.assertEquals(firstRank, firstEntry.getRank()); - Assert.assertEquals(firstExperience, firstEntry.getExperience().getExperience()); + Assert.assertEquals(firstEntryModel, firstEntry); LeaderBoardEntryModel secondEntry = leaderBoardEntryModels.get(1).join(); - Assert.assertEquals(secondRank, secondEntry.getRank()); - Assert.assertEquals(secondExperience, secondEntry.getExperience().getExperience()); + Assert.assertEquals(secondEntryModel, secondEntry); Assert.assertEquals(entries.size(), leaderBoardEntryModels.size()); } @Test public void testFromEntry() { Integer rank = 2; - LeaderBoardEntry entry = getEntry(1L, rank, USER_ID); + LeaderBoardEntry entry = getEntry(rank, USER_ID, USER_IN_SERVER_ID); Member member = Mockito.mock(Member.class); - User user = Mockito.mock(User.class); - when(user.getIdLong()).thenReturn(USER_ID); - when(member.getUser()).thenReturn(user); + LeaderBoardEntryModel entryModelMock = Mockito.mock(LeaderBoardEntryModel.class); when(memberService.getMemberInServerAsync(SERVER_ID, USER_ID)).thenReturn(CompletableFuture.completedFuture(member)); + when(self.buildLeaderBoardModel(USER_IN_SERVER_ID, member, rank)).thenReturn(entryModelMock); CompletableFuture leaderBoardEntryModel = testUnit.fromLeaderBoardEntry(entry); LeaderBoardEntryModel entryModel = leaderBoardEntryModel.join(); - Assert.assertEquals(rank, entryModel.getRank()); - Assert.assertEquals(USER_ID, entryModel.getExperience().getUser().getUserReference().getId()); - Assert.assertEquals(USER_ID.longValue(), entryModel.getMember().getUser().getIdLong()); + Assert.assertEquals(entryModelMock, entryModel); } - private LeaderBoardEntry getEntry(Long experienceCount, Integer rank, Long userId) { + private LeaderBoardEntry getEntry(Integer rank, Long userId, Long userInServerId) { AUserExperience experience = Mockito.mock(AUserExperience.class); - when(experience.getExperience()).thenReturn(experienceCount); AUserInAServer userInAServer = Mockito.mock(AUserInAServer.class); when(experience.getUser()).thenReturn(userInAServer); AUser user = Mockito.mock(AUser.class); when(userInAServer.getUserReference()).thenReturn(user); + when(userInAServer.getUserInServerId()).thenReturn(userInServerId); when(user.getId()).thenReturn(userId); AServer server = Mockito.mock(AServer.class); when(server.getId()).thenReturn(SERVER_ID); diff --git a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/test/java/dev/sheldan/abstracto/experience/service/management/DisabledExpRoleManagementServiceBeanTest.java b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/test/java/dev/sheldan/abstracto/experience/service/management/DisabledExpRoleManagementServiceBeanTest.java index dfa68b3ed..87409bb7a 100644 --- a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/test/java/dev/sheldan/abstracto/experience/service/management/DisabledExpRoleManagementServiceBeanTest.java +++ b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/test/java/dev/sheldan/abstracto/experience/service/management/DisabledExpRoleManagementServiceBeanTest.java @@ -39,10 +39,12 @@ public class DisabledExpRoleManagementServiceBeanTest { @Test public void testIfRoleIsDisabled() { ARole aRole = Mockito.mock(ARole.class); - when(disabledExpRoleRepository.existsByRole(aRole)).thenReturn(true); + Long roleId = 1L; + when(aRole.getId()).thenReturn(roleId); + when(disabledExpRoleRepository.existsById(roleId)).thenReturn(true); boolean experienceDisabledForRole = testUnit.isExperienceDisabledForRole(aRole); Assert.assertTrue(experienceDisabledForRole); - verify(disabledExpRoleRepository, times(1)).existsByRole(aRole); + verify(disabledExpRoleRepository, times(1)).existsById(roleId); } @Test diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/converter/UserNotesConverter.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/converter/UserNotesConverter.java index 1bc8ce020..f840416c2 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/converter/UserNotesConverter.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/converter/UserNotesConverter.java @@ -55,7 +55,8 @@ public class UserNotesConverter { public List loadFullNotes(Map> futureHashMap) { List entryModels = new ArrayList<>(); futureHashMap.keySet().forEach(serverSpecificId -> { - Member member = futureHashMap.get(serverSpecificId).join(); + CompletableFuture memberFuture = futureHashMap.get(serverSpecificId); + Member member = !memberFuture.isCompletedExceptionally() ? memberFuture.join() : null; UserNote note = userNoteManagementService.loadNote(serverSpecificId.getServerId(), serverSpecificId.getId()); FullUserInServer fullUser = FullUserInServer .builder() diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/converter/WarnEntryConverter.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/converter/WarnEntryConverter.java index bd09d3bf8..88127cbf7 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/converter/WarnEntryConverter.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/converter/WarnEntryConverter.java @@ -57,25 +57,26 @@ public class WarnEntryConverter { public List loadFullWarnEntries(Map loadedWarnInfo) { List entries = new ArrayList<>(); loadedWarnInfo.keySet().forEach(warning -> { + Warning warn = warnManagementService.findById(warning.getId(), warning.getServerId()); FutureMemberPair memberPair = loadedWarnInfo.get(warning); - Member warnedMember = memberPair.getSecondMember().join(); + Member warnedMember = !memberPair.getSecondMember().isCompletedExceptionally() ? memberPair.getSecondMember().join() : null; FullUserInServer warnedUser = FullUserInServer .builder() .member(warnedMember) - .aUserInAServer(userInServerManagementService.loadOrCreateUser(warnedMember)) + .aUserInAServer(warn.getWarnedUser()) .build(); - Member warningMember = memberPair.getFirstMember().join(); + Member warningMember = !memberPair.getFirstMember().isCompletedExceptionally() ? memberPair.getFirstMember().join() : null; FullUserInServer warningUser = FullUserInServer .builder() .member(warningMember) - .aUserInAServer(userInServerManagementService.loadOrCreateUser(warningMember)) + .aUserInAServer(warn.getWarningUser()) .build(); WarnEntry entry = WarnEntry .builder() .warnedUser(warnedUser) .warningUser(warningUser) - .warning(warnManagementService.findById(warning.getId(), warning.getServerId())) + .warning(warn) .build(); entries.add(entry); }); diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/MuteServiceBean.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/MuteServiceBean.java index 7a9f3b082..d68a5435a 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/MuteServiceBean.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/MuteServiceBean.java @@ -339,11 +339,13 @@ public class MuteServiceBean implements MuteService { public CompletableFuture sendUnmuteLog(Long muteId, Guild guild, CompletableFuture mutingMemberFuture, CompletableFuture mutedMemberFuture) { Mute mute = muteManagementService.findMute(muteId, guild.getIdLong()); AServer mutingServer = serverManagementService.loadServer(guild.getIdLong()); + Member mutingMember = !mutingMemberFuture.isCompletedExceptionally() ? mutingMemberFuture.join() : null; + Member mutedMember = !mutedMemberFuture.isCompletedExceptionally() ? mutedMemberFuture.join() : null; UnMuteLog unMuteLog = UnMuteLog .builder() .mute(mute) - .mutingUser(mutingMemberFuture.join()) - .unMutedUser(mutedMemberFuture.join()) + .mutingUser(mutingMember) + .unMutedUser(mutedMember) .guild(guild) .build(); CompletableFuture notificationFuture = sendUnMuteLogMessage(unMuteLog, mutingServer); diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java index 85dc34b87..a54df3e63 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java @@ -2,6 +2,7 @@ package dev.sheldan.abstracto.moderation.service; import dev.sheldan.abstracto.core.models.FutureMemberPair; import dev.sheldan.abstracto.core.models.ServerSpecificId; +import dev.sheldan.abstracto.core.models.ServerUser; import dev.sheldan.abstracto.core.models.database.AServer; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.core.service.*; @@ -187,14 +188,25 @@ public class WarnServiceBean implements WarnService { warningsToDecay.forEach(warning -> { CompletableFuture warningMember = memberService.getMemberInServerAsync(warning.getWarningUser()); CompletableFuture warnedMember = memberService.getMemberInServerAsync(warning.getWarnedUser()); - FutureMemberPair futurePair = FutureMemberPair.builder().firstMember(warningMember).secondMember(warnedMember).build(); + FutureMemberPair futurePair = FutureMemberPair + .builder() + .firstMember(warningMember) + .secondMember(warnedMember) + .firstUser(ServerUser.fromAUserInAServer(warning.getWarningUser())) + .secondUser(ServerUser.fromAUserInAServer(warning.getWarnedUser())) + .build(); warningMembers.put(warning.getWarnId(), futurePair); + allFutures.add(warningMember); + allFutures.add(warnedMember); }); CompletableFuture sendingFuture = new CompletableFuture<>(); FutureUtils.toSingleFutureGeneric(allFutures).handle((aVoid, throwable) -> { self.renderAndSendWarnDecayLogs(serverId, warningMembers).thenAccept(aVoid1 -> sendingFuture.complete(null) - ); + ).exceptionally(throwable1 -> { + sendingFuture.completeExceptionally(throwable1); + return null; + }); return null; }); @@ -207,16 +219,23 @@ public class WarnServiceBean implements WarnService { AServer server = serverManagementService.loadServer(serverId); List warnDecayWarnings = new ArrayList<>(); warningMembers.keySet().forEach(serverSpecificId -> { - Warning warning = warnManagementService.findById(serverSpecificId.getId(), serverSpecificId.getServerId()); - FutureMemberPair pair = warningMembers.get(serverSpecificId); - // TODO add ids to render in case any member left the server - WarnDecayWarning warnDecayWarning = WarnDecayWarning - .builder() - .warningMember(pair.getFirstMember().join()) - .warnedMember(pair.getSecondMember().join()) - .warning(warning) - .build(); - warnDecayWarnings.add(warnDecayWarning); + try { + Warning warning = warnManagementService.findById(serverSpecificId.getId(), serverSpecificId.getServerId()); + FutureMemberPair pair = warningMembers.get(serverSpecificId); + Member warningMember = !pair.getFirstMember().isCompletedExceptionally() ? pair.getFirstMember().join() : null; + Member warnedMember = !pair.getSecondMember().isCompletedExceptionally() ? pair.getSecondMember().join() : null; + WarnDecayWarning warnDecayWarning = WarnDecayWarning + .builder() + .warningMember(warningMember) + .warningUser(pair.getFirstUser()) + .warnedMember(warnedMember) + .warnedUser(pair.getSecondUser()) + .warning(warning) + .build(); + warnDecayWarnings.add(warnDecayWarning); + } catch (Exception ex) { + log.error("exception.", ex); + } }); WarnDecayLogModel warnDecayLogModel = WarnDecayLogModel .builder() diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/converter/WarnEntryConverterTest.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/converter/WarnEntryConverterTest.java index 022ffd3bb..75d09d97e 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/converter/WarnEntryConverterTest.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/converter/WarnEntryConverterTest.java @@ -85,8 +85,12 @@ public class WarnEntryConverterTest { Warning warning2 = Mockito.mock(Warning.class); ServerSpecificId firstWarnId = new ServerSpecificId(SERVER_ID, WARN_ID_1); when(warning1.getWarnId()).thenReturn(firstWarnId); + when(warning1.getWarningUser()).thenReturn(warningUser); + when(warning1.getWarnedUser()).thenReturn(warnedUser); ServerSpecificId secondWarnId = new ServerSpecificId(SERVER_ID, WARN_ID_2); when(warning2.getWarnId()).thenReturn(secondWarnId); + when(warning2.getWarningUser()).thenReturn(warningUser); + when(warning2.getWarnedUser()).thenReturn(warnedUser); HashMap map = new HashMap<>(); FutureMemberPair memberPair = Mockito.mock(FutureMemberPair.class); when(memberPair.getFirstMember()).thenReturn(CompletableFuture.completedFuture(warningMember)); @@ -95,8 +99,6 @@ public class WarnEntryConverterTest { map.put(secondWarnId, memberPair); when(warnManagementService.findById(WARN_ID_1, SERVER_ID)).thenReturn(warning1); when(warnManagementService.findById(WARN_ID_2, SERVER_ID)).thenReturn(warning2); - when(userInServerManagementService.loadOrCreateUser(warnedMember)).thenReturn(warnedUser); - when(userInServerManagementService.loadOrCreateUser(warningMember)).thenReturn(warningUser); List models = testUnit.loadFullWarnEntries(map); Assert.assertEquals(2, models.size()); WarnEntry firstEntry = models.get(0); diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/WarnServiceBeanTest.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/WarnServiceBeanTest.java index cc4cef102..4266078fc 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/WarnServiceBeanTest.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/WarnServiceBeanTest.java @@ -2,6 +2,7 @@ package dev.sheldan.abstracto.moderation.service; import dev.sheldan.abstracto.core.models.ServerSpecificId; import dev.sheldan.abstracto.core.models.database.AServer; +import dev.sheldan.abstracto.core.models.database.AUser; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.core.models.property.SystemConfigProperty; import dev.sheldan.abstracto.core.service.*; @@ -103,6 +104,15 @@ public class WarnServiceBeanTest { @Mock private AUserInAServer secondWarnedUser; + @Mock + private AUser firstAUser; + + @Mock + private AUser secondAUser; + + @Mock + private AUser thirdAUser; + @Mock private Warning firstWarning; @@ -225,9 +235,15 @@ public class WarnServiceBeanTest { private void setupWarnings() { when(firstWarning.getWarningUser()).thenReturn(warningUser); when(secondWarning.getWarningUser()).thenReturn(warningUser); + when(warningUser.getServerReference()).thenReturn(server); + when(warningUser.getUserReference()).thenReturn(thirdAUser); when(firstWarning.getWarnedUser()).thenReturn(firstWarnedUser); + when(firstWarnedUser.getServerReference()).thenReturn(server); + when(firstWarnedUser.getUserReference()).thenReturn(firstAUser); when(secondWarning.getWarnedUser()).thenReturn(secondWarnedUser); + when(secondWarnedUser.getServerReference()).thenReturn(server); + when(secondWarnedUser.getUserReference()).thenReturn(secondAUser); when(firstWarning.getWarnId()).thenReturn(new ServerSpecificId(SERVER_ID, WARN_ID)); when(secondWarning.getWarnId()).thenReturn(new ServerSpecificId(SERVER_ID, 9L)); when(server.getId()).thenReturn(SERVER_ID); diff --git a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/job/WarnDecayWarning.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/job/WarnDecayWarning.java index ae0bd2eeb..6efcb66d9 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/job/WarnDecayWarning.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/job/WarnDecayWarning.java @@ -1,5 +1,6 @@ package dev.sheldan.abstracto.moderation.models.template.job; +import dev.sheldan.abstracto.core.models.ServerUser; import dev.sheldan.abstracto.moderation.models.database.Warning; import lombok.Builder; import lombok.Getter; @@ -26,4 +27,14 @@ public class WarnDecayWarning { * The user which casted the warn, is null if the user left the server */ private Member warningMember; + + /** + * The {@link ServerUser serverUser} which was warned, can be used in case the {@link Member warningMember} is null + */ + private ServerUser warningUser; + + /** + * The {@link ServerUser serverUser} who cast the warn, can be used in case the {@link Member warnedMember} is null + */ + private ServerUser warnedUser; } diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/converter/StarStatsUserConverter.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/converter/StarStatsUserConverter.java index ef2ae9f3c..69c8f8f43 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/converter/StarStatsUserConverter.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/converter/StarStatsUserConverter.java @@ -1,13 +1,14 @@ package dev.sheldan.abstracto.utility.repository.converter; -import dev.sheldan.abstracto.core.models.database.AUser; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.core.service.MemberService; import dev.sheldan.abstracto.core.service.management.UserInServerManagementService; +import dev.sheldan.abstracto.core.service.management.UserManagementService; import dev.sheldan.abstracto.utility.models.template.commands.starboard.StarStatsUser; import dev.sheldan.abstracto.utility.repository.StarStatsGuildUserResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @@ -22,6 +23,12 @@ public class StarStatsUserConverter { @Autowired private UserInServerManagementService userInServerManagementService; + @Autowired + private UserManagementService userManagementService; + + @Autowired + private StarStatsUserConverter self; + public List> convertToStarStatsUser(List users, Long serverId) { List> result = new ArrayList<>(); users.forEach(starStatsUserResult -> @@ -32,14 +39,18 @@ public class StarStatsUserConverter { private CompletableFuture createStarStatsUser(Long serverId, StarStatsGuildUserResult starStatsGuildUserResult) { AUserInAServer aUserInAServer = userInServerManagementService.loadOrCreateUser(starStatsGuildUserResult.getUserId()); - return memberService.getMemberInServerAsync(serverId, aUserInAServer.getUserReference().getId()).thenApply(member -> - StarStatsUser - .builder() - .starCount(starStatsGuildUserResult.getStarCount()) - .member(member) - // TODO properly load this instance instead of just building one - .user(AUser.builder().id(starStatsGuildUserResult.getUserId()).build()) - .build() - ); + return memberService.getMemberInServerAsync(serverId, aUserInAServer.getUserReference().getId()) + .thenApply(member -> self.loadStarStatsUser(starStatsGuildUserResult, member)) + .exceptionally(throwable -> self.loadStarStatsUser(starStatsGuildUserResult, null)); + } + + @Transactional + public StarStatsUser loadStarStatsUser(StarStatsGuildUserResult starStatsGuildUserResult, net.dv8tion.jda.api.entities.Member member) { + return StarStatsUser + .builder() + .starCount(starStatsGuildUserResult.getStarCount()) + .member(member) + .user(userInServerManagementService.loadOrCreateUser(starStatsGuildUserResult.getUserId())) + .build(); } } diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/test/java/dev/sheldan/abstracto/utility/repository/converter/StarStatsUserConverterTest.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/test/java/dev/sheldan/abstracto/utility/repository/converter/StarStatsUserConverterTest.java index c89ddda8f..b58b8e7c6 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/test/java/dev/sheldan/abstracto/utility/repository/converter/StarStatsUserConverterTest.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/test/java/dev/sheldan/abstracto/utility/repository/converter/StarStatsUserConverterTest.java @@ -10,6 +10,7 @@ import net.dv8tion.jda.api.entities.Member; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; @@ -33,13 +34,14 @@ public class StarStatsUserConverterTest { @Mock private UserInServerManagementService userInServerManagementService; + @Mock + private StarStatsUserConverter self; + @Test public void testConversionOfMultipleItems() { Long serverId = 5L; Long firstUserId = 5L; - Integer firstStarCount = 5; Long secondUserId = 9L; - Integer secondStarCount = 10; List results = new ArrayList<>(); StarStatsGuildUserResult firstResult = Mockito.mock(StarStatsGuildUserResult.class); Member firstMember = Mockito.mock(Member.class); @@ -50,7 +52,6 @@ public class StarStatsUserConverterTest { when(userInServerManagementService.loadOrCreateUser(firstUserId)).thenReturn(firstUser); when(memberService.getMemberInServerAsync(serverId, firstUserId)).thenReturn(CompletableFuture.completedFuture(firstMember)); when(firstResult.getUserId()).thenReturn(firstUserId); - when(firstResult.getStarCount()).thenReturn(firstStarCount); results.add(firstResult); StarStatsGuildUserResult secondResult = Mockito.mock(StarStatsGuildUserResult.class); Member secondMember = Mockito.mock(Member.class); @@ -62,19 +63,20 @@ public class StarStatsUserConverterTest { when(memberService.getMemberInServerAsync(serverId, secondUserId)).thenReturn(CompletableFuture.completedFuture(secondMember)); when(secondResult.getUserId()).thenReturn(secondUserId); - when(secondResult.getStarCount()).thenReturn(secondStarCount); results.add(secondResult); - List> starStatsUsers = testUnit.convertToStarStatsUser(results, serverId); - StarStatsUser firstConverted = starStatsUsers.get(0).join(); - Assert.assertEquals(firstStarCount, firstConverted.getStarCount()); - Assert.assertEquals(firstMember, firstConverted.getMember()); - Assert.assertEquals(firstUserId, firstConverted.getUser().getId()); - StarStatsUser secondConverted = starStatsUsers.get(1).join(); - Assert.assertEquals(secondStarCount, secondConverted.getStarCount()); - Assert.assertEquals(secondMember, secondConverted.getMember()); - Assert.assertEquals(secondUserId, secondConverted.getUser().getId()); - Assert.assertEquals(2, starStatsUsers.size()); + testUnit.convertToStarStatsUser(results, serverId); + ArgumentCaptor resultArgumentCaptor = ArgumentCaptor.forClass(StarStatsGuildUserResult.class); + ArgumentCaptor memberArgumentCaptor = ArgumentCaptor.forClass(Member.class); + verify(self, times(2)).loadStarStatsUser(resultArgumentCaptor.capture(), memberArgumentCaptor.capture()); + List resultCaptorValues = resultArgumentCaptor.getAllValues(); + Assert.assertEquals(2, resultCaptorValues.size()); + Assert.assertEquals(firstResult, resultCaptorValues.get(0)); + Assert.assertEquals(secondResult, resultCaptorValues.get(1)); + List memberCaptorValues = memberArgumentCaptor.getAllValues(); + Assert.assertEquals(2, memberCaptorValues.size()); + Assert.assertEquals(firstMember, memberCaptorValues.get(0)); + Assert.assertEquals(secondMember, memberCaptorValues.get(1)); } @Test diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/starboard/StarStatsUser.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/starboard/StarStatsUser.java index eb1cd9465..4309dd967 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/starboard/StarStatsUser.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/starboard/StarStatsUser.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.utility.models.template.commands.starboard; -import dev.sheldan.abstracto.core.models.database.AUser; +import dev.sheldan.abstracto.core.models.database.AUserInAServer; import lombok.Builder; import lombok.Getter; import lombok.Setter; @@ -11,7 +11,7 @@ import net.dv8tion.jda.api.entities.Member; @Setter @Builder public class StarStatsUser { - private AUser user; + private AUserInAServer user; private Member member; private Integer starCount; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/ListChannelGroups.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/ListChannelGroups.java index dd80f190f..5175984db 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/ListChannelGroups.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/ListChannelGroups.java @@ -59,14 +59,12 @@ public class ListChannelGroups extends AbstractConditionableCommand { List convertedChannels = new ArrayList<>(); group.getChannels().forEach(channel -> { Optional textChannelInGuild = channelService.getTextChannelFromServerOptional(channel.getServer().getId(), channel.getId()); - if(textChannelInGuild.isPresent()) { - ChannelGroupChannelModel convertedChannel = ChannelGroupChannelModel - .builder() - .channel(channel) - .discordChannel(textChannelInGuild.get()) - .build(); - convertedChannels.add(convertedChannel); - } + ChannelGroupChannelModel convertedChannel = ChannelGroupChannelModel + .builder() + .channel(channel) + .discordChannel(textChannelInGuild.orElse(null)) + .build(); + convertedChannels.add(convertedChannel); }); ChannelGroupModel channelGroup = ChannelGroupModel .builder() diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/DefaultFeatureModeManagementBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/DefaultFeatureModeManagementBean.java index 5e73a8595..97c5c132a 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/DefaultFeatureModeManagementBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/DefaultFeatureModeManagementBean.java @@ -41,11 +41,11 @@ public class DefaultFeatureModeManagementBean implements DefaultFeatureModeManag public Optional getFeatureModeOptional(AFeature feature, String mode) { return Optional.ofNullable(defaultConfigProperties .getFeatureModes() - .get(mode)); + .get(mode.toLowerCase())); } @Override public FeatureModeProperty getFeatureMode(AFeature feature, String mode) { - return getFeatureModeOptional(feature, mode).orElseThrow(() -> new FeatureModeNotFoundException(mode, featureConfigService.getFeatureModesFromFeatureAsString(feature.getKey()))); + return getFeatureModeOptional(feature, mode.toLowerCase()).orElseThrow(() -> new FeatureModeNotFoundException(mode, featureConfigService.getFeatureModesFromFeatureAsString(feature.getKey()))); } } diff --git a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/FutureMemberPair.java b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/FutureMemberPair.java index d83485897..3e9ee8b83 100644 --- a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/FutureMemberPair.java +++ b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/FutureMemberPair.java @@ -14,4 +14,6 @@ import java.util.concurrent.CompletableFuture; public class FutureMemberPair { private CompletableFuture firstMember; private CompletableFuture secondMember; + private ServerUser firstUser; + private ServerUser secondUser; } diff --git a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/ServerUser.java b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/ServerUser.java index 389f9598e..d9b8bba16 100644 --- a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/ServerUser.java +++ b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/ServerUser.java @@ -1,5 +1,6 @@ package dev.sheldan.abstracto.core.models; +import dev.sheldan.abstracto.core.models.database.AUserInAServer; import lombok.Builder; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -12,4 +13,11 @@ import lombok.Setter; public class ServerUser { private Long serverId; private Long userId; + + public static ServerUser fromAUserInAServer(AUserInAServer aUserInAServer) { + return ServerUser + .builder() + .serverId(aUserInAServer.getServerReference().getId()) + .userId(aUserInAServer.getUserReference().getId()).build(); + } } diff --git a/abstracto-application/documentation/src/main/docs/asciidoc/modules/experience.adoc b/abstracto-application/documentation/src/main/docs/asciidoc/modules/experience.adoc index 434974c8f..8db22ff9c 100644 --- a/abstracto-application/documentation/src/main/docs/asciidoc/modules/experience.adoc +++ b/abstracto-application/documentation/src/main/docs/asciidoc/modules/experience.adoc @@ -23,7 +23,7 @@ Showing the leader board of the server:: * Usage: `leaderboard [page]` * Description: Shows the leader board of the server in a paginated format. This does not use the interactive pagination. If no parameter is provided, it will show the top 10 members and their message count, level, experience and rank. -Additionally the same information for the user executing is shown, regardless whether or not the user is already shown on the given leader board page. +Additionally, the same information for the user executing is shown, regardless whether or not the user is already shown on the given leader board page. If a `page` is provided, it will display the leader board of the ranks `page * 10` until `(page + 1) * 10` instead. If `page` is beyond the member count, the last members are shown. diff --git a/abstracto-application/installer/src/main/resources/ansible/group_vars/all/python.yml b/abstracto-application/installer/src/main/resources/ansible/group_vars/all/python.yml deleted file mode 100644 index f1a3ed49c..000000000 --- a/abstracto-application/installer/src/main/resources/ansible/group_vars/all/python.yml +++ /dev/null @@ -1 +0,0 @@ -ansible_python_interpreter: /usr/bin/python3 diff --git a/abstracto-application/installer/src/main/resources/ansible/playbook.yaml b/abstracto-application/installer/src/main/resources/ansible/playbook.yaml deleted file mode 100644 index abed3beab..000000000 --- a/abstracto-application/installer/src/main/resources/ansible/playbook.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- - -- hosts: localhost - connection: local - gather_facts: no - roles: - - role: database - diff --git a/abstracto-application/installer/src/main/resources/ansible/roles/database/tasks/deploy_artifacts.yaml b/abstracto-application/installer/src/main/resources/ansible/roles/database/tasks/deploy_artifacts.yaml deleted file mode 100644 index 5a87f29db..000000000 --- a/abstracto-application/installer/src/main/resources/ansible/roles/database/tasks/deploy_artifacts.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- include_tasks: deploy_template_artifact.yaml - name: Deploying translations - vars: - group_id: "{{ artifact.group_id }}" - version: "{{ artifact.version }}" - with_items: "{{ artifact.modules }}" - loop_control: - loop_var: module diff --git a/abstracto-application/installer/src/main/resources/ansible/roles/database/tasks/deploy_liquibase_change_log.yaml b/abstracto-application/installer/src/main/resources/ansible/roles/database/tasks/deploy_liquibase_change_log.yaml deleted file mode 100644 index a6ae9e0d2..000000000 --- a/abstracto-application/installer/src/main/resources/ansible/roles/database/tasks/deploy_liquibase_change_log.yaml +++ /dev/null @@ -1,46 +0,0 @@ ---- - -- name: Prepare target directoy - delegate_to: localhost - file: - path: "{{ installer_base_dir }}/liquibase/{{ artifact.group_id }}/{{ artifact.module }}" - state: directory - mode: '0755' - -- name: "Download liquibase artifact {{ artifact.module }} in {{ artifact.group_id }}" - delegate_to: localhost - maven_artifact: - group_id: "{{ artifact.group_id }}" - artifact_id: "{{ artifact.module }}" - dest: "{{ installer_base_dir }}/liquibase/{{ artifact.group_id }}-{{ artifact.module }}.zip" - extension: zip - version: "{{ artifact.version }}" - repository_url: "file://{{ lookup('env','HOME') }}/.m2/repository" - classifier: liquibase - -- name: Extract artifact zip - delegate_to: localhost - unarchive: - src: "{{ installer_base_dir }}/liquibase/{{ artifact.group_id }}-{{ artifact.module }}.zip" - dest: "{{ installer_base_dir }}/liquibase/{{ artifact.group_id }}/{{ artifact.module }}" - -- name: Render liquibase.properties template - template: - src: liquibase.properties.j2 - dest: "{{ installer_base_dir }}/liquibase/{{ artifact.group_id }}/{{ artifact.module }}/liquibase.properties" - vars: - - change_log_file: "{{ installer_base_dir }}//liquibase/{{ artifact.group_id }}/{{ artifact.module }}/{{ artifact.file }}" - - -- name: Run liquibase migration - shell: "{{ liquibase_path }}/liquibase --defaultsFile={{ installer_base_dir }}/liquibase/{{ artifact.group_id }}/{{ artifact.module }}/liquibase.properties --liquibaseSchemaName=abstracto --liquibaseCatalogName=abstracto --logLevel=info update" - -- name: Cleanup folder - file: - path: "{{ installer_base_dir }}/liquibase/{{ artifact.group_id }}" - state: absent - -- name: Cleanup zip - file: - path: "{{ installer_base_dir }}/liquibase/{{ artifact.group_id }}-{{ artifact.module }}.zip" - state: absent \ No newline at end of file diff --git a/abstracto-application/installer/src/main/resources/ansible/roles/database/tasks/deploy_template_artifact.yaml b/abstracto-application/installer/src/main/resources/ansible/roles/database/tasks/deploy_template_artifact.yaml deleted file mode 100644 index f9e1c1b6a..000000000 --- a/abstracto-application/installer/src/main/resources/ansible/roles/database/tasks/deploy_template_artifact.yaml +++ /dev/null @@ -1,35 +0,0 @@ ---- - -- name: Prepare target directoy - delegate_to: localhost - file: - path: "{{ installer_base_dir }}/templates/{{ group_id }}/{{ module }}" - state: directory - mode: '0755' - -- name: Download template artifact {{ module }} in {{ group_id }} - delegate_to: localhost - maven_artifact: - group_id: "{{ group_id }}" - artifact_id: "{{ module }}" - dest: "{{ installer_base_dir }}/templates/{{ group_id }}-{{ module }}.zip" - extension: zip - version: "{{ version }}" - repository_url: "file://{{ lookup('env','HOME') }}/.m2/repository" - -- name: Extract artifact zip - delegate_to: localhost - unarchive: - src: "{{ installer_base_dir }}/templates/{{ group_id }}-{{ module }}.zip" - dest: "{{ installer_base_dir }}/templates/{{ group_id }}/{{ module }}" - -- name: Deploy templates - script: deploy_templates.py "{{ installer_base_dir }}/templates/{{ group_id }}/{{ module }}" - args: - executable: "{{ ansible_python_interpreter }}" - -- name: Cleanup folder - file: - path: "{{ installer_base_dir }}/templates/" - state: absent - diff --git a/abstracto-application/installer/src/main/resources/ansible/roles/database/tasks/main.yaml b/abstracto-application/installer/src/main/resources/ansible/roles/database/tasks/main.yaml deleted file mode 100644 index 440f640e7..000000000 --- a/abstracto-application/installer/src/main/resources/ansible/roles/database/tasks/main.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- name: Include custom variables - include_vars: - dir: "{{ installer_base_dir }}/ansible" - depth: 1 - -- include_tasks: deploy_liquibase_change_log.yaml - name: Deploying abstracto liquibase changelogs - with_items: "{{ liquibase_artifacts }}" - loop_control: - loop_var: artifact - when: execute_liquibase - - -- include_tasks: deploy_artifacts.yaml - name: Deploying abstracto templates - with_items: "{{ template_artifacts }}" - loop_control: - loop_var: artifact - when: execute_templates - - diff --git a/abstracto-application/installer/src/main/resources/ansible/roles/database/vars/main.yaml b/abstracto-application/installer/src/main/resources/ansible/roles/database/vars/main.yaml deleted file mode 100644 index c15a64371..000000000 --- a/abstracto-application/installer/src/main/resources/ansible/roles/database/vars/main.yaml +++ /dev/null @@ -1,19 +0,0 @@ -custom_template_artifacts: [] -liquibase_artifacts: [] - -db_credentials: - host: "{{ lookup('env','DB_HOST') }}" - port: "{{ lookup('env','DB_PORT') }}" - database: "{{ lookup('env','DB_NAME') }}" - user: "{{ lookup('env','DB_USER') }}" - password: "{{ lookup('env','DB_PASS') }}" - -liquibase_path: "{{ lookup('env','LIQUIBASE_PATH') }}" -postgres_driver_path: "{{ lookup('env','POSTGRES_DRIVER_PATH') }}" - -installer_base_dir: "/tmp/installer" - -execute_liquibase_input: yes -execute_templates_input: yes -execute_liquibase: "{{ True if (execute_liquibase_input | bool) else False }}" -execute_templates: "{{ True if (execute_templates_input | bool) else False }}" \ No newline at end of file diff --git a/bundled-licenses/not-packaged/ansible/COPYING b/bundled-licenses/not-packaged/ansible/COPYING deleted file mode 100644 index 94a9ed024..000000000 --- a/bundled-licenses/not-packaged/ansible/COPYING +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -.