rzo1 commented on code in PR #1166:
URL: https://github.com/apache/tomee/pull/1166#discussion_r1611559629


##########
arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/spring/ServletInitializer.java:
##########
@@ -0,0 +1,13 @@
+package org.apache.openejb.arquillian.tests.jaxrs.spring;

Review Comment:
   License header



##########
arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/spring/AlternativeGreeter.java:
##########
@@ -0,0 +1,22 @@
+package org.apache.openejb.arquillian.tests.jaxrs.spring;

Review Comment:
   License header



##########
arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/spring/DemoApplication.java:
##########
@@ -0,0 +1,13 @@
+package org.apache.openejb.arquillian.tests.jaxrs.spring;

Review Comment:
   License header



##########
arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/resources/spring-webmvc-pom.xml:
##########
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>

Review Comment:
   missing header



##########
arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/spring/SpringWebappTest.java:
##########
@@ -0,0 +1,158 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.apache.openejb.arquillian.tests.jaxrs.spring;
+
+import org.apache.ziplock.WebModule;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.resolver.api.ResolutionException;
+import org.jboss.shrinkwrap.resolver.api.ResolvedArtifact;
+import org.jboss.shrinkwrap.resolver.api.maven.Maven;
+import org.jboss.shrinkwrap.resolver.api.maven.MavenResolvedArtifact;
+import org.jboss.shrinkwrap.resolver.api.maven.ScopeType;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.loader.tools.Libraries;
+import org.springframework.boot.loader.tools.Library;
+import org.springframework.boot.loader.tools.LibraryCallback;
+import org.springframework.boot.loader.tools.LibraryScope;
+import org.springframework.boot.loader.tools.Repackager;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(Arquillian.class)
+public class SpringWebappTest {
+
+    @ArquillianResource
+    private URL url;
+
+    @Deployment(testable = false)
+    public static WebArchive getArchive() throws Exception {
+        MavenResolvedArtifact[] dependencies;
+        try { // try offline first since it is generally faster
+            dependencies = Maven.configureResolver()
+                    .workOffline()
+                    
.loadPomFromFile("src/test/resources/spring-webmvc-pom.xml")
+                    
.importCompileAndRuntimeDependencies().resolve().withTransitivity()
+                    .asResolvedArtifact();
+        } catch (ResolutionException re) { // try on central
+            dependencies = Maven.resolver()
+                    
.loadPomFromFile("src/test/resources/spring-webmvc-pom.xml")
+                    
.importCompileAndRuntimeDependencies().resolve().withTransitivity()
+                    .asResolvedArtifact();
+        }
+
+
+        final WebArchive archive = new 
WebModule(SpringWebappTest.class.getSimpleName()).getArchive();
+        archive.addClasses(AlternativeGreeter.class, DemoApplication.class, 
GreetingController.class, ServletInitializer.class);
+        archive.addAsLibraries(toFiles(dependencies));
+
+        // repackage as a Spring Boot WAR file
+        final File originalWarFile = File.createTempFile("test", ".war");
+        archive.as(ZipExporter.class).exportTo(originalWarFile, true);
+
+        final Repackager repackager = new Repackager(originalWarFile);
+        final File repackagedWarFile = File.createTempFile("repackaged", 
".war");
+
+        repackager.repackage(repackagedWarFile, new 
MavenResolvedArtifactLibraries(dependencies));
+
+        final WebArchive repackaged = 
ShrinkWrap.createFromZipFile(WebArchive.class, repackagedWarFile);
+
+        System.out.println(repackaged.toString(true));
+        return repackaged;
+    }
+
+    private static File[] toFiles(MavenResolvedArtifact[] dependencies) {
+        return Arrays.stream(dependencies)
+                .map(ResolvedArtifact::asFile)
+                .collect(Collectors.toList())
+                .toArray(new File[dependencies.length]);
+    }
+
+    @Test
+    public void validate() throws Exception {
+        final String launchProfile = System.getProperty("arquillian.launch");
+        if ("tomee-embedded".equals(launchProfile)) {
+            System.out.println("Skipping this test in TomEE embedded");
+            return;
+        }
+
+        final InputStream is = new URL(url.toExternalForm() + 
"hello").openStream();

Review Comment:
   Wouldn't an IO.slurp(...) be sufficient here?



##########
arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/resources/spring-webmvc-pom.xml:
##########
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.1.11</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>org.apache.openejb.arquillian.tests</groupId>
+    <artifactId>spring-webmvc-deps</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>war</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.tomcat.embed</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomee</groupId>
+            <artifactId>jakartaee-api</artifactId>
+            <version>9.1.1</version>

Review Comment:
   For `main` this should be 10.0-M2 



##########
arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/spring/GreetingController.java:
##########
@@ -0,0 +1,19 @@
+package org.apache.openejb.arquillian.tests.jaxrs.spring;

Review Comment:
   License header



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomee.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

Reply via email to