Skip to content
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.

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

IGNITE-13197: Import order rule added. #7978

Merged
merged 8 commits into from
Jul 2, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
IGNITE-13197: Revert unnecessary changes.
  • Loading branch information
nizhikov committed Jul 2, 2020
commit eaaf9579413a61a6e0455bd5bdba92be5a36a020
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.io.StringWriter;
import java.lang.management.ManagementFactory;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -57,7 +56,7 @@ public class GridDebug {
private static final FileOutputStream out;

/** */
private static final Charset charset = StandardCharsets.UTF_8;
private static final Charset charset = Charset.forName("UTF-8");

/** */
private static volatile long start;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ private static class TestClass1 {
/** */
@SuppressWarnings("unused")
@GridToStringOrder(0)
private final String id = "1234567890";
private String id = "1234567890";

/** */
@SuppressWarnings("unused")
Expand All @@ -710,7 +710,7 @@ private static class TestClass1 {

/** */
@SuppressWarnings("unused")
private final String name = "qwertyuiopasdfghjklzxcvbnm";
private String name = "qwertyuiopasdfghjklzxcvbnm";

/** */
@SuppressWarnings("unused")
Expand Down Expand Up @@ -799,7 +799,7 @@ private static class TestClass2 {
/** */
@SuppressWarnings("unused")
@GridToStringInclude
private final String str;
private String str;

/** */
@GridToStringInclude
Expand All @@ -822,7 +822,7 @@ private static class Parent {

/** */
@GridToStringInclude
private final Parent[] pa = new Parent[1];
private Parent pa[] = new Parent[1];

/** {@inheritDoc} */
@Override public String toString() {
Expand All @@ -839,7 +839,7 @@ private static class Child extends Parent {

/** */
@GridToStringInclude
private final Parent[] pb = new Parent[1];
private Parent pb[] = new Parent[1];

/** {@inheritDoc} */
@Override public String toString() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ public class AlignedBuffersDirectFileIO extends AbstractFileIO {
private final IgniteLogger log;

/** Thread local with buffers with capacity = one page {@link #pageSize} and aligned using {@link #ioBlockSize}. */
private final ThreadLocal<ByteBuffer> tlbOnePageAligned;
private ThreadLocal<ByteBuffer> tlbOnePageAligned;

/** Managed aligned buffers. Used to check if buffer is applicable for direct IO our data should be copied. */
private final ConcurrentHashMap<Long, Thread> managedAlignedBuffers;
private ConcurrentHashMap<Long, Thread> managedAlignedBuffers;

/** File descriptor. */
private int fd = -1;
Expand Down Expand Up @@ -210,7 +210,7 @@ else if (mode == StandardOpenOption.SYNC)
@Override public void position(long newPosition) throws IOException {
if (IgniteNativeIoLib.lseek(fdCheckOpened(), newPosition, IgniteNativeIoLib.SEEK_SET) < 0) {
throw new IOException(String.format("Error setting file [%s] position to [%s]: %s",
file, newPosition, getLastError()));
file, Long.toString(newPosition), getLastError()));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.jetbrains.annotations.Nullable;
import org.springframework.data.domain.Range;
import org.springframework.data.domain.Range.Bound;
import org.springframework.data.repository.query.SpelQueryContext;
import org.springframework.data.repository.query.SpelQueryContext.SpelExtractor;
import org.springframework.data.domain.Range;
import org.springframework.data.domain.Range.Bound;
import org.springframework.data.repository.query.parser.Part.Type;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
Expand Down