Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
markozajc committed Apr 29, 2023
2 parents 5fb048e + 1b9edff commit 34802e1
Show file tree
Hide file tree
Showing 24 changed files with 232 additions and 311 deletions.
35 changes: 0 additions & 35 deletions .classpath

This file was deleted.

5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,8 @@
hs_err_pid*
/target/
/repository/

# IDE files
/.project
/.classpath
/.settings/
28 changes: 0 additions & 28 deletions .project

This file was deleted.

5 changes: 0 additions & 5 deletions .settings/org.eclipse.core.resources.prefs

This file was deleted.

133 changes: 0 additions & 133 deletions .settings/org.eclipse.jdt.core.prefs

This file was deleted.

4 changes: 0 additions & 4 deletions .settings/org.eclipse.m2e.core.prefs

This file was deleted.

4 changes: 0 additions & 4 deletions .settings/org.sonarlint.eclipse.core.prefs

This file was deleted.

18 changes: 0 additions & 18 deletions .travis.yml

This file was deleted.

38 changes: 30 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>com.github.markozajc</groupId>
<artifactId>akiwrapper</artifactId>
<version>1.5.2</version>
<version>1.5.2-2</version>

<name>Akiwrapper</name>
<description>A Java API wrapper for Akinator</description>
Expand Down Expand Up @@ -35,8 +35,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<junit.version>5.8.2</junit.version>
<slf4j.version>1.7.36</slf4j.version>
<junit.version>5.9.3</junit.version>
<slf4j.version>2.0.7</slf4j.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
Expand All @@ -47,7 +47,7 @@
<dependency>
<groupId>com.jcabi</groupId>
<artifactId>jcabi-xml</artifactId>
<version>0.23.2</version>
<version>0.27.2</version>
</dependency>

<!-- JSON parsing -->
Expand All @@ -61,7 +61,7 @@
<dependency>
<groupId>com.konghq</groupId>
<artifactId>unirest-java</artifactId>
<version>3.13.8</version>
<version>3.14.2</version>
</dependency>

<!-- Logging -->
Expand Down Expand Up @@ -101,7 +101,7 @@
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<version>4.6.0</version>
<version>4.7.3</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Expand All @@ -119,6 +119,28 @@
<build>
<plugins>

<!-- Version enforcer -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.2.5</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>

<!-- Javadoc -->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down Expand Up @@ -154,7 +176,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.10.0</version>
<version>2.11.0</version>
<configuration>
<rulesUri>file://${project.basedir}/versions-ruleset.xml</rulesUri>
</configuration>
Expand Down Expand Up @@ -218,4 +240,4 @@
</profile>
</profiles>

</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,11 @@ public class AkiwrapperBuilder {

private static final Logger LOG = LoggerFactory.getLogger(AkiwrapperBuilder.class);

@Nullable
private UnirestInstance unirest;
@Nullable
private Server server;
@Nullable private UnirestInstance unirest;
@Nullable private Server server;
private boolean filterProfanity;
@Nonnull
private Language language;
@Nonnull
private GuessType guessType;
@Nonnull private Language language;
@Nonnull private GuessType guessType;

/**
* The default profanity filter preference for new {@link Akiwrapper} instances.
Expand All @@ -50,14 +46,12 @@ public class AkiwrapperBuilder {
/**
* The default {@link Language} for new {@link Akiwrapper} instances.
*/
@Nonnull
public static final Language DEFAULT_LOCALIZATION = ENGLISH;
@Nonnull public static final Language DEFAULT_LOCALIZATION = ENGLISH;

/**
* The default {@link GuessType} for new {@link Akiwrapper} instances.
*/
@Nonnull
public static final GuessType DEFAULT_GUESS_TYPE = CHARACTER;
@Nonnull public static final GuessType DEFAULT_GUESS_TYPE = CHARACTER;

private AkiwrapperBuilder(@Nullable UnirestInstance unirest, @Nullable Server server, boolean filterProfanity,
@Nonnull Language language, @Nonnull GuessType guessType) {
Expand Down
Loading

0 comments on commit 34802e1

Please sign in to comment.