Skip to content

Commit 87c69e3

Browse files
authored
Merge pull request #13 from fbasios/fix/indexing
Remove jandex indexing
2 parents 241e462 + 5f4b099 commit 87c69e3

File tree

2 files changed

+14
-36
lines changed

2 files changed

+14
-36
lines changed

deployment/src/main/java/org/grnet/endpoint/scanner/deployment/EndpointScannerProcessor.java

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,18 @@
1616
import io.quarkus.deployment.annotations.Produce;
1717
import io.quarkus.deployment.annotations.Record;
1818
import io.quarkus.deployment.builditem.AdditionalIndexedClassesBuildItem;
19-
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
2019
import io.quarkus.deployment.builditem.FeatureBuildItem;
21-
import io.quarkus.hibernate.orm.deployment.spi.AdditionalJpaModelBuildItem;
22-
import io.quarkus.hibernate.orm.panache.deployment.PanacheEntityClassBuildItem;
23-
import io.quarkus.logging.Log;
2420
import io.quarkus.undertow.deployment.ServletBuildItem;
2521
import jakarta.enterprise.context.ApplicationScoped;
2622
import org.grnet.endpoint.scanner.runtime.EndpointMetadata;
2723
import org.grnet.endpoint.scanner.runtime.EndpointMetadataHolder;
2824
import org.grnet.endpoint.scanner.runtime.EndpointRecorder;
29-
import org.grnet.endpoint.scanner.runtime.entities.SecuredEndpoint;
25+
import org.grnet.endpoint.scanner.runtime.entities.ResourceAuthorization;
3026
import org.grnet.endpoint.scanner.runtime.services.ResourceAuthorizationService;
3127
import org.grnet.endpoint.scanner.runtime.SecuredEndpointInterceptor;
3228
import org.grnet.endpoint.scanner.runtime.SecuredEndpointServlet;
3329
import org.grnet.endpoint.scanner.runtime.database.SchemaInitializer;
3430
import org.grnet.endpoint.scanner.runtime.endpoints.MyExtensionResource;
35-
import org.grnet.endpoint.scanner.runtime.entities.ResourceAuthorization;
3631
import org.grnet.endpoint.scanner.runtime.entitlements.OIDCEntitlementService;
3732
import org.grnet.endpoint.scanner.runtime.services.SecuredEndpointService;
3833
import org.jboss.jandex.AnnotationInstance;
@@ -186,6 +181,7 @@ void registerResource(BuildProducer<AdditionalIndexedClassesBuildItem> additiona
186181

187182
additionalBeans.produce(new AdditionalBeanBuildItem(MyExtensionResource.class));
188183
additionalIndexedClasses.produce(new AdditionalIndexedClassesBuildItem(MyExtensionResource.class.getName()));
184+
additionalIndexedClasses.produce(new AdditionalIndexedClassesBuildItem(ResourceAuthorization.class.getName()));
189185
}
190186

191187
@BuildStep
@@ -256,24 +252,6 @@ void configureBeans(EndpointRecorder recorder, SecuredEndpointMetadataBuildItem
256252
listeners.produce(new BeanContainerListenerBuildItem(recorder.configureBeanContainer(configItem.getEndpoints())));
257253
}
258254

259-
@BuildStep
260-
void registerEntities(BuildProducer<AdditionalJpaModelBuildItem> jpaModel, BuildProducer<PanacheEntityClassBuildItem> panacheEntities, CombinedIndexBuildItem index) {
261-
262-
var entityClassInfo = index.getIndex()
263-
.getClassByName(DotName.createSimple(ResourceAuthorization.class.getName()));
264-
265-
jpaModel.produce(new AdditionalJpaModelBuildItem(ResourceAuthorization.class.getName()));
266-
267-
panacheEntities.produce(new PanacheEntityClassBuildItem(entityClassInfo));
268-
269-
var securedEndpointClassInfo = index.getIndex()
270-
.getClassByName(DotName.createSimple(SecuredEndpoint.class.getName()));
271-
272-
jpaModel.produce(new AdditionalJpaModelBuildItem(SecuredEndpoint.class.getName()));
273-
274-
panacheEntities.produce(new PanacheEntityClassBuildItem(securedEndpointClassInfo));
275-
}
276-
277255
private Set<String> getDataSourceNames(List<JdbcDataSourceBuildItem> jdbcDataSourceBuildItems) {
278256
Set<String> result = new HashSet<>(jdbcDataSourceBuildItems.size());
279257
for (JdbcDataSourceBuildItem item : jdbcDataSourceBuildItems) {

runtime/pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,18 @@
5353

5454
<build>
5555
<plugins>
56-
<plugin>
57-
<groupId>io.smallrye</groupId>
58-
<artifactId>jandex-maven-plugin</artifactId>
59-
<executions>
60-
<execution>
61-
<id>make-index</id>
62-
<goals>
63-
<goal>jandex</goal>
64-
</goals>
65-
</execution>
66-
</executions>
67-
</plugin>
56+
<!-- <plugin>-->
57+
<!-- <groupId>io.smallrye</groupId>-->
58+
<!-- <artifactId>jandex-maven-plugin</artifactId>-->
59+
<!-- <executions>-->
60+
<!-- <execution>-->
61+
<!-- <id>make-index</id>-->
62+
<!-- <goals>-->
63+
<!-- <goal>jandex</goal>-->
64+
<!-- </goals>-->
65+
<!-- </execution>-->
66+
<!-- </executions>-->
67+
<!-- </plugin>-->
6868
<plugin>
6969
<groupId>io.quarkus</groupId>
7070
<artifactId>quarkus-extension-maven-plugin</artifactId>

0 commit comments

Comments
 (0)