Skip to content

Replace square javapoet with palantir one #448

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

Merged
merged 1 commit into from
Sep 8, 2025
Merged

Replace square javapoet with palantir one #448

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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...mmon/src/main/java/ru/tinkoff/kora/annotation/processor/common/AbstractKoraProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.tinkoff.kora.annotation.processor.common;

import com.squareup.javapoet.ClassName;
import com.palantir.javapoet.ClassName;
import jakarta.annotation.Nullable;

import javax.annotation.processing.AbstractProcessor;
Expand Down
6 changes: 3 additions & 3 deletions ...sor-common/src/main/java/ru/tinkoff/kora/annotation/processor/common/AnnotationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ru.tinkoff.kora.annotation.processor.common;

import com.squareup.javapoet.AnnotationSpec;
import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock;
import com.palantir.javapoet.AnnotationSpec;
import com.palantir.javapoet.ClassName;
import com.palantir.javapoet.CodeBlock;
import jakarta.annotation.Nullable;

import javax.lang.model.element.AnnotationMirror;
Expand Down
2 changes: 1 addition & 1 deletion ...or-common/src/main/java/ru/tinkoff/kora/annotation/processor/common/CommonClassNames.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.tinkoff.kora.annotation.processor.common;

import com.squareup.javapoet.ClassName;
import com.palantir.javapoet.ClassName;

import java.util.List;

Expand Down
4 changes: 2 additions & 2 deletions ...ocessor-common/src/main/java/ru/tinkoff/kora/annotation/processor/common/CommonUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.tinkoff.kora.annotation.processor.common;

import com.squareup.javapoet.*;
import com.palantir.javapoet.*;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;

