Skip to content

Commit

Permalink
#1132 build is clean
Browse files Browse the repository at this point in the history
  • Loading branch information
@yegor256
yegor256 committed Jul 11, 2022
1 parent 2f4ef1d commit 581f9b5
Show file tree
Hide file tree
Showing 83 changed files with 54 additions and 163 deletions.
3 changes: 0 additions & 3 deletions .rultor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ assets:
settings.xml: yegor256/home#assets/takes/settings.xml
pubring.gpg: yegor256/home#assets/pubring.gpg
secring.gpg: yegor256/home#assets/secring.gpg
architect:
- paulodamaso
- yegor256
install: |
export LC_ALL=en_US.UTF-8
export LANG=en_US.UTF-8
Expand Down
2 changes: 0 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
[![Maven Central](https://img.shields.io/maven-central/v/org.takes/takes.svg)](https://maven-badges.herokuapp.com/maven-central/org.takes/takes)
[![PDD status](http://www.0pdd.com/svg?name=yegor256/takes)](http://www.0pdd.com/p?name=yegor256/takes)

Project architect: [@paulodamaso](https://github.com/paulodamaso)

**Takes** is a [true object-oriented](http://www.yegor256.com/2014/11/20/seven-virtues-of-good-object.html)
and [immutable](http://www.yegor256.com/2014/06/09/objects-should-be-immutable.html)
Java8 web development framework. Its key benefits, comparing to all others, include these
Expand Down
21 changes: 20 additions & 1 deletion src/it/file-manager/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ SOFTWARE.
<parent>
<groupId>com.jcabi</groupId>
<artifactId>parent</artifactId>
<version>0.57.2</version>
<version>0.58.0</version>
</parent>
<groupId>org.takes.test</groupId>
<artifactId>file-manager</artifactId>
Expand All @@ -50,21 +50,25 @@ SOFTWARE.
<dependency>
<groupId>com.jcabi</groupId>
<artifactId>jcabi-matchers</artifactId>
<version>1.5.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.jcabi</groupId>
<artifactId>jcabi-xml</artifactId>
<version>0.23.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.jcabi</groupId>
<artifactId>jcabi-http</artifactId>
<version>1.18.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -73,9 +77,22 @@ SOFTWARE.
<version>0.20.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.8.0-alpha2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -100,11 +117,13 @@ SOFTWARE.
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>7.0.1.Final</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
<version>3.0.1-b06</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/it/file-manager/src/verifier/verifications.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ SOFTWARE.
<files>
<file>
<location>LICENSE.txt</location>
<contains>2014-2019</contains>
<contains>2014-2022</contains>
</file>
</files>
</verifications>
1 change: 0 additions & 1 deletion src/main/java/org/takes/facets/auth/Token.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
*/
package org.takes.facets.auth;

import java.io.IOException;
import java.nio.charset.Charset;
import java.util.Base64;
import java.util.Calendar;
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/org/takes/facets/auth/XeIdentity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,10 @@
*/
package org.takes.facets.auth;

import java.io.IOException;
import java.util.Map;
import lombok.EqualsAndHashCode;
import org.takes.Request;
import org.takes.rs.xe.XeSource;
import org.takes.rs.xe.XeWrap;
import org.xembly.Directive;
import org.xembly.Directives;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/takes/facets/auth/social/PsGithub.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public Opt<Identity> enter(final Request request)
if (!code.hasNext()) {
throw new HttpException(
HttpURLConnection.HTTP_BAD_REQUEST,
"code is not provided by Github"
"'code' is not provided by Github"
);
}
return new Opt.Single<>(
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/takes/facets/cookies/TkJoinedCookies.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import java.util.regex.Pattern;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.takes.Request;
import org.takes.Response;
import org.takes.Take;
import org.takes.rs.RsWithHeader;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/takes/facets/fallback/FbEmpty.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
package org.takes.facets.fallback;

import lombok.EqualsAndHashCode;
import org.takes.Response;
import org.takes.misc.Opt;

/**
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/takes/facets/fallback/FbLog4j.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.apache.log4j.Logger;
import org.cactoos.bytes.BytesOf;
import org.cactoos.text.TextOf;
import org.takes.Response;
import org.takes.misc.Opt;
import org.takes.rq.RqHref;
import org.takes.rq.RqMethod;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/takes/facets/fallback/FbSlf4j.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.cactoos.text.TextOf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.takes.Response;
import org.takes.misc.Opt;
import org.takes.rq.RqHref;
import org.takes.rq.RqMethod;
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/org/takes/facets/fork/FkFixed.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
package org.takes.facets.fork;

import lombok.EqualsAndHashCode;
import org.takes.Request;
import org.takes.Response;
import org.takes.Take;
import org.takes.misc.Opt;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/takes/http/BkParallel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
package org.takes.http;

import java.io.IOException;
import java.net.Socket;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/takes/http/BkSafe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
*/
package org.takes.http;

import java.net.Socket;
import lombok.EqualsAndHashCode;

/**
Expand All @@ -40,6 +39,7 @@ public final class BkSafe extends BkWrap {
* Ctor.
* @param back Original back
*/
@SuppressWarnings("PMD.AvoidCatchingThrowable")
public BkSafe(final Back back) {
super(socket -> {
try {
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/org/takes/http/FtCli.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
import java.io.IOException;
import java.util.Arrays;
import lombok.EqualsAndHashCode;
import org.takes.Request;
import org.takes.Response;
import org.takes.Take;
import org.takes.rq.RqWithHeader;

Expand Down Expand Up @@ -91,7 +89,7 @@ public FtCli(final Take tks, final Iterable<String> args) {
public void start(final Exit exit) throws IOException {
final Take tks;
if (this.options.hitRefresh()) {
tks = request -> FtCli.this.take.act(
tks = request -> this.take.act(
new RqWithHeader(
request, "X-Takes-HitRefresh: yes"
)
Expand All @@ -116,7 +114,7 @@ public void start(final Exit exit) throws IOException {
final Thread thread = new Thread(
() -> {
try {
front.start(FtCli.this.exit(exit));
front.start(this.exit(exit));
} catch (final IOException ex) {
throw new IllegalStateException(ex);
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/takes/http/FtRemote.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
*
* @since 0.1
* @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
* @checkstyle ExecutableStatementCountCheck (500 lines)
*/
@EqualsAndHashCode
public final class FtRemote implements Front {
Expand Down Expand Up @@ -116,7 +117,7 @@ public void exec(final FtRemote.Script script) throws Exception {
final Thread thread = new Thread(
() -> {
try {
FtRemote.this.start(
this.start(
() -> {
latch.countDown();
return exit.get();
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/takes/http/MainRemote.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import lombok.EqualsAndHashCode;
import org.cactoos.Scalar;
import org.cactoos.bytes.BytesOf;
import org.cactoos.number.NumberOf;
import org.cactoos.text.TextOf;
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/org/takes/rs/xe/XeAppend.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,10 @@
*/
package org.takes.rs.xe;

import java.io.IOException;
import java.util.Arrays;
import lombok.EqualsAndHashCode;
import org.cactoos.Scalar;
import org.cactoos.scalar.IoChecked;
import org.xembly.Directive;
import org.xembly.Directives;

/**
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/org/takes/rs/xe/XeChain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,10 @@
*/
package org.takes.rs.xe;

import java.io.IOException;
import java.util.Arrays;
import lombok.EqualsAndHashCode;
import org.cactoos.Scalar;
import org.cactoos.scalar.IoChecked;
import org.xembly.Directive;
import org.xembly.Directives;

/**
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/takes/rs/xe/XeDate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import java.util.Locale;
import java.util.TimeZone;
import lombok.EqualsAndHashCode;
import org.xembly.Directive;
import org.xembly.Directives;

/**
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/takes/rs/xe/XeLifetime.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
package org.takes.rs.xe;

import lombok.EqualsAndHashCode;
import org.xembly.Directive;
import org.xembly.Directives;

/**
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/takes/rs/xe/XeLink.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
package org.takes.rs.xe;

import lombok.EqualsAndHashCode;
import org.xembly.Directive;
import org.xembly.Directives;

/**
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/org/takes/rs/xe/XeLinkHome.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@
*/
package org.takes.rs.xe;

import java.io.IOException;
import lombok.EqualsAndHashCode;
import org.takes.Request;
import org.takes.rq.RqHref;
import org.xembly.Directive;

/**
* Xembly source to create an HOME Atom LINK element.
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/org/takes/rs/xe/XeLinkSelf.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@
*/
package org.takes.rs.xe;

import java.io.IOException;
import lombok.EqualsAndHashCode;
import org.takes.Request;
import org.takes.rq.RqHref;
import org.xembly.Directive;

/**
* Xembly source to create an SELF Atom LINK element.
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/takes/rs/xe/XeLocalhost.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
import lombok.EqualsAndHashCode;
import org.xembly.Directive;
import org.xembly.Directives;

/**
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/takes/rs/xe/XeMemory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
package org.takes.rs.xe;

import lombok.EqualsAndHashCode;
import org.xembly.Directive;
import org.xembly.Directives;

/**
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/takes/rs/xe/XeSla.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

import java.lang.management.ManagementFactory;
import lombok.EqualsAndHashCode;
import org.xembly.Directive;
import org.xembly.Directives;

/**
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/takes/rs/xe/XeStylesheet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
package org.takes.rs.xe;

import lombok.EqualsAndHashCode;
import org.xembly.Directive;
import org.xembly.Directives;

/**
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/takes/rs/xe/XeTransform.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
*/
package org.takes.rs.xe;

import java.io.IOException;
import java.util.Iterator;
import lombok.EqualsAndHashCode;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/takes/rs/xe/XeWhen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
*/
package org.takes.rs.xe;

import java.io.IOException;
import lombok.EqualsAndHashCode;
import org.cactoos.Scalar;
import org.cactoos.scalar.IoChecked;
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/org/takes/servlet/HttpServletRequestFake.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

import java.io.BufferedReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
import java.security.Principal;
Expand All @@ -40,7 +39,6 @@
import javax.servlet.DispatcherType;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
Expand Down
Loading

3 comments on commit 581f9b5

@0pdd
Copy link
Collaborator

@0pdd 0pdd commented on 581f9b5 Jul 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 880-047513c4 disappeared from pom.xml), that's why I closed #1128. Please, remember that the puzzle was not necessarily removed in this particular commit. Maybe it happened earlier, but we discovered this fact only now.

@0pdd
Copy link
Collaborator

@0pdd 0pdd commented on 581f9b5 Jul 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 958-0a721823 disappeared from pom.xml), that's why I closed #1129. Please, remember that the puzzle was not necessarily removed in this particular commit. Maybe it happened earlier, but we discovered this fact only now.

@0pdd
Copy link
Collaborator

@0pdd 0pdd commented on 581f9b5 Jul 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 1088-edea3e4b disappeared from pom.xml), that's why I closed #1130. Please, remember that the puzzle was not necessarily removed in this particular commit. Maybe it happened earlier, but we discovered this fact only now.

Please sign in to comment.