Add copyright notice and update target URLs in tests (#1337)

- Insert copyright notice for 2024 and Apache License at the top of relevant files. - Change HTTP target URLs to HTTPS for better security in test configurations. - Ensure consistency across interceptor packages by applying the same updates where necessary.
membrane · Nov 12, 2024 · a852db2 · a852db2
1 parent 0910e92
commit a852db2
Show file tree

Hide file tree

Showing 16 changed files with 131 additions and 15 deletions.
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/json/ReplaceInterceptor.java b/core/src/main/java/com/predic8/membrane/core/interceptor/json/ReplaceInterceptor.java
@@ -1,3 +1,16 @@
+/* Copyright 2024 predic8 GmbH, www.predic8.com
+
+   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 com.predic8.membrane.core.interceptor.json;
 
 import com.jayway.jsonpath.Configuration;

diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/shadowing/ShadowingInterceptor.java b/core/src/main/java/com/predic8/membrane/core/interceptor/shadowing/ShadowingInterceptor.java
@@ -1,3 +1,16 @@
+/* Copyright 2024 predic8 GmbH, www.predic8.com
+
+   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 com.predic8.membrane.core.interceptor.shadowing;
 
 import com.predic8.membrane.annot.MCChildElement;

diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/templating/StaticInterceptor.java b/core/src/main/java/com/predic8/membrane/core/interceptor/templating/StaticInterceptor.java
@@ -1,3 +1,16 @@
+/* Copyright 2024 predic8 GmbH, www.predic8.com
+
+   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 com.predic8.membrane.core.interceptor.templating;
 
 import com.predic8.membrane.annot.MCAttribute;

diff --git a/.../predic8/membrane/core/interceptor/authentication/session/StaticUserDataProviderTest.java b/.../predic8/membrane/core/interceptor/authentication/session/StaticUserDataProviderTest.java
@@ -1,3 +1,16 @@
+/* Copyright 2024 predic8 GmbH, www.predic8.com
+
+   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 com.predic8.membrane.core.interceptor.authentication.session;
 
 import org.junit.jupiter.api.Assertions;

diff --git a/core/src/test/java/com/predic8/membrane/core/interceptor/json/ReplaceInterceptorTest.java b/core/src/test/java/com/predic8/membrane/core/interceptor/json/ReplaceInterceptorTest.java
@@ -1,3 +1,16 @@
+/* Copyright 2024 predic8 GmbH, www.predic8.com
+
+   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 com.predic8.membrane.core.interceptor.json;
 
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/...c/test/java/com/predic8/membrane/core/interceptor/shadowing/ShadowingInterceptorTest.java b/...c/test/java/com/predic8/membrane/core/interceptor/shadowing/ShadowingInterceptorTest.java
@@ -1,3 +1,16 @@
+/* Copyright 2024 predic8 GmbH, www.predic8.com
+
+   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 com.predic8.membrane.core.interceptor.shadowing;
 
 import com.predic8.membrane.core.Router;

diff --git a/...src/test/java/com/predic8/membrane/core/interceptor/templating/StaticInterceptorTest.java b/...src/test/java/com/predic8/membrane/core/interceptor/templating/StaticInterceptorTest.java
@@ -1,9 +1,17 @@
-package com.predic8.membrane.core.interceptor.templating;
+/* Copyright 2024 predic8 GmbH, www.predic8.com
+
+   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
 
-import org.junit.jupiter.api.Test;
+   http://www.apache.org/licenses/LICENSE-2.0
 
-import static com.predic8.membrane.core.interceptor.templating.StaticInterceptor.*;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+   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 com.predic8.membrane.core.interceptor.templating;
 
 class StaticInterceptorTest {
 

diff --git a/distribution/examples/basic-xml-interceptor/pom.xml b/distribution/examples/basic-xml-interceptor/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.membrane-soa</groupId>
             <artifactId>service-proxy-core</artifactId>
-            <version>5.5.5-SNAPSHOT</version>
+            <version>5.7.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/distribution/examples/custom-interceptor/pom.xml b/distribution/examples/custom-interceptor/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>org.membrane-soa</groupId>
       <artifactId>service-proxy-core</artifactId>
-      <version>5.5.5-SNAPSHOT</version>
+      <version>5.7.5-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

diff --git a/distribution/examples/soap/add-soap-header/pom.xml b/distribution/examples/soap/add-soap-header/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.membrane-soa</groupId>
             <artifactId>service-proxy-core</artifactId>
-            <version>5.5.5-SNAPSHOT</version>
+            <version>5.7.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

diff --git a/distribution/examples/xslt/README.md b/distribution/examples/xslt/README.md
@@ -26,7 +26,9 @@ First take a look at the proxies.xml file.
     <response>
       <transform xslt="./reformat.xsl" />
     </response>
-    <target host="api.predic8.de" port="443" />
+    <target host="api.predic8.de" port="443">
+        <ssl />
+    </target>
   </serviceProxy>
 </router>
 ```

diff --git a/distribution/examples/xslt/proxies.xml b/distribution/examples/xslt/proxies.xml
@@ -9,8 +9,10 @@
 		<serviceProxy port="2000">
 			<response>
 				<transform xslt="./reformat.xsl" />
-			</response>		
-			<target host="api.predic8.de" port="443" />
+			</response>
+			<target host="api.predic8.de" port="443">
+				<ssl />
+			</target>
 		</serviceProxy>
 
 	</router>

diff --git a/...ibution/src/test/java/com/predic8/membrane/examples/tests/ConditionalInterceptorTest.java b/...ibution/src/test/java/com/predic8/membrane/examples/tests/ConditionalInterceptorTest.java
@@ -1,3 +1,16 @@
+/* Copyright 2024 predic8 GmbH, www.predic8.com
+
+   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 com.predic8.membrane.examples.tests;
 
 import com.predic8.membrane.examples.util.AbstractSampleMembraneStartStopTestcase;

diff --git a/...ion/src/test/java/com/predic8/membrane/examples/tests/ssl/SSLServerApiWithTlsPemTest.java b/...ion/src/test/java/com/predic8/membrane/examples/tests/ssl/SSLServerApiWithTlsPemTest.java
@@ -1,3 +1,16 @@
+/* Copyright 2024 predic8 GmbH, www.predic8.com
+
+   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 com.predic8.membrane.examples.tests.ssl;
 
 import com.predic8.membrane.examples.util.DistributionExtractingTestcase;

diff --git a/...ion/src/test/java/com/predic8/membrane/examples/tutorials/rest/TutorialRestStepsTest.java b/...ion/src/test/java/com/predic8/membrane/examples/tutorials/rest/TutorialRestStepsTest.java
@@ -61,7 +61,7 @@ public void start() throws Exception {
 
     @Test
     public void step1() {
-        get("http://localhost:2001/shop/products/")
+        get("http://localhost:2001/shop/v2/products/")
                 .then()
                 .assertThat()
                     .contentType(APPLICATION_JSON)
@@ -76,7 +76,7 @@ public void step1() {
 
     @Test
     public void step2() {
-        get("http://localhost:2001/shop/products/")
+        get("http://localhost:2001/shop/v2/products/")
                 .then()
                 .assertThat()
                     .contentType(APPLICATION_JSON)

diff --git a/...st/resources/com/predic8/membrane/examples/tutorials/rest/rest-tutorial-steps-proxies.xml b/...st/resources/com/predic8/membrane/examples/tutorials/rest/rest-tutorial-steps-proxies.xml
@@ -22,13 +22,13 @@
 
 		<api port="2002">
 			<path>/restnames</path>
-			<target url="http://www.thomas-bayer.com"/>
+			<target url="https://api.predic8.de"/>
 		</api>
 
 		<api port="2003">
 			<path>/restnames</path>
 			<xml2Json/>
-			<target url="http://www.thomas-bayer.com"/>
+			<target url="https://api.predic8.de"/>
 		</api>
 
 		<api port="2004">
@@ -38,7 +38,7 @@
 				<beautifier/>
 				<xml2Json/>
 			</response>
-			<target url="http://www.thomas-bayer.com"/>
+			<target url="https://api.predic8.de"/>
 		</api>
 
 		<api port="9000">