Skip to content

Replace no more maintained com.squareup:javapoet by #23455

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

Open
apupier wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace no more maintained com.squareup:javapoet by #23455

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 components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
</dependency>

<dependency>
<groupId>com.squareup</groupId>
<groupId>com.palantir.javapoet</groupId>
<artifactId>javapoet</artifactId>
<version>${javapoet-version}</version>
</dependency>
Expand Down
10 changes: 5 additions & 5 deletions ...icenow-maven-plugin/src/main/java/org/apache/camel/maven/CamelServiceNowGenerateMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.squareup.javapoet.AnnotationSpec;
import com.squareup.javapoet.FieldSpec;
import com.squareup.javapoet.JavaFile;
import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.TypeSpec;
import com.palantir.javapoet.AnnotationSpec;
import com.palantir.javapoet.FieldSpec;
import com.palantir.javapoet.JavaFile;
import com.palantir.javapoet.MethodSpec;
import com.palantir.javapoet.TypeSpec;
import org.apache.camel.component.extension.MetaDataExtension;
import org.apache.camel.component.servicenow.ServiceNowComponent;
import org.apache.camel.component.servicenow.annotations.ServiceNowSysParm;
Expand Down
2 changes: 1 addition & 1 deletion dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<version>${jandex-version}</version>
</dependency>
<dependency>
<groupId>com.squareup</groupId>
<groupId>com.palantir.javapoet</groupId>
<artifactId>javapoet</artifactId>
<version>${javapoet-version}</version>
</dependency>
Expand Down
27 changes: 13 additions & 14 deletions ...n-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.squareup.javapoet.AnnotationSpec;
import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock;
import com.squareup.javapoet.JavaFile;
import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.ParameterizedTypeName;
import com.squareup.javapoet.TypeSpec;
import com.palantir.javapoet.AnnotationSpec;
import com.palantir.javapoet.ClassName;
import com.palantir.javapoet.CodeBlock;
import com.palantir.javapoet.JavaFile;
import com.palantir.javapoet.MethodSpec;
import com.palantir.javapoet.ParameterizedTypeName;
import com.palantir.javapoet.TypeSpec;
import org.apache.camel.CamelContext;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
Expand Down Expand Up @@ -141,7 +141,7 @@ private void write(Collection<TypeSpec> specs) throws Exception {
}
Files.createDirectories(outputDirectory);
}
FileUtil.updateFile(outputDirectory.resolve(typeSpec.name + ".java"), sw.toString());
FileUtil.updateFile(outputDirectory.resolve(typeSpec.name() + ".java"), sw.toString());
}
}

Expand Down Expand Up @@ -339,18 +339,18 @@ private Collection<TypeSpec> generateDeserializers() {
&& !implementType(ci, ERROR_HANDLER_BUILDER_CLASS);
})
.map(this::generateParser)
.sorted(Comparator.comparing(o -> o.type.name))
.sorted(Comparator.comparing(o -> o.type.name()))
.forEach(holder -> {
// add inner classes
deserializers.addType(holder.type);

if (holder.attributes.containsKey("node")) {
holder.attributes.get("node").forEach(node -> constructors.addStatement(
"case $S: return new ModelDeserializers.$L()", node, holder.type.name));
"case $S: return new ModelDeserializers.$L()", node, holder.type.name()));
}
if (holder.attributes.containsKey("type")) {
holder.attributes.get("type").forEach(type -> constructors.addStatement(
"case $S: return new ModelDeserializers.$L()", type, holder.type.name));
"case $S: return new ModelDeserializers.$L()", type, holder.type.name()));
}
});

Expand Down Expand Up @@ -661,8 +661,7 @@ private TypeSpecHolder generateParser(ClassInfo info) {
info.name().toString());
yamlTypeAnnotation.addMember(
"order",
"org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1",
info.name().toString());
"org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1");

JsonNode yamlTypeDisplayName = descriptor.meta.at("/title");
if (!yamlTypeDisplayName.isMissingNode() && yamlTypeDisplayName.isTextual()) {
Expand All @@ -689,7 +688,7 @@ private TypeSpecHolder generateParser(ClassInfo info) {
yamlTypeDeprecated.booleanValue());
}

