Skip to content

Commit e2a4048

Browse files
committed
chore: reformat Java sources with Prince of Space 2.3.0
1 parent 374c313 commit e2a4048

6,090 files changed

Lines changed: 121816 additions & 100378 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/AdviceGenerator.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,11 @@
1010
* {@link datadog.trace.agent.tooling.csi.CallSiteAdvice} interface
1111
*/
1212
public interface AdviceGenerator {
13-
1413
@Nonnull
1514
CallSiteResult generate(@Nonnull CallSiteSpecification callSite);
1615

1716
final class CallSiteResult extends BaseValidationContext {
18-
1917
private final CallSiteSpecification specification;
20-
2118
private final File file;
2219

2320
public CallSiteResult(@Nonnull final CallSiteSpecification specification, final File file) {

‎buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/AdvicePointcutParser.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@
1111
* {@link MethodType} instance.
1212
*/
1313
public interface AdvicePointcutParser {
14-
1514
@Nonnull
1615
MethodType parse(@Nonnull String signature);
1716

1817
class SignatureParsingError extends HasErrorsException {
19-
2018
public SignatureParsingError(@Nonnull final HasErrors errors) {
2119
super(errors);
2220
}

‎buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/CallSiteReporter.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import java.util.Set;
1515

1616
public interface CallSiteReporter {
17-
1817
void report(List<CallSiteResult> results, boolean error);
1918

2019
static Set<CallSiteReporter> getReporter(PluginApplication.Configuration configuration) {

‎buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/Extension.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import javax.annotation.Nonnull;
1010

1111
public interface Extension {
12-
1312
boolean appliesTo(@Nonnull CallSiteSpecification spec);
1413

1514
void apply(@Nonnull Configuration configuration, @Nonnull CallSiteResult result) throws Exception;

‎buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/HasErrors.java‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import javax.annotation.Nonnull;
1313

1414
public interface HasErrors {
15-
1615
List<Failure> getErrors();
1716

1817
void addError(@Nonnull Failure failure);
@@ -22,7 +21,10 @@ default void addError(@Nonnull final ErrorCode error, final Object... args) {
2221
}
2322

2423
default void addError(
25-
@Nonnull final Throwable cause, @Nonnull final ErrorCode error, final Object... args) {
24+
@Nonnull final Throwable cause,
25+
@Nonnull final ErrorCode error,
26+
final Object... args
27+
) {
2628
addError(new Failure(cause, error, args));
2729
}
2830

@@ -44,7 +46,8 @@ public Failure(@Nonnull final ErrorCode error, @Nonnull final Object... params)
4446
public Failure(
4547
@Nonnull final Throwable cause,
4648
@Nonnull final ErrorCode error,
47-
@Nonnull final Object... params) {
49+
@Nonnull final Object... params
50+
) {
4851
this.error = error;
4952
this.params = params;
5053
this.cause = cause;
@@ -82,7 +85,6 @@ public String toString() {
8285
}
8386

8487
class HasErrorsImpl implements HasErrors {
85-
8688
private final List<Failure> errors;
8789

8890
public HasErrorsImpl(@Nonnull final Collection<Failure> errors) {
@@ -135,17 +137,21 @@ public void addError(@Nonnull final Failure failure) {
135137
}
136138

137139
private static String buildMessage(@Nonnull final HasErrors errors) {
138-
return errors.getErrors().stream()
139-
.map(Failure::getMessage)
140-
.collect(Collectors.joining(" | "));
140+
return errors
141+
.getErrors()
142+
.stream()
143+
.map(Failure::getMessage)
144+
.collect(Collectors.joining(" | "));
141145
}
142146

143147
private static Throwable firstCause(@Nonnull final HasErrors errors) {
144-
return errors.getErrors().stream()
145-
.map(Failure::getCause)
146-
.filter(Objects::nonNull)
147-
.findFirst()
148-
.orElse(null);
148+
return errors
149+
.getErrors()
150+
.stream()
151+
.map(Failure::getCause)
152+
.filter(Objects::nonNull)
153+
.findFirst()
154+
.orElse(null);
149155
}
150156
}
151157
}

‎buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/PluginApplication.java‎

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static datadog.trace.plugin.csi.impl.CallSiteFactory.adviceGenerator;
44
import static datadog.trace.plugin.csi.impl.CallSiteFactory.specificationBuilder;
55
import static datadog.trace.plugin.csi.impl.CallSiteFactory.typeResolver;
6-
76
import datadog.trace.plugin.csi.AdviceGenerator.CallSiteResult;
87
import datadog.trace.plugin.csi.impl.CallSiteSpecification;
98
import datadog.trace.plugin.csi.util.CallSiteUtils;
@@ -25,7 +24,6 @@
2524
import java.util.stream.Collectors;
2625

2726
public class PluginApplication {
28-
2927
public static void main(final String[] args) {
3028
try {
3129
final Path parameters = getParameters(args);
@@ -43,48 +41,51 @@ public static void main(final String[] args) {
4341
}
4442

4543
private static Function<CallSiteSpecification, CallSiteResult> generateAdviceClosure(
46-
final Configuration configuration) {
44+
final Configuration configuration
45+
) {
4746
final AdviceGenerator adviceGenerator = getAdviceGenerator(configuration);
4847
return spec -> {
4948
final CallSiteResult result = adviceGenerator.generate(spec);
5049
if (result.isSuccess()) {
51-
Extension.EXTENSIONS.stream()
52-
.filter(ext -> ext.appliesTo(spec))
53-
.forEach(
54-
ext -> {
55-
try {
56-
ext.apply(configuration, result);
57-
} catch (final Throwable e) {
58-
result.addError(e, ErrorCode.EXTENSION_ERROR, ext.getClass());
59-
}
60-
});
50+
Extension.EXTENSIONS
51+
.stream()
52+
.filter(ext -> ext.appliesTo(spec))
53+
.forEach(ext -> {
54+
try {
55+
ext.apply(configuration, result);
56+
} catch (final Throwable e) {
57+
result.addError(e, ErrorCode.EXTENSION_ERROR, ext.getClass());
58+
}
59+
});
6160
}
6261
return result;
6362
};
6463
}
6564

6665
private static void printReport(
67-
final Configuration configuration, final List<CallSiteResult> result, final boolean failed) {
68-
CallSiteReporter.getReporter(configuration)
69-
.forEach(reporter -> reporter.report(result, failed));
66+
final Configuration configuration,
67+
final List<CallSiteResult> result,
68+
final boolean failed
69+
) {
70+
CallSiteReporter
71+
.getReporter(configuration)
72+
.forEach(reporter -> reporter.report(result, failed));
7073
}
7174

7275
private static List<CallSiteSpecification> searchForCallSites(final Configuration configuration) {
7376
try {
7477
final SpecificationBuilder builder = specificationBuilder();
7578
final List<CallSiteSpecification> result = new ArrayList<>();
7679
final Pattern pattern = Pattern.compile(".*" + configuration.suffix + "\\.class$");
77-
Files.walkFileTree(
78-
configuration.classesFolder,
79-
new SimpleFileVisitor<Path>() {
80-
public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) {
81-
if (Files.isRegularFile(file)
82-
&& pattern.matcher(file.getFileName().toString()).matches()) {
83-
builder.build(file.toFile()).ifPresent(result::add);
84-
}
85-
return FileVisitResult.CONTINUE;
86-
}
87-
});
80+
Files.walkFileTree(configuration.classesFolder, new SimpleFileVisitor<Path>() {
81+
public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) {
82+
if (Files.isRegularFile(file)
83+
&& pattern.matcher(file.getFileName().toString()).matches()) {
84+
builder.build(file.toFile()).ifPresent(result::add);
85+
}
86+
return FileVisitResult.CONTINUE;
87+
}
88+
});
8889
return result;
8990
} catch (IOException e) {
9091
throw new RuntimeException(e);
@@ -110,7 +111,13 @@ private static Configuration getConfiguration(final Path parameters) {
110111
final List<Path> classPaths =
111112
lines.stream().skip(5).map(Paths::get).collect(Collectors.toList());
112113
return new Configuration(
113-
projectFolder, classesFolder, targetFolder, classPaths, suffix, reporters);
114+
projectFolder,
115+
classesFolder,
116+
targetFolder,
117+
classPaths,
118+
suffix,
119+
reporters
120+
);
114121
} catch (IOException e) {
115122
throw new RuntimeException(e);
116123
}
@@ -119,7 +126,8 @@ private static Configuration getConfiguration(final Path parameters) {
119126
private static Path getParameters(final String[] args) {
120127
if (args.length != 1) {
121128
throw new IllegalArgumentException(
122-
"The application expected a single parameter with the configuration");
129+
"The application expected a single parameter with the configuration"
130+
);
123131
}
124132
final Path parameters = Paths.get(args[0]);
125133
if (!Files.exists(parameters)) {
@@ -142,7 +150,8 @@ public Configuration(
142150
final Path targetFolder,
143151
final List<Path> classPath,
144152
final String suffix,
145-
final List<String> reporters) {
153+
final List<String> reporters
154+
) {
146155
this.srcFolder = srcFolder;
147156
this.classesFolder = classesFolder;
148157
this.targetFolder = targetFolder;

‎buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/SpecificationBuilder.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
* implementors should return an empty optional
1414
*/
1515
public interface SpecificationBuilder {
16-
1716
@Nonnull
1817
Optional<CallSiteSpecification> build(@Nonnull File classFile);
1918
}

‎buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/TypeResolver.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99
import org.objectweb.asm.Type;
1010

1111
public interface TypeResolver extends TypeSolver {
12-
1312
@Nonnull
1413
Class<?> resolveType(@Nonnull Type type) throws ResolutionException;
1514

1615
@Nonnull
1716
Executable resolveMethod(@Nonnull MethodType method) throws ResolutionException;
1817

1918
class ResolutionException extends HasErrorsException {
20-
2119
public ResolutionException(@Nonnull final HasErrors errors) {
2220
super(errors);
2321
}

‎buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/Validatable.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
import javax.annotation.Nonnull;
44

55
public interface Validatable {
6-
76
void validate(@Nonnull ValidationContext context);
87
}

‎buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/ValidationContext.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ public interface ValidationContext extends HasErrors {
1010
void addContextProperty(@Nonnull String name, Object object);
1111

1212
class BaseValidationContext extends HasErrorsImpl implements ValidationContext {
13-
1413
private final Map<String, Object> context = new HashMap<>();
1514

1615
@SuppressWarnings("unchecked")

0 commit comments

Comments
 (0)