Skip to content

Commit

Permalink
fixup! Move repetitive Comparator declarations into Util class
Browse files Browse the repository at this point in the history
  • Loading branch information
Philzen committed Jun 18, 2024
1 parent 659bc83 commit 07691e4
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 15 deletions.
5 changes: 5 additions & 0 deletions src/main/java/org/philzen/oss/utils/AbstractUtilityClass.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package org.philzen.oss.utils;

public class AbstractUtilityClass {
AbstractUtilityClass() { }
}
4 changes: 1 addition & 3 deletions src/main/java/org/philzen/oss/utils/Class.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
import java.util.Optional;

@NonNullApi
public final class Class {

private Class() { }
public final class Class extends AbstractUtilityClass {

@Nullable
public static J.Annotation getAnnotation(J.ClassDeclaration classDeclaration, AnnotationMatcher annotation) {
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/org/philzen/oss/utils/Cleanup.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
import java.util.ArrayList;
import java.util.List;

public final class Cleanup {

private Cleanup() { }
public final class Cleanup extends AbstractUtilityClass {

/**
* Removes an annotation and cleans the space that it occupied.
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/org/philzen/oss/utils/Method.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@
import org.openrewrite.java.tree.JavaType;

@NonNullApi
public final class Method {
public final class Method extends AbstractUtilityClass {

private Method() { }

/**
* Whether this method is declared in a nested class and not on the main class scope
* @return Returns <code>null</code> in the fringe case that {@link J.MethodDeclaration#getMethodType()} is
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/org/philzen/oss/utils/Parser.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

import org.openrewrite.java.JavaParser;

public final class Parser {

private Parser() { }
public final class Parser extends AbstractUtilityClass {

private static final class JavaParserHolder {
static final JavaParser.Builder<?, ?> jupiter =
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/philzen/oss/utils/Sort.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

import java.util.Comparator;

public final class Sort {
public final class Sort extends AbstractUtilityClass {

public final static Comparator<J.Annotation> ABOVE = java.util.Comparator.comparing(J.Annotation::getSimpleName);
public final static Comparator<J.Annotation> BELOW = java.util.Comparator.comparing(J.Annotation::getSimpleName).reversed();
public static final Comparator<J.Annotation> ABOVE = java.util.Comparator.comparing(J.Annotation::getSimpleName);
public static final Comparator<J.Annotation> BELOW = java.util.Comparator.comparing(J.Annotation::getSimpleName).reversed();
}

0 comments on commit 07691e4

Please sign in to comment.