From 57aef2f512cc9521582441387367c409379f688e Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Mon, 22 Mar 2021 22:38:10 +0000 Subject: [PATCH 1/3] java: add lint task to Makefile --- bindings/java/Makefile | 3 +++ bindings/java/build.gradle | 18 +++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/bindings/java/Makefile b/bindings/java/Makefile index 666fc6543..0e52ac5ce 100644 --- a/bindings/java/Makefile +++ b/bindings/java/Makefile @@ -8,6 +8,9 @@ SOURCE_DIR = $(realpath $(CURDIR)/../..) OUT_DIR = $(CURDIR)/c/build BUILD_DIR = $(OUT_DIR)/_cmake_build +lint: gradlew + ./gradlew --no-daemon clean spotlessCheck + build: gradlew $(OUT_DIR)/lib/libevmc-java.so mkdir -p ./java/build ./gradlew --no-daemon clean spotlessApply build diff --git a/bindings/java/build.gradle b/bindings/java/build.gradle index 377b74694..095b656e5 100644 --- a/bindings/java/build.gradle +++ b/bindings/java/build.gradle @@ -18,15 +18,15 @@ allprojects { apply plugin: 'com.diffplug.gradle.spotless' spotless { java { - // This path needs to be relative to each project - target fileTree('.') { - include '**/*.java' - exclude '**/.gradle/**' - } - importOrder 'org.ethereum', 'java', '' - trimTrailingWhitespace() - endWithNewline() - googleJavaFormat('1.7') + // This path needs to be relative to each project + target fileTree('.') { + include '**/*.java' + exclude '**/.gradle/**' + } + importOrder 'org.ethereum', 'java', '' + trimTrailingWhitespace() + endWithNewline() + googleJavaFormat('1.7') } } } From b1a15925ce5abeb4a3527722ae52680ab8eaf3e0 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Mon, 22 Mar 2021 22:38:57 +0000 Subject: [PATCH 2/3] circleci: add Java lint task --- circle.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index 7f393fc2b..79a729d4f 100644 --- a/circle.yml +++ b/circle.yml @@ -301,14 +301,15 @@ jobs: - checkout - build - test + - run: + name: "Java Lint (spotlessCheck)" + command: cd bindings/java && make lint - run: name: "Java Build" - command: | - cd bindings/java && make clean build + command: cd bindings/java && make clean build - run: name: "Java Test" - command: | - cd bindings/java && make test + command: cd bindings/java && make test bindings-rust: docker: From 8d7e3fb77c5dc9801dcd2073a35c23fbaf900000 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Mon, 22 Mar 2021 22:48:50 +0000 Subject: [PATCH 3/3] java: fix lint issues according to spotless --- .../java/org/ethereum/evmc/EvmcLoaderException.java | 6 +++--- .../java/src/main/java/org/ethereum/evmc/EvmcVm.java | 10 +++------- .../java/src/main/java/org/ethereum/evmc/Host.java | 10 +++------- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/bindings/java/java/src/main/java/org/ethereum/evmc/EvmcLoaderException.java b/bindings/java/java/src/main/java/org/ethereum/evmc/EvmcLoaderException.java index 0b3fca1e5..01faeb316 100644 --- a/bindings/java/java/src/main/java/org/ethereum/evmc/EvmcLoaderException.java +++ b/bindings/java/java/src/main/java/org/ethereum/evmc/EvmcLoaderException.java @@ -4,7 +4,7 @@ package org.ethereum.evmc; public class EvmcLoaderException extends Exception { - public EvmcLoaderException(String message) { - super(message); - } + public EvmcLoaderException(String message) { + super(message); + } } diff --git a/bindings/java/java/src/main/java/org/ethereum/evmc/EvmcVm.java b/bindings/java/java/src/main/java/org/ethereum/evmc/EvmcVm.java index 8d9017775..1985e56a5 100644 --- a/bindings/java/java/src/main/java/org/ethereum/evmc/EvmcVm.java +++ b/bindings/java/java/src/main/java/org/ethereum/evmc/EvmcVm.java @@ -3,8 +3,6 @@ // Licensed under the Apache License, Version 2.0. package org.ethereum.evmc; -import org.ethereum.evmc.EvmcLoaderException; - import java.nio.ByteBuffer; import java.util.Objects; @@ -21,7 +19,7 @@ public final class EvmcVm implements AutoCloseable { * This method loads the specified evm shared library and loads/initializes the jni bindings. * * @param filename /path/filename of the evm shared object - * @throws EvmcLoaderException + * @throws org.ethereum.evmc.EvmcLoaderException */ public static EvmcVm create(String filename) throws EvmcLoaderException { if (!EvmcVm.isEvmcLibraryLoaded) { @@ -49,7 +47,7 @@ private EvmcVm(String filename) throws EvmcLoaderException { * * @param Path to the dynamic object representing the EVM implementation. * @return Internal object pointer. - * @throws EvmcLoaderException + * @throws org.ethereum.evmc.EvmcLoaderException */ private static native ByteBuffer load_and_create(String filename) throws EvmcLoaderException; @@ -152,9 +150,7 @@ public int set_option(String name, String value) { /** get size of result struct */ private static native int get_result_size(); - /** - * This method cleans up resources. - */ + /** This method cleans up resources. */ @Override public void close() { destroy(nativeVm); diff --git a/bindings/java/java/src/main/java/org/ethereum/evmc/Host.java b/bindings/java/java/src/main/java/org/ethereum/evmc/Host.java index 249ac601d..5cf9fe8bb 100644 --- a/bindings/java/java/src/main/java/org/ethereum/evmc/Host.java +++ b/bindings/java/java/src/main/java/org/ethereum/evmc/Host.java @@ -3,12 +3,7 @@ // Licensed under the Apache License, Version 2.0. package org.ethereum.evmc; -import static java.util.Objects.requireNonNull; - import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; /** * The Host interface. @@ -16,10 +11,11 @@ *

The set of all callback functions expected by VM instances. */ final class Host { - static private ByteBuffer ensureDirectBuffer(ByteBuffer input) { + private static ByteBuffer ensureDirectBuffer(ByteBuffer input) { // Reallocate if needed. - if (!input.isDirect()) + if (!input.isDirect()) { return ByteBuffer.allocateDirect(input.remaining()).put(input); + } return input; }