Skip to content

Commit

Permalink
Fix issue with EMF injection, where it would not be eagerly started
Browse files Browse the repository at this point in the history
  • Loading branch information
@stuartwdouglas
stuartwdouglas committed Sep 25, 2018
1 parent 5141d3b commit 9d8a78d
Showing 1 changed file with 26 additions and 27 deletions.
53 changes: 26 additions & 27 deletions jpa/deployment/src/main/java/org/jboss/shamrock/jpa/cdi/HibernateCdiResourceProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,31 +87,36 @@ public void process(ArchiveContext archiveContext, ProcessorContext processorCon
throw new RuntimeException("No default persistence unit could be determined, you must specify the name at the injection point");
}

for (String name : allKnownNames) {
String className = getClass().getName() + "$$EMFProducer-" + name;
AtomicReference<byte[]> bytes = new AtomicReference<>();
try (ClassCreator creator = new ClassCreator(new InMemoryClassOutput(bytes, processorContext), className, null, Object.class.getName())) {

creator.addAnnotation(Dependent.class);
MethodCreator producer = creator.getMethodCreator("producerMethod", EntityManagerFactory.class);
producer.addAnnotation(Produces.class);
producer.addAnnotation(ApplicationScoped.class);
if (!knownUnitNames.contains(name)) {
//there was no @PersistenceUnit producer with this name
//this means that we still need it, but the user would not be expecting a bean to be registered
//we register an artificial qualifier that we will use for the managed persistence contexts
producer.addAnnotation(SystemEntityManager.class);
}
try(BytecodeRecorder recorder = processorContext.addDeploymentTask(RuntimePriority.BOOTSTRAP_EMF)) {
JPADeploymentTemplate template = recorder.getRecordingProxy(JPADeploymentTemplate.class);

ResultHandle ret = producer.invokeStaticMethod(MethodDescriptor.ofMethod(Persistence.class, "createEntityManagerFactory", EntityManagerFactory.class, String.class), producer.load(name));
producer.returnValue(ret);
for (String name : allKnownNames) {
String className = getClass().getName() + "$$EMFProducer-" + name;
AtomicReference<byte[]> bytes = new AtomicReference<>();

boolean system = false;
try (ClassCreator creator = new ClassCreator(new InMemoryClassOutput(bytes, processorContext), className, null, Object.class.getName())) {

creator.addAnnotation(Dependent.class);
MethodCreator producer = creator.getMethodCreator("producerMethod", EntityManagerFactory.class);
producer.addAnnotation(Produces.class);
producer.addAnnotation(ApplicationScoped.class);
if (!knownUnitNames.contains(name)) {
//there was no @PersistenceUnit producer with this name
//this means that we still need it, but the user would not be expecting a bean to be registered
//we register an artificial qualifier that we will use for the managed persistence contexts
producer.addAnnotation(SystemEntityManager.class);
system = true;
}

ResultHandle ret = producer.invokeStaticMethod(MethodDescriptor.ofMethod(Persistence.class, "createEntityManagerFactory", EntityManagerFactory.class, String.class), producer.load(name));
producer.returnValue(ret);
}
beanDeployment.addGeneratedBean(className, bytes.get());
template.boostrapPu(null, system);
}
beanDeployment.addGeneratedBean(className, bytes.get());
}


try(BytecodeRecorder recorder = processorContext.addDeploymentTask(RuntimePriority.BOOTSTRAP_EMF)) {
JPADeploymentTemplate template = recorder.getRecordingProxy(JPADeploymentTemplate.class);

for (String name : knownContextNames) {
String className = getClass().getName() + "$$EMProducer-" + name;
Expand All @@ -120,7 +125,6 @@ public void process(ArchiveContext archiveContext, ProcessorContext processorCon
//we need to know if transactions are present or not
//TODO: this should be based on if a PU is JTA enabled or not
if (processorContext.isCapabilityPresent("transactions")) {
boolean system = false;
try (ClassCreator creator = new ClassCreator(new InMemoryClassOutput(bytes, processorContext), className, null, Object.class.getName())) {

creator.addAnnotation(Dependent.class);
Expand All @@ -129,7 +133,6 @@ public void process(ArchiveContext archiveContext, ProcessorContext processorCon
emfField.addAnnotation(Inject.class);
if (!knownUnitNames.contains(name)) {
emfField.addAnnotation(SystemEntityManager.class);
system = true;
}
FieldDescriptor emf = emfField.getFieldDescriptor();

Expand Down Expand Up @@ -161,9 +164,7 @@ public void process(ArchiveContext archiveContext, ProcessorContext processorCon

}
beanDeployment.addGeneratedBean(className, bytes.get());
template.boostrapPu(null, system);
} else {
boolean system = false;
//if there is no TX support then we just use a super simple approach, and produce a normal EM
try (ClassCreator creator = new ClassCreator(new InMemoryClassOutput(bytes, processorContext), className, null, Object.class.getName())) {

Expand All @@ -173,7 +174,6 @@ public void process(ArchiveContext archiveContext, ProcessorContext processorCon
emfField.addAnnotation(Inject.class);
if (!knownUnitNames.contains(name)) {
emfField.addAnnotation(SystemEntityManager.class);
system = true;
}
FieldDescriptor emf = emfField.getFieldDescriptor();

Expand All @@ -193,7 +193,6 @@ public void process(ArchiveContext archiveContext, ProcessorContext processorCon

}
beanDeployment.addGeneratedBean(className, bytes.get());
template.boostrapPu(null, system);
}
}
}
Expand Down

0 comments on commit 9d8a78d

Please sign in to comment.