Skip to content

Commit

Permalink
WELD-1890 Enhancements to Weld SE API
Browse files Browse the repository at this point in the history
- org.jboss.weld.environment.se.Weld turned into a reusable builder
- it's possible to define a "synthetic" bean archive
- it's possible to disable the discovery completely
- org.jboss.weld.environment.se.WeldContainer holds container ID and implements javax.enterprise.inject.Instance
- WeldContainer instances are stored in a singleton
- WeldContainer implements AutoCloseable
  • Loading branch information
mkouba authored and jharting committed Jul 24, 2015
1 parent 427d735 commit 2a3500e
Show file tree
Hide file tree
Showing 30 changed files with 1,683 additions and 120 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public class WeldDeployment extends AbstractWeldDeployment {

public static final String ADDITIONAL_BDA_ID = WeldDeployment.class.getName() + ".additionalClasses";

public static final String SYNTHETIC_BDA_ID = WeldDeployment.class.getName() + ".synthetic";

private final Set<WeldBeanDeploymentArchive> beanDeploymentArchives;

private final ResourceLoader resourceLoader;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import org.jboss.logging.Logger;
import org.jboss.weld.environment.logging.CommonLogger;
import org.jboss.weld.environment.util.Files;

/**
* Handles JAR files and directories.
Expand All @@ -41,7 +42,7 @@ public class FileSystemBeanArchiveHandler implements BeanArchiveHandler {

private static final Logger log = Logger.getLogger(FileSystemBeanArchiveHandler.class);

public static final String CLASS_FILE_EXTENSION = ".class";
public static final String CLASS_FILE_EXTENSION = Files.CLASS_FILE_EXTENSION;

@Override
public BeanArchiveBuilder handle(String path) {
Expand Down Expand Up @@ -115,19 +116,11 @@ protected void handleDirectory(DirectoryEntry entry, BeanArchiveBuilder builder)
}

protected void add(Entry entry, BeanArchiveBuilder builder) throws MalformedURLException {
if (isClass(entry.getName())) {
builder.addClass(filenameToClassname(entry.getName()));
if (Files.isClass(entry.getName())) {
builder.addClass(Files.filenameToClassname(entry.getName()));
}
}

protected boolean isClass(String name) {
return name.endsWith(CLASS_FILE_EXTENSION);
}

private String filenameToClassname(String filename) {
return filename.substring(0, filename.lastIndexOf(CLASS_FILE_EXTENSION)).replace('/', '.').replace('\\', '.');
}

/**
* An abstraction of a bean archive entry.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.jboss.weld.environment.deployment.discovery.BeanArchiveBuilder;
import org.jboss.weld.environment.deployment.discovery.FileSystemBeanArchiveHandler;
import org.jboss.weld.environment.logging.CommonLogger;
import org.jboss.weld.environment.util.Files;

/**
* Builds and attaches a jandex index to each bean archive.
Expand All @@ -47,7 +48,7 @@ public BeanArchiveBuilder handle(String path) {
@Override
protected void add(Entry entry, BeanArchiveBuilder builder) throws MalformedURLException {
super.add(entry, builder);
if (isClass(entry.getName())) {
if (Files.isClass(entry.getName())) {
addToIndex(entry.getUrl());
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2015, Red Hat Middleware LLC, and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.weld.environment.util;

/**
*
* @author Martin Kouba
*/
public final class Files {

public static final String CLASS_FILE_EXTENSION = ".class";

private Files() {
}

public static boolean isClass(String name) {
return name.endsWith(CLASS_FILE_EXTENSION);
}

public static String filenameToClassname(String filename) {
return filename.substring(0, filename.lastIndexOf(CLASS_FILE_EXTENSION)).replace('/', '.').replace('\\', '.');
}


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2015, Red Hat, Inc., and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.weld.environment.se;

import java.security.AccessController;
import java.security.PrivilegedActionException;

import org.jboss.weld.exceptions.WeldException;
import org.jboss.weld.security.NewInstanceAction;

/**
*
* @author Martin Kouba
*/
final class SecurityActions {

private SecurityActions() {
}

/**
*
* @param javaClass
* @return a new instance of the given class
* @throws InstantiationException
* @throws IllegalAccessException
*/
static <T> T newInstance(Class<T> javaClass) throws InstantiationException, IllegalAccessException {
if (System.getSecurityManager() != null) {
try {
return AccessController.doPrivileged(NewInstanceAction.of(javaClass));
} catch (PrivilegedActionException e) {
throw new WeldException(e.getCause());
}
} else {
return javaClass.newInstance();
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.jboss.weld.literal.DestroyedLiteral;

@Vetoed
@Deprecated
public class ShutdownManager {

private boolean hasShutdownBeenCalled = false;
Expand Down
Loading

0 comments on commit 2a3500e

Please sign in to comment.