Skip to content

closes #62 Unmarshal EJB 2.1 ejb-jar.xml deployment descriptor #64

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

Merged
merged 1 commit into from
Mar 29, 2022
Merged

closes #62 Unmarshal EJB 2.1 ejb-jar.xml deployment descriptor #64

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
4 changes: 2 additions & 2 deletions .../main/java/org/springframework/sbm/jee/ejb/actions/MigrateLocalStatelessSessionBeans.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*/
package org.springframework.sbm.jee.ejb.actions;

import lombok.RequiredArgsConstructor;
import org.springframework.sbm.engine.context.ProjectContext;
import org.springframework.sbm.engine.recipe.AbstractAction;
import org.springframework.sbm.java.api.JavaSource;
import org.springframework.sbm.java.api.SuperTypeHierarchy;
import org.springframework.sbm.java.api.Type;
import org.springframework.sbm.engine.context.ProjectContext;
import lombok.RequiredArgsConstructor;

import java.util.List;

Expand Down
5 changes: 0 additions & 5 deletions components/sbm-recipes-mule-to-boot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@
<artifactId>sbm-core</artifactId>
<version>0.10.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.sbm</groupId>
<artifactId>recipe-test-support</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.sbm</groupId>
<artifactId>sbm-openrewrite</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...-support-jee/src/generated/ejb/java/org/springframework/sbm/jee/ejb/api/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@javax.xml.bind.annotation.XmlSchema(namespace = "http://xmlns.jcp.org/xml/ns/javaee", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
@javax.xml.bind.annotation.XmlSchema(namespace = "http://xmlns.jcp.org/xml/ns/javaee", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.UNSET)
package org.springframework.sbm.jee.ejb.api;
59 changes: 43 additions & 16 deletions components/sbm-support-jee/src/main/java/org/springframework/sbm/jee/ejb/api/EjbJarXml.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,26 @@
*/
package org.springframework.sbm.jee.ejb.api;

import org.springframework.sbm.project.resource.RewriteSourceFileHolder;
import org.openrewrite.xml.tree.Xml;
import org.springframework.sbm.project.resource.RewriteSourceFileHolder;
import org.xml.sax.InputSource;

import javax.xml.bind.*;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.util.StreamReaderDelegate;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import java.io.ByteArrayInputStream;
import java.io.StringReader;
import java.io.StringWriter;
import java.lang.String;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.List;
import java.lang.String;

public class EjbJarXml extends RewriteSourceFileHolder<Xml.Document> {

Expand Down Expand Up @@ -63,20 +67,43 @@ public String print() {
}

EjbJarType unmarshal(String content) {
try {
System.setProperty("javax.xml.accessExternalDTD", "all");
JAXBContext jaxbContext = JAXBContext.newInstance(EjbJarType.class);
Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
jaxbUnmarshaller.setSchema(null); // disable validation
// jaxbUnmarshaller.setProperty(NAMESPACE_PREFIX_MAPPER, new YahooNamespacePrefixMapper());
Source s = new StreamSource(new StringReader(content));
JAXBElement<EjbJarType> jarTypeJAXBElement = null;
jarTypeJAXBElement = jaxbUnmarshaller.unmarshal(s, EjbJarType.class);
return jarTypeJAXBElement.getValue();
} catch (JAXBException e) {
throw new RuntimeException(e);
return new EjbJarXmlUnmarshaller().unmarshal(content);
}


static class EjbJarXmlUnmarshaller {

/**
* Takes the raw ejb-jar.xml source and attempts to map it to JAXB classes created from a EJB 3.1 schema.
* Namespace information will be removed to allow unmarshalling all versions into the same JAXB model classes.
*/
public EjbJarType unmarshal(String xml) {
try {
XMLStreamReader xsr = XMLInputFactory.newFactory().createXMLStreamReader(new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8)));
EjbJarXml.EjbJarXmlUnmarshaller.XMLReaderWithoutNamespace xr = new EjbJarXml.EjbJarXmlUnmarshaller.XMLReaderWithoutNamespace(xsr);
JAXBContext jaxbContext = JAXBContext.newInstance(EjbJarType.class);
Unmarshaller jc = jaxbContext.createUnmarshaller();
return jc.unmarshal(xr, EjbJarType.class).getValue();
} catch (JAXBException | XMLStreamException e) {
throw new RuntimeException(e);
}
}

class XMLReaderWithoutNamespace extends StreamReaderDelegate {
public XMLReaderWithoutNamespace(XMLStreamReader reader) {
super(reader);
}

@Override
public String getAttributeNamespace(int arg0) {
return "";
}

@Override
public String getNamespaceURI() {
return "";
}
}
}

public boolean isEmpty() {
Expand Down
53 changes: 49 additions & 4 deletions ...ents/sbm-support-jee/src/test/java/org/springframework/sbm/jee/ejb/api/EjbJarXmlTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
*/
package org.springframework.sbm.jee.ejb.api;

import org.springframework.sbm.engine.context.ProjectContext;
import org.springframework.sbm.jee.ejb.filter.EjbJarXmlResourceFilter;
import org.springframework.sbm.jee.ejb.resource.JeeEjbJarXmlProjectResourceRegistrar;
import org.springframework.sbm.project.resource.TestProjectContext;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openrewrite.xml.XmlParser;
import org.openrewrite.xml.tree.Xml;
import org.springframework.sbm.engine.context.ProjectContext;
import org.springframework.sbm.jee.ejb.filter.EjbJarXmlResourceFilter;
import org.springframework.sbm.jee.ejb.resource.JeeEjbJarXmlProjectResourceRegistrar;
import org.springframework.sbm.project.resource.TestProjectContext;

import javax.xml.bind.JAXBException;
import java.lang.String;
Expand All @@ -39,6 +39,51 @@ class EjbJarXmlTest {
public static final String EJB_TYPE = "Stateless";
private static final String EJB_NAME = "noInterfaceView";


@Test
void unmarshal_21_ejb_jarXml() {
String ejbJarXmlContent =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<ejb-jar id=\"ejb-jar_1\" xmlns=\"http://xmlns.jcp.org/xml/ns/javaee\"\n" +
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
" xsi:schemaLocation=\"http://java.sun.com/xml/ns/j2ee\n" +
" http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_2_1.xsd\" version=\"2.1\">\n" +
" <description>Example of a session bean</description>\n" +
" <display-name>MyTimeBeanEJBName</display-name>\n" +
" <enterprise-beans>\n" +
" <session id=\"Session_MyTime\">\n" +
" <description>An EJB named MyTimeBean</description>\n" +
" <display-name>MyTimeBeanName</display-name>\n" +
" <ejb-name>MyTimeBean</ejb-name>\n" +
" <local-home>mytimepak.MyTimeLocalHome</local-home>\n" +
" <local>mytimepak.MyTimeLocal</local>\n" +
" <ejb-class>mytimepak.MyTimeBean</ejb-class>\n" +
" <session-type>Stateless</session-type>\n" +
" <transaction-type>Container</transaction-type>\n" +
" </session>\n" +
" </enterprise-beans>\n" +
"</ejb-jar>";

ProjectContext projectContext = TestProjectContext.buildProjectContext()
.addRegistrar(new JeeEjbJarXmlProjectResourceRegistrar())
.addProjectResource("src/main/resources/ejb-jar.xml", ejbJarXmlContent)
.build();

Optional<EjbJarXml> ejbJarXmlOptional = projectContext.search(new EjbJarXmlResourceFilter());
EjbJarType ejbJarXml = ejbJarXmlOptional.get().getEjbJarXml();
assertThat(ejbJarXml.getEnterpriseBeans().getSessionOrEntityOrMessageDriven()).hasSize(1);
assertThat(ejbJarXml.getEnterpriseBeans().getSessionOrEntityOrMessageDriven().get(0)).isInstanceOf(SessionBeanType.class);
SessionBeanType sb = (SessionBeanType) ejbJarXml.getEnterpriseBeans().getSessionOrEntityOrMessageDriven().get(0);
assertThat(sb.getDescription().get(0).getValue()).isEqualTo("An EJB named MyTimeBean");
assertThat(sb.getDisplayName().get(0).getValue()).isEqualTo("MyTimeBeanName");
assertThat(sb.getEjbName().getValue()).isEqualTo("MyTimeBean");
assertThat(sb.getLocalHome().getValue()).isEqualTo("mytimepak.MyTimeLocalHome");
assertThat(sb.getLocal().getValue()).isEqualTo("mytimepak.MyTimeLocal");
assertThat(sb.getEjbClass().getValue()).isEqualTo("mytimepak.MyTimeBean");
assertThat(sb.getSessionType().getValue()).isEqualTo("Stateless");
assertThat(sb.getTransactionType().getValue()).isEqualTo("Container");
}

@Test
void unmarshal_jcp_3_2_schema() throws JAXBException {

Expand Down