Skip to content

Improvement to PR #549 - create a separate facet for utilities #550

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 29, 2022
Merged

Improvement to PR #549 - create a separate facet for utilities #550

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions application/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ dependencies {
implementation 'org.jetbrains:annotations:23.0.0'

implementation project(':database')
implementation project(':utils')

implementation 'net.dv8tion:JDA:5.0.0-alpha.9'

Expand Down
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/commands/basic/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.commands.basic;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/commands/componentids/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.commands.componentids;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/commands/filesharing/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.commands.filesharing;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/commands/help/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.commands.help;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion ...main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/api/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.commands.mathcommands.wolframalpha.api;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion ...src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.commands.mathcommands.wolframalpha;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/commands/moderation/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.commands.moderation;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/commands/moderation/scam/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.commands.moderation.scam;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.commands.moderation.temp;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/commands/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.commands;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/commands/reminder/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.commands.reminder;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/commands/system/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.commands.system;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/commands/tags/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.commands.tags;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/commands/tophelper/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.commands.tophelper;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/commands/utils/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.commands.utils;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/config/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.config;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/logging/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.logging;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/routines/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.routines;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 1 addition & 1 deletion application/src/test/java/org/togetherjava/tjbot/jda/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.jda;

import org.togetherjava.tjbot.misc.MethodsReturnNonnullByDefault;
import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
2 changes: 2 additions & 0 deletions database/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ dependencies {
implementation "org.xerial:sqlite-jdbc:${sqliteVersion}"
implementation 'org.flywaydb:flyway-core:9.2.0'
implementation 'org.jooq:jooq:3.17.2'

implementation project(':utils')
}

1 change: 1 addition & 0 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ rootProject.name = 'TJ-Bot'
include 'application'
include 'database'
include 'formatter'
include 'utils'
// NOTE The logviewer does not properly work as of today.
// But it is causing major build slowdowns, so we exclude it for the time being.
// include 'logviewer'
Expand Down
7 changes: 7 additions & 0 deletions utils/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
plugins {
id 'java'
}
dependencies {
implementation 'com.google.code.findbugs:jsr305:3.0.2'
}

2 changes: 1 addition & 1 deletion ...t/misc/MethodsReturnNonnullByDefault.java → ...ations/MethodsReturnNonnullByDefault.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.togetherjava.tjbot.misc;
package org.togetherjava.tjbot.annotations;

import javax.annotation.Nonnull;
import javax.annotation.meta.TypeQualifierDefault;
Expand Down
4 changes: 2 additions & 2 deletions ...togetherjava/tjbot/misc/package-info.java → ...rjava/tjbot/annotations/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* Package for all miscellaneous topics, such as general purpose utilities.
* Package for custom annotations.
*/
@MethodsReturnNonnullByDefault
@ParametersAreNonnullByDefault
package org.togetherjava.tjbot.misc;
package org.togetherjava.tjbot.annotations;

import javax.annotation.ParametersAreNonnullByDefault;