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

ARIES-1993 upgrade spring / spring security support #300

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

ARIES-1993 upgrade spring / spring security support #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions blueprint/blueprint-spring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-parent</artifactId>
<version>1.0.0</version>
<version>1.0.1-SNAPSHOT</version>
<relativePath>../blueprint-parent/pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -58,9 +58,10 @@
<aries.osgi.activator>
org.apache.aries.blueprint.spring.Activator
</aries.osgi.activator>
<blueprint.api.version>1.0.0</blueprint.api.version>
<blueprint.core.version>1.9.0</blueprint.core.version>
<blueprint.parser.version>1.5.0</blueprint.parser.version>
<blueprint.api.version>1.0.1</blueprint.api.version>
<blueprint.core.version>1.10.3</blueprint.core.version>
<blueprint.parser.version>1.6.1</blueprint.parser.version>
<spring.version>5.3.39</spring.version>
<!--
<lastReleaseVersion>1.0.4</lastReleaseVersion>
-->
Expand Down Expand Up @@ -119,13 +120,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.2.2.RELEASE</version>
<version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.2.2.RELEASE</version>
<version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -178,13 +179,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.2.2.RELEASE</version>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.2.2.RELEASE</version>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
79 changes: 77 additions & 2 deletions ...lueprint-spring/src/main/java/org/apache/aries/blueprint/spring/BlueprintBeanFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@

import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

import org.apache.aries.blueprint.ComponentDefinitionRegistry;
import org.apache.aries.blueprint.services.ExtendedBlueprintContainer;
Expand All @@ -37,11 +39,14 @@
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanNotOfRequiredTypeException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.ResolvableType;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.lang.Nullable;

public class BlueprintBeanFactory extends DefaultListableBeanFactory implements ResourceLoader {

Expand Down Expand Up @@ -123,7 +128,7 @@ public List<String> getDependsOn() {

@Override
public String getClassName() {
return null;
return getDefinition().getBeanClassName();
}

@Override
Expand Down Expand Up @@ -218,7 +223,30 @@ public <T> T getBean(String name, Class<T> requiredType) throws BeansException {

@Override
public <T> T getBean(Class<T> requiredType) throws BeansException {
throw new UnsupportedOperationException();
T beanToReturn = null;
Set<String> beanNames = new HashSet<String>();
for (String name : container.getComponentIds()) {
ComponentMetadata cmeta = container.getComponentMetadata(name);
try {
if (requiredType != null && cmeta != null && cmeta instanceof BeanMetadata
&& ((BeanMetadata) cmeta).getClassName() != null
&& !requiredType.isAssignableFrom(Class.forName(((BeanMetadata) cmeta).getClassName()))) {
try {
Object bean = getBean(name);
bean = container.getConverter().convert(bean, new ReifiedType(requiredType));
beanToReturn = (T) bean;
beanNames.add(name);
} catch (Exception ex) {
}
}
} catch (ClassNotFoundException cfne) {

}
}
if (beanNames.size() > 1) {
throw new NoUniqueBeanDefinitionException(requiredType, beanNames);
}
return beanToReturn;
}

@Override
Expand Down Expand Up @@ -265,5 +293,52 @@ public Class<?> getType(String name) throws NoSuchBeanDefinitionException {
public String[] getAliases(String name) {
throw new UnsupportedOperationException();
}

@Override
public <T> ObjectProvider<T> getBeanProvider(final Class<T> requiredType) {
return new ObjectProvider<T>() {
@Override
public T getObject() throws BeansException {
return getBean(requiredType);
}

@Override
public T getObject(Object... args) throws BeansException {
return getBean(requiredType, args);
}

@Override
@Nullable
public T getIfAvailable() throws BeansException {
try {
return getBean(requiredType);
} catch (NoUniqueBeanDefinitionException ex) {
throw ex;
} catch (NoSuchBeanDefinitionException ex) {
return null;
}
}

@Override
@Nullable
public T getIfUnique() throws BeansException {
try {
return getBean(requiredType);
} catch (NoSuchBeanDefinitionException ex) {
return null;
}
}
};
}

@Override
public <T> ObjectProvider<T> getBeanProvider(ResolvableType requiredType) {
return (ObjectProvider<T>) getBeanProvider(requiredType.resolve());
}

@Override
public Class<?> getType(String name, boolean allowFactoryBeanInit) throws NoSuchBeanDefinitionException {
return getBean(name).getClass();
}
}
}
2 changes: 1 addition & 1 deletion ...int-spring/src/main/java/org/apache/aries/blueprint/spring/BlueprintNamespaceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ private org.springframework.beans.factory.xml.ParserContext getOrCreateParserCon
if (applicationContext == null) {
applicationContext = new SpringApplicationContext(container);
registry.registerComponentDefinition(createPassThrough(parserContext,
SPRING_APPLICATION_CONTEXT_ID, applicationContext, "destroy"
SPRING_APPLICATION_CONTEXT_ID, applicationContext, "close"
));
}
// Create registry
Expand Down