diff --git a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml index c1bff0f2225e5..0d77e3c9c9413 100644 --- a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml +++ b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml @@ -102,7 +102,7 @@ - com.squareup + com.palantir.javapoet javapoet ${javapoet-version} diff --git a/components/camel-servicenow/camel-servicenow-maven-plugin/src/main/java/org/apache/camel/maven/CamelServiceNowGenerateMojo.java b/components/camel-servicenow/camel-servicenow-maven-plugin/src/main/java/org/apache/camel/maven/CamelServiceNowGenerateMojo.java index 279a05a644a32..ebeb062893741 100644 --- a/components/camel-servicenow/camel-servicenow-maven-plugin/src/main/java/org/apache/camel/maven/CamelServiceNowGenerateMojo.java +++ b/components/camel-servicenow/camel-servicenow-maven-plugin/src/main/java/org/apache/camel/maven/CamelServiceNowGenerateMojo.java @@ -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; diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml index 90b02944c66f9..cce9ab6f4e72e 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml @@ -103,7 +103,7 @@ ${jandex-version} - com.squareup + com.palantir.javapoet javapoet ${javapoet-version} diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java index ff553ff4a0ae3..e83a2766ec34c 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java @@ -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; @@ -141,7 +141,7 @@ private void write(Collection specs) throws Exception { } Files.createDirectories(outputDirectory); } - FileUtil.updateFile(outputDirectory.resolve(typeSpec.name + ".java"), sw.toString()); + FileUtil.updateFile(outputDirectory.resolve(typeSpec.name() + ".java"), sw.toString()); } } @@ -339,18 +339,18 @@ private Collection 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())); } }); @@ -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()) { @@ -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); }); diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java index f4e97dba1f30e..d79d6ecbfc6c3 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java @@ -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; diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/TypeSpecHolder.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/TypeSpecHolder.java index 6f5ff765d1ef6..422329b14d798 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/TypeSpecHolder.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/TypeSpecHolder.java @@ -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; diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/YamlProperties.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/YamlProperties.java index 69282c04c7a53..5bbd442855cc0 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/YamlProperties.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/YamlProperties.java @@ -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; diff --git a/parent/pom.xml b/parent/pom.xml index 719c8db9259e4..4cf2aef3cc62e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -264,7 +264,7 @@ 2.25.3 3.2.0 0.22 - 1.13.0 + 0.15.0 3.31.0-GA 6.0.1 6.0.0 diff --git a/tooling/openapi-rest-dsl-generator/pom.xml b/tooling/openapi-rest-dsl-generator/pom.xml index 86f767d0a5332..2e5d75584c86e 100644 --- a/tooling/openapi-rest-dsl-generator/pom.xml +++ b/tooling/openapi-rest-dsl-generator/pom.xml @@ -44,7 +44,7 @@ camel-xml-io - com.squareup + com.palantir.javapoet javapoet ${javapoet-version} diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/AppendableGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/AppendableGenerator.java index be7fd5d75b0ff..519d41b9deecc 100644 --- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/AppendableGenerator.java +++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/AppendableGenerator.java @@ -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 { diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/FilerGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/FilerGenerator.java index a274b35b77368..e79cbd7aebe76 100644 --- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/FilerGenerator.java +++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/FilerGenerator.java @@ -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 { diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitter.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitter.java index 315f099f3891f..6ba2c1633c092 100644 --- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitter.java +++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitter.java @@ -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; diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/PathGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/PathGenerator.java index 610ec0c836d2b..883e3b2a19003 100644 --- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/PathGenerator.java +++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/PathGenerator.java @@ -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 { diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslSourceCodeGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslSourceCodeGenerator.java index 03278d7db3feb..bb151deabca2b 100644 --- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslSourceCodeGenerator.java +++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslSourceCodeGenerator.java @@ -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; diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitterTest.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitterTest.java index f6a6025ffd35a..be00fbc10cc89 100644 --- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitterTest.java +++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitterTest.java @@ -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; diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/OperationVisitorTest.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/OperationVisitorTest.java index 210a9ecfbd30a..7def883c58e82 100644 --- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/OperationVisitorTest.java +++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/OperationVisitorTest.java @@ -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;