Skip to content

Reformat Java sources with open-java-format #12711

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.

Sign up for GitHub

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

Closed
bric3 wants to merge 1 commit into from
Closed

Reformat Java sources with open-java-format #12711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
30 changes: 15 additions & 15 deletions ...l-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/AdviceGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,26 @@
*/
public interface AdviceGenerator {

@Nonnull
CallSiteResult generate(@Nonnull CallSiteSpecification callSite);
@Nonnull
CallSiteResult generate(@Nonnull CallSiteSpecification callSite);

final class CallSiteResult extends BaseValidationContext {
final class CallSiteResult extends BaseValidationContext {

private final CallSiteSpecification specification;
private final CallSiteSpecification specification;

private final File file;
private final File file;

public CallSiteResult(@Nonnull final CallSiteSpecification specification, final File file) {
this.specification = specification;
this.file = file;
}
public CallSiteResult(@Nonnull final CallSiteSpecification specification, final File file) {
this.specification = specification;
this.file = file;
}

public CallSiteSpecification getSpecification() {
return specification;
}
public CallSiteSpecification getSpecification() {
return specification;
}

public File getFile() {
return file;
public File getFile() {
return file;
}
}
}
}
24 changes: 12 additions & 12 deletions ...e-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/AdvicePointcutParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
*/
public interface AdvicePointcutParser {

@Nonnull
MethodType parse(@Nonnull String signature);
@Nonnull
MethodType parse(@Nonnull String signature);

class SignatureParsingError extends HasErrorsException {
class SignatureParsingError extends HasErrorsException {

public SignatureParsingError(@Nonnull final HasErrors errors) {
super(errors);
}
public SignatureParsingError(@Nonnull final HasErrors errors) {
super(errors);
}

public SignatureParsingError(@Nonnull final Collection<Failure> errors) {
super(errors);
}
public SignatureParsingError(@Nonnull final Collection<Failure> errors) {
super(errors);
}

public SignatureParsingError(@Nonnull final Failure... errors) {
super(errors);
public SignatureParsingError(@Nonnull final Failure... errors) {
super(errors);
}
}
}
}
104 changes: 52 additions & 52 deletions ...-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/CallSiteReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,68 +15,68 @@

public interface CallSiteReporter {

void report(List<CallSiteResult> results, boolean error);
void report(List<CallSiteResult> results, boolean error);

static Set<CallSiteReporter> getReporter(PluginApplication.Configuration configuration) {
Set<CallSiteReporter> reporters = new HashSet<>();
for (String type : configuration.getReporters()) {
if ("CONSOLE".equals(type)) {
reporters.add(new ConsoleReporter());
} else if ("ERROR_CONSOLE".equals(type)) {
reporters.add(new ErrorConsoleReporter());
} else {
throw new IllegalArgumentException("Reporter of type '" + type + "' not supported");
}
static Set<CallSiteReporter> getReporter(PluginApplication.Configuration configuration) {
Set<CallSiteReporter> reporters = new HashSet<>();
for (String type : configuration.getReporters()) {
if ("CONSOLE".equals(type)) {
reporters.add(new ConsoleReporter());
} else if ("ERROR_CONSOLE".equals(type)) {
reporters.add(new ErrorConsoleReporter());
} else {
throw new IllegalArgumentException("Reporter of type '" + type + "' not supported");
}
}
return reporters;
}
return reporters;
}

abstract class FreemarkerReporter implements CallSiteReporter {
private final String templateName;
abstract class FreemarkerReporter implements CallSiteReporter {
private final String templateName;

protected FreemarkerReporter(final String templateName) {
this.templateName = templateName;
}
protected FreemarkerReporter(final String templateName) {
this.templateName = templateName;
}

protected void write(final List<CallSiteResult> results, final Writer writer) {
try {
final Configuration cfg = new Configuration(Configuration.VERSION_2_3_30);
cfg.setClassLoaderForTemplateLoading(Thread.currentThread().getContextClassLoader(), "csi");
cfg.setDefaultEncoding("UTF-8");
final Map<String, Object> input = new HashMap<>();
input.put("results", results);
final Template template = cfg.getTemplate(templateName);
template.process(input, writer);
} catch (final Exception e) {
throw new RuntimeException(e);
}
protected void write(final List<CallSiteResult> results, final Writer writer) {
try {
final Configuration cfg = new Configuration(Configuration.VERSION_2_3_30);
cfg.setClassLoaderForTemplateLoading(Thread.currentThread().getContextClassLoader(), "csi");
cfg.setDefaultEncoding("UTF-8");
final Map<String, Object> input = new HashMap<>();
input.put("results", results);
final Template template = cfg.getTemplate(templateName);
template.process(input, writer);
} catch (final Exception e) {
throw new RuntimeException(e);
}
}
}
}

class ConsoleReporter extends FreemarkerReporter {
protected ConsoleReporter() {
super("console.ftl");
}
class ConsoleReporter extends FreemarkerReporter {
protected ConsoleReporter() {
super("console.ftl");
}

@Override
public void report(final List<CallSiteResult> results, final boolean error) {
final PrintStream stream = error ? System.err : System.out;
final StringWriter writer = new StringWriter();
write(results, writer);
stream.println(writer);
@Override
public void report(final List<CallSiteResult> results, final boolean error) {
final PrintStream stream = error ? System.err : System.out;
final StringWriter writer = new StringWriter();
write(results, writer);
stream.println(writer);
}
}
}

class ErrorConsoleReporter extends FreemarkerReporter {
protected ErrorConsoleReporter() {
super("console.ftl");
}
class ErrorConsoleReporter extends FreemarkerReporter {
protected ErrorConsoleReporter() {
super("console.ftl");
}

@Override
public void report(final List<CallSiteResult> results, final boolean error) {
if (error) {
write(results, new PrintWriter(System.err));
}
@Override
public void report(final List<CallSiteResult> results, final boolean error) {
if (error) {
write(results, new PrintWriter(System.err));
}
}
}
}
}
6 changes: 3 additions & 3 deletions ...rc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/Extension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

public interface Extension {

boolean appliesTo(@Nonnull CallSiteSpecification spec);
boolean appliesTo(@Nonnull CallSiteSpecification spec);

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

List<Extension> EXTENSIONS = Collections.singletonList(new IastExtension());
List<Extension> EXTENSIONS = Collections.singletonList(new IastExtension());
}
Loading
Loading