Skip to content
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

Jump to bottom

Speed up build for misc extensions #733

Merged
merged 2 commits into from
Feb 18, 2020
Merged

Speed up build for misc extensions #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e790ffe
chore: Remove redundant quarkus-maven-plugin exection from native pro…
jamesnetherton Feb 18, 2020
0a40b94
Fix olingo4 tests for native mode
jamesnetherton Feb 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 5 additions & 17 deletions ...src/main/java/org/apache/camel/quarkus/component/olingo4/deployment/Olingo4Processor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,16 @@
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildItem;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.apache.camel.component.olingo4.Olingo4AppEndpointConfiguration;
import org.apache.camel.quarkus.core.deployment.UnbannedReflectiveBuildItem;
import org.apache.olingo.server.core.ODataImpl;
import org.jboss.jandex.DotName;
import org.jboss.jandex.IndexView;

class Olingo4Processor {

private static final String FEATURE = "camel-olingo4";
private static final DotName JSON_DESERIALIZE_DOT_NAME = DotName
.createSimple("com.fasterxml.jackson.databind.annotation.JsonDeserialize");

@BuildStep
FeatureBuildItem feature() {
Expand All @@ -54,19 +51,10 @@ AdditionalApplicationArchiveMarkerBuildItem olingoArchiveMarker() {
void registerForReflection(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, CombinedIndexBuildItem combinedIndex) {
reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, ODataImpl.class));
reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, Olingo4AppEndpointConfiguration.class));
}

/*
* Register Olingo Deserializer classes for reflection. We do this because the Quarkus Jackson extension only
* configures reflection where the 'using' annotation value is applied to fields & methods.
*
* TODO: Remove this when the Quarkus Jackson extension has this enhancement - https://github.com/quarkusio/quarkus/issues/7139
*/
IndexView index = combinedIndex.getIndex();
index.getAnnotations(JSON_DESERIALIZE_DOT_NAME)
.stream()
.map(annotation -> annotation.value("using").asClass().name().toString())
.filter(className -> className.startsWith("org.apache.olingo"))
.map(className -> new ReflectiveClassBuildItem(true, false, false, className))
.forEach(reflectiveClass::produce);
@BuildStep
ExtensionSslNativeSupportBuildItem activateSslNativeSupport() {
return new ExtensionSslNativeSupportBuildItem(FEATURE);
}
}
23 changes: 0 additions & 23 deletions integration-tests/validator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,29 +113,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<executions>
<execution>
<id>native-image</id>

<goals>
<goal>native-image</goal>
</goals>
<configuration>
<reportErrorsAtRuntime>false</reportErrorsAtRuntime>
<cleanupServer>true</cleanupServer>
<enableHttpsUrlHandler>true</enableHttpsUrlHandler>
<enableServer>false</enableServer>
<dumpProxies>false</dumpProxies>
<graalvmHome>${graalvmHome}</graalvmHome>
<enableAllSecurityServices>true</enableAllSecurityServices>
<disableReports>true</disableReports>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
Expand Down