Skip to content

Commit

Permalink
reformat
Browse files Browse the repository at this point in the history
Signed-off-by: Sergei Malafeev <sergeymalafeev@gmail.com>
  • Loading branch information
malafeev committed May 3, 2019
1 parent 95203a3 commit 2191c14
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 53 deletions.
4 changes: 3 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>io.opentracing.contrib</groupId>
<artifactId>opentracing-hazelcast</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,12 @@
import com.hazelcast.spi.serialization.SerializationServiceAware;
import io.opentracing.Span;
import io.opentracing.SpanContext;

import java.io.Serializable;
import java.util.Map;
import java.util.concurrent.Callable;

public class TracingCallable<V> implements Callable<V>, Serializable, HazelcastInstanceAware,
NodeAware, SerializationServiceAware {
NodeAware, SerializationServiceAware {

private final Callable<V> callable;
private final boolean traceWithActiveSpanOnly;
Expand Down Expand Up @@ -59,14 +58,16 @@ public void setHazelcastInstance(HazelcastInstance hazelcastInstance) {
}
}

@Override public void setNode(Node node) {
@Override
public void setNode(Node node) {
if (callable instanceof NodeAware) {
((NodeAware) callable).setNode(node);
}
}

@Override public void setSerializationService(
SerializationService serializationService) {
@Override
public void setSerializationService(
SerializationService serializationService) {
if (callable instanceof SerializationServiceAware) {
((SerializationServiceAware) callable).setSerializationService(serializationService);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import java.util.Map;

public class TracingRunnable implements Runnable, Serializable,
HazelcastInstanceAware, NodeAware, SerializationServiceAware {
HazelcastInstanceAware, NodeAware, SerializationServiceAware {

private final Runnable runnable;
private final boolean traceWithActiveSpanOnly;
Expand Down Expand Up @@ -58,14 +58,16 @@ public void setHazelcastInstance(HazelcastInstance hazelcastInstance) {
}
}

@Override public void setNode(Node node) {
@Override
public void setNode(Node node) {
if (runnable instanceof NodeAware) {
((NodeAware) runnable).setNode(node);
}
}

@Override public void setSerializationService(
SerializationService serializationService) {
@Override
public void setSerializationService(
SerializationService serializationService) {
if (runnable instanceof SerializationServiceAware) {
((SerializationServiceAware) runnable).setSerializationService(serializationService);
}
Expand Down
46 changes: 24 additions & 22 deletions src/test/java/io/opentracing/contrib/hazelcast/AwareCallable.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,38 +19,40 @@
import com.hazelcast.spi.NodeAware;
import com.hazelcast.spi.serialization.SerializationService;
import com.hazelcast.spi.serialization.SerializationServiceAware;

import java.io.Serializable;
import java.util.Objects;
import java.util.concurrent.Callable;

public class AwareCallable<V> implements Callable<V>, Serializable,
HazelcastInstanceAware, NodeAware, SerializationServiceAware {
HazelcastInstanceAware, NodeAware, SerializationServiceAware {

private HazelcastInstance hazelcastInstance;
private Node node;
private SerializationService serializationService;
private HazelcastInstance hazelcastInstance;
private Node node;
private SerializationService serializationService;

@Override
public void setHazelcastInstance(HazelcastInstance hazelcastInstance) {
this.hazelcastInstance = hazelcastInstance;
}
@Override
public void setHazelcastInstance(HazelcastInstance hazelcastInstance) {
this.hazelcastInstance = hazelcastInstance;
}

@Override public void setNode(Node node) {
@Override
public void setNode(Node node) {

this.node = node;
}
this.node = node;
}

@Override public void setSerializationService(
SerializationService serializationService) {
@Override
public void setSerializationService(
SerializationService serializationService) {

this.serializationService = serializationService;
}
this.serializationService = serializationService;
}

@Override public V call() {
Objects.requireNonNull(hazelcastInstance);
Objects.requireNonNull(node);
Objects.requireNonNull(serializationService);
return null;
}
@Override
public V call() {
Objects.requireNonNull(hazelcastInstance);
Objects.requireNonNull(node);
Objects.requireNonNull(serializationService);
return null;
}
}
44 changes: 23 additions & 21 deletions src/test/java/io/opentracing/contrib/hazelcast/AwareRunnable.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,36 +19,38 @@
import com.hazelcast.spi.NodeAware;
import com.hazelcast.spi.serialization.SerializationService;
import com.hazelcast.spi.serialization.SerializationServiceAware;

import java.io.Serializable;
import java.util.Objects;

public class AwareRunnable implements Runnable, Serializable,
HazelcastInstanceAware, NodeAware, SerializationServiceAware {
HazelcastInstanceAware, NodeAware, SerializationServiceAware {

private HazelcastInstance hazelcastInstance;
private Node node;
private SerializationService serializationService;
private HazelcastInstance hazelcastInstance;
private Node node;
private SerializationService serializationService;

@Override
public void setHazelcastInstance(HazelcastInstance hazelcastInstance) {
this.hazelcastInstance = hazelcastInstance;
}
@Override
public void setHazelcastInstance(HazelcastInstance hazelcastInstance) {
this.hazelcastInstance = hazelcastInstance;
}

@Override public void setNode(Node node) {
@Override
public void setNode(Node node) {

this.node = node;
}
this.node = node;
}

@Override public void setSerializationService(
SerializationService serializationService) {
@Override
public void setSerializationService(
SerializationService serializationService) {

this.serializationService = serializationService;
}
this.serializationService = serializationService;
}

@Override public void run() {
Objects.requireNonNull(hazelcastInstance);
Objects.requireNonNull(node);
Objects.requireNonNull(serializationService);
}
@Override
public void run() {
Objects.requireNonNull(hazelcastInstance);
Objects.requireNonNull(node);
Objects.requireNonNull(serializationService);
}
}

0 comments on commit 2191c14

Please sign in to comment.