Expand Down Expand Up @@ -185,7 +185,7 @@ public static boolean doesImplement(TypeMirror type, ClassName i) {
for (var anInterface : typeElement.getInterfaces()) {
var interfaceType = TypeName.get(anInterface);
if (interfaceType instanceof ParameterizedTypeName ptn) {
if (ptn.rawType.equals(i)) {
if (ptn.rawType().equals(i)) {
return true;
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...cessor-common/src/main/java/ru/tinkoff/kora/annotation/processor/common/FieldFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.tinkoff.kora.annotation.processor.common;

import com.squareup.javapoet.*;
import com.palantir.javapoet.*;
import jakarta.annotation.Nullable;

import javax.lang.model.element.Element;
Expand Down Expand Up @@ -121,7 +121,7 @@ public String add(@Nullable CommonUtils.MappingData mapping, TypeName defaultTyp
? defaultType
: TypeName.get(Objects.requireNonNull(mapping.mapperClass()));
var typeElement = typeName instanceof ParameterizedTypeName ptn
? this.elements.getTypeElement(ptn.rawType.canonicalName())
? this.elements.getTypeElement(ptn.rawType().canonicalName())
: this.elements.getTypeElement(((ClassName) typeName).canonicalName());

var key = new FieldKey(typeName, tags);
Expand Down
3 changes: 1 addition & 2 deletions ...processor-common/src/main/java/ru/tinkoff/kora/annotation/processor/common/NameUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package ru.tinkoff.kora.annotation.processor.common;

import com.squareup.javapoet.ClassName;
import com.palantir.javapoet.ClassName;

import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.TypeElement;

public class NameUtils {

Expand Down
10 changes: 5 additions & 5 deletions ...-common/src/main/java/ru/tinkoff/kora/annotation/processor/common/RecordClassBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package ru.tinkoff.kora.annotation.processor.common;

import com.squareup.javapoet.AnnotationSpec;
import com.squareup.javapoet.ArrayTypeName;
import com.squareup.javapoet.CodeBlock;
import com.squareup.javapoet.TypeName;
import com.palantir.javapoet.AnnotationSpec;
import com.palantir.javapoet.ArrayTypeName;
import com.palantir.javapoet.CodeBlock;
import com.palantir.javapoet.TypeName;

import javax.annotation.processing.Filer;
import javax.lang.model.element.Element;
Expand Down Expand Up @@ -89,7 +89,7 @@ public String render() {
}

if (component.defaultValue != null) {
var hasNullable = component.annotations.stream().anyMatch(a -> a.type.toString().endsWith(".Nullable"));
var hasNullable = component.annotations.stream().anyMatch(a -> a.type().toString().endsWith(".Nullable"));
if (!hasNullable) {
sb.append(" @jakarta.annotation.Nullable ");
}
Expand Down
2 changes: 1 addition & 1 deletion ...ocessor-common/src/main/java/ru/tinkoff/kora/annotation/processor/common/RecordUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.tinkoff.kora.annotation.processor.common;

import com.squareup.javapoet.TypeName;
import com.palantir.javapoet.TypeName;

import javax.lang.model.element.ElementKind;
import javax.lang.model.element.ExecutableElement;
Expand Down
7 changes: 3 additions & 4 deletions ...-processor-common/src/main/java/ru/tinkoff/kora/annotation/processor/common/TagUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package ru.tinkoff.kora.annotation.processor.common;

import com.squareup.javapoet.AnnotationSpec;
import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock;
import com.squareup.javapoet.TypeName;
import com.palantir.javapoet.AnnotationSpec;
import com.palantir.javapoet.CodeBlock;
import com.palantir.javapoet.TypeName;

import javax.lang.model.AnnotatedConstruct;
import javax.lang.model.element.Element;
Expand Down
2 changes: 1 addition & 1 deletion ...processor-common/src/main/java/ru/tinkoff/kora/annotation/processor/common/TypeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.tinkoff.kora.annotation.processor.common;

import com.squareup.javapoet.ClassName;
import com.palantir.javapoet.ClassName;
import jakarta.annotation.Nullable;

import javax.lang.model.element.TypeElement;
Expand Down
6 changes: 3 additions & 3 deletions ...cessor/src/main/java/ru/tinkoff/kora/aop/annotation/processor/AopAnnotationProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ru.tinkoff.kora.aop.annotation.processor;

import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.JavaFile;
import com.squareup.javapoet.TypeSpec;
import com.palantir.javapoet.ClassName;
import com.palantir.javapoet.JavaFile;
import com.palantir.javapoet.TypeSpec;
import jakarta.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...tation-processor/src/main/java/ru/tinkoff/kora/aop/annotation/processor/AopProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.tinkoff.kora.aop.annotation.processor;

import com.squareup.javapoet.*;
import com.palantir.javapoet.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.tinkoff.kora.annotation.processor.common.*;
Expand Down
2 changes: 1 addition & 1 deletion ...notation-processor/src/main/java/ru/tinkoff/kora/aop/annotation/processor/KoraAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.tinkoff.kora.aop.annotation.processor;

import com.squareup.javapoet.*;
import com.palantir.javapoet.*;

import javax.lang.model.element.ExecutableElement;
import javax.lang.model.type.TypeMirror;
Expand Down
6 changes: 3 additions & 3 deletions .../src/test/java/ru/tinkoff/kora/aop/annotation/processor/AbstractTestAnnotationAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ru.tinkoff.kora.aop.annotation.processor;

import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock;
import com.squareup.javapoet.TypeName;
import com.palantir.javapoet.ClassName;
import com.palantir.javapoet.CodeBlock;
import com.palantir.javapoet.TypeName;
import ru.tinkoff.kora.annotation.processor.common.AnnotationUtils;

import javax.lang.model.element.ExecutableElement;
Expand Down
2 changes: 1 addition & 1 deletion ...ion-processor/src/test/java/ru/tinkoff/kora/aop/annotation/processor/TestAnnotation1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.tinkoff.kora.aop.annotation.processor;

import com.squareup.javapoet.ClassName;
import com.palantir.javapoet.ClassName;
import ru.tinkoff.kora.common.AopAnnotation;

import javax.annotation.processing.ProcessingEnvironment;
Expand Down
2 changes: 1 addition & 1 deletion ...ion-processor/src/test/java/ru/tinkoff/kora/aop/annotation/processor/TestAnnotation2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.tinkoff.kora.aop.annotation.processor;

import com.squareup.javapoet.ClassName;
import com.palantir.javapoet.ClassName;
import ru.tinkoff.kora.common.AopAnnotation;

import javax.annotation.processing.ProcessingEnvironment;
Expand Down
38 changes: 19 additions & 19 deletions ...or/src/main/java/ru/tinkoff/kora/cache/annotation/processor/CacheAnnotationProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.tinkoff.kora.cache.annotation.processor;

import com.squareup.javapoet.*;
import com.palantir.javapoet.*;
import jakarta.annotation.Nullable;
import ru.tinkoff.kora.annotation.processor.common.*;

Expand Down Expand Up @@ -89,7 +89,7 @@ protected void process(Set<? extends TypeElement> annotations, RoundEnvironment
.addMethod(getCacheMethodImpl(cacheContract, cacheContractType))
.addMethod(getCacheMethodConfig(cacheContract, cacheContractType));

if (cacheContractType.rawType.equals(REDIS_CACHE)) {
if (cacheContractType.rawType().equals(REDIS_CACHE)) {
var superTypes = processingEnv.getTypeUtils().directSupertypes(cacheContract.asType());
var superType = superTypes.get(superTypes.size() - 1);
var keyType = ((DeclaredType) superType).getTypeArguments().get(0);
Expand Down Expand Up @@ -132,10 +132,10 @@ private ParameterizedTypeName getCacheSuperType(TypeElement candidate) {
}

private TypeName getCacheImplBase(TypeElement cacheContract, ParameterizedTypeName cacheType) {
if (cacheType.rawType.equals(CAFFEINE_CACHE)) {
return ParameterizedTypeName.get(CAFFEINE_CACHE_IMPL, cacheType.typeArguments.get(0), cacheType.typeArguments.get(1));
} else if (cacheType.rawType.equals(REDIS_CACHE)) {
return ParameterizedTypeName.get(REDIS_CACHE_IMPL, cacheType.typeArguments.get(0), cacheType.typeArguments.get(1));
if (cacheType.rawType().equals(CAFFEINE_CACHE)) {
return ParameterizedTypeName.get(CAFFEINE_CACHE_IMPL, cacheType.typeArguments().get(0), cacheType.typeArguments().get(1));
} else if (cacheType.rawType().equals(REDIS_CACHE)) {
return ParameterizedTypeName.get(REDIS_CACHE_IMPL, cacheType.typeArguments().get(0), cacheType.typeArguments().get(1));
} else {
throw new UnsupportedOperationException("Unknown type: " + cacheContract.getQualifiedName());
}
Expand All @@ -151,12 +151,12 @@ private MethodSpec getCacheMethodConfig(TypeElement cacheContract, Parameterized
final ClassName cacheContractName = ClassName.get(cacheContract);
final String methodName = "%s_Config".formatted(cacheContractName.simpleName());
final TypeName returnType;
if (cacheType.rawType.equals(CAFFEINE_CACHE)) {
if (cacheType.rawType().equals(CAFFEINE_CACHE)) {
returnType = CAFFEINE_CACHE_CONFIG;
} else if (cacheType.rawType.equals(REDIS_CACHE)) {
} else if (cacheType.rawType().equals(REDIS_CACHE)) {
returnType = REDIS_CACHE_CONFIG;
} else {
throw new IllegalArgumentException("Unknown cache type: " + cacheType.rawType);
throw new IllegalArgumentException("Unknown cache type: " + cacheType.rawType());
}
var extractorType = ParameterizedTypeName.get(CommonClassNames.configValueExtractor, returnType);

Expand Down Expand Up @@ -253,7 +253,7 @@ private static ClassName getCacheImpl(TypeElement cacheContract) {
private MethodSpec getCacheMethodImpl(TypeElement cacheContract, ParameterizedTypeName cacheType) {
var cacheImplName = getCacheImpl(cacheContract);
var methodName = "%s_Impl".formatted(cacheImplName.simpleName());
if (cacheType.rawType.equals(CAFFEINE_CACHE)) {
if (cacheType.rawType().equals(CAFFEINE_CACHE)) {
return MethodSpec.methodBuilder(methodName)
.addModifiers(Modifier.DEFAULT, Modifier.PUBLIC)
.addParameter(ParameterSpec.builder(CAFFEINE_CACHE_CONFIG, "config")
Expand All @@ -267,9 +267,9 @@ private MethodSpec getCacheMethodImpl(TypeElement cacheContract, ParameterizedTy
.returns(TypeName.get(cacheContract.asType()))
.build();
}
if (cacheType.rawType.equals(REDIS_CACHE)) {
var keyType = cacheType.typeArguments.get(0);
var valueType = cacheType.typeArguments.get(1);
if (cacheType.rawType().equals(REDIS_CACHE)) {
var keyType = cacheType.typeArguments().get(0);
var valueType = cacheType.typeArguments().get(1);
var keyMapperType = ParameterizedTypeName.get(REDIS_CACHE_MAPPER_KEY, keyType);
var valueMapperType = ParameterizedTypeName.get(REDIS_CACHE_MAPPER_VALUE, valueType);

Expand Down Expand Up @@ -306,11 +306,11 @@ private MethodSpec getCacheMethodImpl(TypeElement cacheContract, ParameterizedTy
.returns(TypeName.get(cacheContract.asType()))
.build();
}
throw new IllegalArgumentException("Unknown cache type: " + cacheType.rawType);
throw new IllegalArgumentException("Unknown cache type: " + cacheType.rawType());
}

private MethodSpec getCacheConstructor(String configPath, ParameterizedTypeName cacheContract) {
if (cacheContract.rawType.equals(CAFFEINE_CACHE)) {
if (cacheContract.rawType().equals(CAFFEINE_CACHE)) {
return MethodSpec.constructorBuilder()
.addParameter(CAFFEINE_CACHE_CONFIG, "config")
.addParameter(CAFFEINE_CACHE_FACTORY, "factory")
Expand All @@ -319,9 +319,9 @@ private MethodSpec getCacheConstructor(String configPath, ParameterizedTypeName
.build();
}

if (cacheContract.rawType.equals(REDIS_CACHE)) {
var keyType = cacheContract.typeArguments.get(0);
var valueType = cacheContract.typeArguments.get(1);
if (cacheContract.rawType().equals(REDIS_CACHE)) {
var keyType = cacheContract.typeArguments().get(0);
var valueType = cacheContract.typeArguments().get(1);
var keyMapperType = ParameterizedTypeName.get(REDIS_CACHE_MAPPER_KEY, keyType);
var valueMapperType = ParameterizedTypeName.get(REDIS_CACHE_MAPPER_VALUE, valueType);
return MethodSpec.constructorBuilder()
Expand All @@ -334,7 +334,7 @@ private MethodSpec getCacheConstructor(String configPath, ParameterizedTypeName
.build();
}

throw new IllegalArgumentException("Unknown cache type: " + cacheContract.rawType);
throw new IllegalArgumentException("Unknown cache type: " + cacheContract.rawType());
}

private String getPackage(Element element) {
Expand Down
2 changes: 1 addition & 1 deletion ...on-processor/src/main/java/ru/tinkoff/kora/cache/annotation/processor/CacheOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.tinkoff.kora.cache.annotation.processor;

import com.squareup.javapoet.CodeBlock;
import com.palantir.javapoet.CodeBlock;

import javax.lang.model.element.TypeElement;
import javax.lang.model.type.DeclaredType;
Expand Down
6 changes: 3 additions & 3 deletions ...ocessor/src/main/java/ru/tinkoff/kora/cache/annotation/processor/CacheOperationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ru.tinkoff.kora.cache.annotation.processor;

import com.squareup.javapoet.AnnotationSpec;
import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock;
import com.palantir.javapoet.AnnotationSpec;
import com.palantir.javapoet.ClassName;
import com.palantir.javapoet.CodeBlock;
import jakarta.annotation.Nullable;
import ru.tinkoff.kora.annotation.processor.common.*;
import ru.tinkoff.kora.aop.annotation.processor.KoraAspect;
Expand Down
4 changes: 2 additions & 2 deletions .../src/main/java/ru/tinkoff/kora/cache/annotation/processor/aop/AbstractAopCacheAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package ru.tinkoff.kora.cache.annotation.processor.aop;

import com.squareup.javapoet.CodeBlock;
import com.palantir.javapoet.CodeBlock;
import ru.tinkoff.kora.aop.annotation.processor.KoraAspect;

import javax.lang.model.element.ExecutableElement;

import static com.squareup.javapoet.CodeBlock.joining;
import static com.palantir.javapoet.CodeBlock.joining;

abstract class AbstractAopCacheAspect implements KoraAspect {

Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/ru/tinkoff/kora/cache/annotation/processor/aop/CacheInvalidateAopKoraAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.tinkoff.kora.cache.annotation.processor.aop;

import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock;
import com.palantir.javapoet.ClassName;
import com.palantir.javapoet.CodeBlock;
import ru.tinkoff.kora.annotation.processor.common.CommonClassNames;
import ru.tinkoff.kora.annotation.processor.common.CommonUtils;
import ru.tinkoff.kora.annotation.processor.common.MethodUtils;
Expand Down
4 changes: 2 additions & 2 deletions ...r/src/main/java/ru/tinkoff/kora/cache/annotation/processor/aop/CachePutAopKoraAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.tinkoff.kora.cache.annotation.processor.aop;

import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock;
import com.palantir.javapoet.ClassName;
import com.palantir.javapoet.CodeBlock;
import ru.tinkoff.kora.annotation.processor.common.CommonClassNames;
import ru.tinkoff.kora.annotation.processor.common.CommonUtils;
import ru.tinkoff.kora.annotation.processor.common.MethodUtils;
Expand Down
4 changes: 2 additions & 2 deletions .../src/main/java/ru/tinkoff/kora/cache/annotation/processor/aop/CacheableAopKoraAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.tinkoff.kora.cache.annotation.processor.aop;

import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock;
import com.palantir.javapoet.ClassName;
import com.palantir.javapoet.CodeBlock;
import ru.tinkoff.kora.annotation.processor.common.CommonClassNames;
import ru.tinkoff.kora.annotation.processor.common.CommonUtils;
import ru.tinkoff.kora.annotation.processor.common.MethodUtils;
Expand Down
2 changes: 1 addition & 1 deletion ...processor/src/main/java/ru/tinkoff/kora/config/annotation/processor/ConfigClassNames.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.tinkoff.kora.config.annotation.processor;

import com.squareup.javapoet.ClassName;
import com.palantir.javapoet.ClassName;
import ru.tinkoff.kora.annotation.processor.common.CommonClassNames;

import java.util.Optional;
Expand Down
Loading
Loading