properties.stream().sorted(Comparator.comparing(a -> a.members.get("name").toString())).forEach(spec -> {
properties.stream().sorted(Comparator.comparing(a -> a.members().get("name").toString())).forEach(spec -> {
yamlTypeAnnotation.addMember("properties", "$L", spec);
});

Expand Down
4 changes: 2 additions & 2 deletions ...l-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
import java.util.TreeSet;
import java.util.stream.Stream;

import com.squareup.javapoet.AnnotationSpec;
import com.squareup.javapoet.ClassName;
import com.palantir.javapoet.AnnotationSpec;
import com.palantir.javapoet.ClassName;
import org.apache.camel.maven.dsl.yaml.support.IndexerSupport;
import org.apache.camel.tooling.util.Strings;
import org.apache.camel.util.AntPathMatcher;
Expand Down
2 changes: 1 addition & 1 deletion ...sl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/TypeSpecHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.Set;
import java.util.TreeSet;

import com.squareup.javapoet.TypeSpec;
import com.palantir.javapoet.TypeSpec;

public class TypeSpecHolder {
public final TypeSpec type;
Expand Down
2 changes: 1 addition & 1 deletion ...sl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/YamlProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package org.apache.camel.maven.dsl.yaml.support;

import com.fasterxml.jackson.databind.JsonNode;
import com.squareup.javapoet.AnnotationSpec;
import com.palantir.javapoet.AnnotationSpec;
import org.apache.camel.tooling.util.Strings;

import static org.apache.camel.maven.dsl.yaml.GenerateYamlSupportMojo.CN_YAML_PROPERTY;
Expand Down
2 changes: 1 addition & 1 deletion parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
<jnats-version>2.25.3</jnats-version>
<javacc-maven-plugin-version>3.2.0</javacc-maven-plugin-version>
<javacrumbs-version>0.22</javacrumbs-version>
<javapoet-version>1.13.0</javapoet-version>
<javapoet-version>0.15.0</javapoet-version>
<javassist-version>3.31.0-GA</javassist-version>
<jakarta-el-api-version>6.0.1</jakarta-el-api-version>
<jakarta-el-expressly-version>6.0.0</jakarta-el-expressly-version>
Expand Down
2 changes: 1 addition & 1 deletion tooling/openapi-rest-dsl-generator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<artifactId>camel-xml-io</artifactId>
</dependency>
<dependency>
<groupId>com.squareup</groupId>
<groupId>com.palantir.javapoet</groupId>
<artifactId>javapoet</artifactId>
<version>${javapoet-version}</version>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...t-dsl-generator/src/main/java/org/apache/camel/generator/openapi/AppendableGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import java.io.IOException;

import com.squareup.javapoet.JavaFile;
import com.palantir.javapoet.JavaFile;
import io.swagger.v3.oas.models.OpenAPI;

final class AppendableGenerator extends RestDslSourceCodeGenerator<Appendable> {
Expand Down
2 changes: 1 addition & 1 deletion ...i-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/FilerGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import javax.annotation.processing.Filer;

import com.squareup.javapoet.JavaFile;
import com.palantir.javapoet.JavaFile;
import io.swagger.v3.oas.models.OpenAPI;

final class FilerGenerator extends RestDslSourceCodeGenerator<Filer> {
Expand Down
2 changes: 1 addition & 1 deletion ...nerator/src/main/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import java.util.StringJoiner;
import java.util.stream.Collectors;

import com.squareup.javapoet.MethodSpec;
import com.palantir.javapoet.MethodSpec;

import static org.apache.commons.lang3.ClassUtils.isPrimitiveOrWrapper;

Expand Down
2 changes: 1 addition & 1 deletion ...pi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/PathGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.io.IOException;
import java.nio.file.Path;

import com.squareup.javapoet.JavaFile;
import com.palantir.javapoet.JavaFile;
import io.swagger.v3.oas.models.OpenAPI;

final class PathGenerator extends RestDslSourceCodeGenerator<Path> {
Expand Down
10 changes: 5 additions & 5 deletions ...enerator/src/main/java/org/apache/camel/generator/openapi/RestDslSourceCodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@

import javax.lang.model.element.Modifier;

import com.squareup.javapoet.AnnotationSpec;
import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.JavaFile;
import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.TypeSpec;
import com.palantir.javapoet.AnnotationSpec;
import com.palantir.javapoet.ClassName;
import com.palantir.javapoet.JavaFile;
import com.palantir.javapoet.MethodSpec;
import com.palantir.javapoet.TypeSpec;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.PathItem;
import io.swagger.v3.oas.models.info.Info;
Expand Down
4 changes: 2 additions & 2 deletions ...tor/src/test/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
*/
package org.apache.camel.generator.openapi;

import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.MethodSpec.Builder;
import com.palantir.javapoet.MethodSpec;
import com.palantir.javapoet.MethodSpec.Builder;
import org.apache.camel.model.rest.RestParamType;
import org.junit.jupiter.api.Test;

Expand Down
4 changes: 2 additions & 2 deletions ...-dsl-generator/src/test/java/org/apache/camel/generator/openapi/OperationVisitorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

import java.util.Arrays;

import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.MethodSpec.Builder;
import com.palantir.javapoet.MethodSpec;
import com.palantir.javapoet.MethodSpec.Builder;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.PathItem;
Expand Down