You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2019/06/27 13:45:51 UTC
[sling-org-apache-sling-connection-timeout-agent] branch
feature/osgi-fixes created (now 0f8511b)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch feature/osgi-fixes
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-connection-timeout-agent.git.
at 0f8511b Fix or ignore some Sonar warnings
This branch includes the following new commits:
new cae7e99 Renamed package to follow artifactId
new 786c243 Remove 'impl' from MBean name
new af55e24 Adjust class location mechanism for OSGi environments
new 1519e97 ClassPool.get never returns null, so skip that check
new 0f8511b Fix or ignore some Sonar warnings
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[sling-org-apache-sling-connection-timeout-agent] 02/05: Remove
'impl' from MBean name
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/osgi-fixes
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-connection-timeout-agent.git
commit 786c24320ed1de4890857202338b5dd7ae23d8ed
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Jun 19 14:54:39 2019 +0200
Remove 'impl' from MBean name
---
src/main/java/org/apache/sling/cta/impl/AgentInfo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/cta/impl/AgentInfo.java b/src/main/java/org/apache/sling/cta/impl/AgentInfo.java
index b12b61f..857b097 100644
--- a/src/main/java/org/apache/sling/cta/impl/AgentInfo.java
+++ b/src/main/java/org/apache/sling/cta/impl/AgentInfo.java
@@ -29,7 +29,7 @@ public class AgentInfo implements AgentInfoMBean {
static {
try {
- NAME = new ObjectName(AgentInfo.class.getPackage().getName()+":type=Agent");
+ NAME = new ObjectName(AgentInfo.class.getPackage().getName().replace(".impl", "")+":type=Agent");
} catch (MalformedObjectNameException e) {
throw new ExceptionInInitializerError(e);
}
[sling-org-apache-sling-connection-timeout-agent] 01/05: Renamed
package to follow artifactId
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/osgi-fixes
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-connection-timeout-agent.git
commit cae7e9913c4272a6c8da076dd8022f8ae3d3b012
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Jun 19 14:43:29 2019 +0200
Renamed package to follow artifactId
---
README.md | 8 ++++----
pom.xml | 2 +-
src/main/java/org/apache/sling/{uca => cta}/impl/Agent.java | 2 +-
.../java/org/apache/sling/{uca => cta}/impl/AgentInfo.java | 2 +-
.../org/apache/sling/{uca => cta}/impl/AgentInfoMBean.java | 2 +-
.../{uca => cta}/impl/HttpClient3TimeoutTransformer.java | 2 +-
.../{uca => cta}/impl/HttpClient4TimeoutTransformer.java | 2 +-
.../sling/{uca => cta}/impl/JavaNetTimeoutTransformer.java | 2 +-
src/main/java/org/apache/sling/{uca => cta}/impl/Log.java | 2 +-
.../{uca => cta}/impl/MBeanAwareTimeoutTransformer.java | 2 +-
.../sling/{uca => cta}/impl/OkHttpTimeoutTransformer.java | 2 +-
.../impl/UpdateFieldsInConstructorTimeoutTransformer.java | 2 +-
.../java/org/apache/sling/{uca => cta}/impl/AgentIT.java | 12 ++++++------
.../org/apache/sling/{uca => cta}/impl/AgentLauncher.java | 4 ++--
.../org/apache/sling/{uca => cta}/impl/ErrorDescriptor.java | 4 ++--
.../apache/sling/{uca => cta}/impl/HttpClientLauncher.java | 2 +-
.../sling/{uca => cta}/impl/MisbehavingServerControl.java | 2 +-
.../sling/{uca => cta}/impl/MisbehavingServerExtension.java | 2 +-
.../apache/sling/{uca => cta}/impl/RecordedThrowable.java | 2 +-
.../org/apache/sling/{uca => cta}/impl/TestTimeouts.java | 2 +-
20 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/README.md b/README.md
index d743d88..9319c69 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ It currently supports setting timeouts for HTTP connections done using:
In addition to running the integration tests, you can also build the project with `mvn clean package` and then run a simple connection test with
- java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=<agent-connect-timeout>,<agent-read-timeout> -cp target/test-classes:target/it-dependencies/* org.apache.sling.uca.impl.HttpClientLauncher <url> <client-type> [<client-connect-timeout> <client-read-timeout>]
+ java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=<agent-connect-timeout>,<agent-read-timeout> -cp target/test-classes:target/it-dependencies/* org.apache.sling.cta.impl.HttpClientLauncher <url> <client-type> [<client-connect-timeout> <client-read-timeout>]
The parameters are as follows:
@@ -34,14 +34,14 @@ The read and connect timeouts may be specified for both the agent and client API
For a test that always fails, set one of the timeouts to 1. Both executions listed below will typically fail:
```
-java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1,1000 -cp target/test-classes:target/it-dependencies/* org.apache.sling.uca.impl.HttpClientLauncher https://sling.apache.org JavaNet
-java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1000,1 -cp target/test-classes:target/it-dependencies/* org.apache.sling.uca.impl.HttpClientLauncher https://sling.apache.org JavaNet
+java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1,1000 -cp target/test-classes:target/it-dependencies/* org.apache.sling.cta.impl.HttpClientLauncher https://sling.apache.org JavaNet
+java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1000,1 -cp target/test-classes:target/it-dependencies/* org.apache.sling.cta.impl.HttpClientLauncher https://sling.apache.org JavaNet
```
In contrast, the execution below should succeed:
```
-java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1000,1000 -cp target/test-classes:target/it-dependencies/* org.apache.sling.uca.impl.HttpClientLauncher https://sling.apache.org JavaNet
+java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1000,1000 -cp target/test-classes:target/it-dependencies/* org.apache.sling.cta.impl.HttpClientLauncher https://sling.apache.org JavaNet
```
To use this in your own project you should
diff --git a/pom.xml b/pom.xml
index 2a6416e..5bb68b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<archiveBaseDirectory>${project.basedir}</archiveBaseDirectory>
<archive>
<manifestEntries>
- <Premain-Class>org.apache.sling.uca.impl.Agent</Premain-Class>
+ <Premain-Class>org.apache.sling.cta.impl.Agent</Premain-Class>
<Can-Redefine-Classes>true</Can-Redefine-Classes>
<Can-Retransform-Classes>true</Can-Retransform-Classes>
</manifestEntries>
diff --git a/src/main/java/org/apache/sling/uca/impl/Agent.java b/src/main/java/org/apache/sling/cta/impl/Agent.java
similarity index 98%
rename from src/main/java/org/apache/sling/uca/impl/Agent.java
rename to src/main/java/org/apache/sling/cta/impl/Agent.java
index d46c56c..3c5776b 100644
--- a/src/main/java/org/apache/sling/uca/impl/Agent.java
+++ b/src/main/java/org/apache/sling/cta/impl/Agent.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
import java.lang.instrument.ClassFileTransformer;
import java.lang.instrument.Instrumentation;
diff --git a/src/main/java/org/apache/sling/uca/impl/AgentInfo.java b/src/main/java/org/apache/sling/cta/impl/AgentInfo.java
similarity index 98%
rename from src/main/java/org/apache/sling/uca/impl/AgentInfo.java
rename to src/main/java/org/apache/sling/cta/impl/AgentInfo.java
index 1a4f641..b12b61f 100644
--- a/src/main/java/org/apache/sling/uca/impl/AgentInfo.java
+++ b/src/main/java/org/apache/sling/cta/impl/AgentInfo.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
import java.lang.instrument.ClassFileTransformer;
import java.util.ArrayList;
diff --git a/src/main/java/org/apache/sling/uca/impl/AgentInfoMBean.java b/src/main/java/org/apache/sling/cta/impl/AgentInfoMBean.java
similarity index 97%
rename from src/main/java/org/apache/sling/uca/impl/AgentInfoMBean.java
rename to src/main/java/org/apache/sling/cta/impl/AgentInfoMBean.java
index d0b9eb9..294c012 100644
--- a/src/main/java/org/apache/sling/uca/impl/AgentInfoMBean.java
+++ b/src/main/java/org/apache/sling/cta/impl/AgentInfoMBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
/**
* Exposes runtime information about the agent using <tt>JMX</tt>.
diff --git a/src/main/java/org/apache/sling/uca/impl/HttpClient3TimeoutTransformer.java b/src/main/java/org/apache/sling/cta/impl/HttpClient3TimeoutTransformer.java
similarity index 98%
rename from src/main/java/org/apache/sling/uca/impl/HttpClient3TimeoutTransformer.java
rename to src/main/java/org/apache/sling/cta/impl/HttpClient3TimeoutTransformer.java
index aa0b807..c1486e6 100644
--- a/src/main/java/org/apache/sling/uca/impl/HttpClient3TimeoutTransformer.java
+++ b/src/main/java/org/apache/sling/cta/impl/HttpClient3TimeoutTransformer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
import java.util.Collections;
diff --git a/src/main/java/org/apache/sling/uca/impl/HttpClient4TimeoutTransformer.java b/src/main/java/org/apache/sling/cta/impl/HttpClient4TimeoutTransformer.java
similarity index 97%
rename from src/main/java/org/apache/sling/uca/impl/HttpClient4TimeoutTransformer.java
rename to src/main/java/org/apache/sling/cta/impl/HttpClient4TimeoutTransformer.java
index f888936..8ab7d8e 100644
--- a/src/main/java/org/apache/sling/uca/impl/HttpClient4TimeoutTransformer.java
+++ b/src/main/java/org/apache/sling/cta/impl/HttpClient4TimeoutTransformer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
import javassist.bytecode.Descriptor;
diff --git a/src/main/java/org/apache/sling/uca/impl/JavaNetTimeoutTransformer.java b/src/main/java/org/apache/sling/cta/impl/JavaNetTimeoutTransformer.java
similarity index 98%
rename from src/main/java/org/apache/sling/uca/impl/JavaNetTimeoutTransformer.java
rename to src/main/java/org/apache/sling/cta/impl/JavaNetTimeoutTransformer.java
index 2e5654b..302c400 100644
--- a/src/main/java/org/apache/sling/uca/impl/JavaNetTimeoutTransformer.java
+++ b/src/main/java/org/apache/sling/cta/impl/JavaNetTimeoutTransformer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
import java.net.URLConnection;
import java.util.HashSet;
diff --git a/src/main/java/org/apache/sling/uca/impl/Log.java b/src/main/java/org/apache/sling/cta/impl/Log.java
similarity index 99%
rename from src/main/java/org/apache/sling/uca/impl/Log.java
rename to src/main/java/org/apache/sling/cta/impl/Log.java
index 900f426..e0e3213 100644
--- a/src/main/java/org/apache/sling/uca/impl/Log.java
+++ b/src/main/java/org/apache/sling/cta/impl/Log.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
import static java.util.Objects.requireNonNull;
diff --git a/src/main/java/org/apache/sling/uca/impl/MBeanAwareTimeoutTransformer.java b/src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java
similarity index 98%
rename from src/main/java/org/apache/sling/uca/impl/MBeanAwareTimeoutTransformer.java
rename to src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java
index bf7eb02..490507e 100644
--- a/src/main/java/org/apache/sling/uca/impl/MBeanAwareTimeoutTransformer.java
+++ b/src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
import java.lang.instrument.ClassFileTransformer;
import java.security.ProtectionDomain;
diff --git a/src/main/java/org/apache/sling/uca/impl/OkHttpTimeoutTransformer.java b/src/main/java/org/apache/sling/cta/impl/OkHttpTimeoutTransformer.java
similarity index 97%
rename from src/main/java/org/apache/sling/uca/impl/OkHttpTimeoutTransformer.java
rename to src/main/java/org/apache/sling/cta/impl/OkHttpTimeoutTransformer.java
index 458996e..7be4cc6 100644
--- a/src/main/java/org/apache/sling/uca/impl/OkHttpTimeoutTransformer.java
+++ b/src/main/java/org/apache/sling/cta/impl/OkHttpTimeoutTransformer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
import javassist.bytecode.Descriptor;
diff --git a/src/main/java/org/apache/sling/uca/impl/UpdateFieldsInConstructorTimeoutTransformer.java b/src/main/java/org/apache/sling/cta/impl/UpdateFieldsInConstructorTimeoutTransformer.java
similarity index 98%
rename from src/main/java/org/apache/sling/uca/impl/UpdateFieldsInConstructorTimeoutTransformer.java
rename to src/main/java/org/apache/sling/cta/impl/UpdateFieldsInConstructorTimeoutTransformer.java
index 3757137..7fcbb10 100644
--- a/src/main/java/org/apache/sling/uca/impl/UpdateFieldsInConstructorTimeoutTransformer.java
+++ b/src/main/java/org/apache/sling/cta/impl/UpdateFieldsInConstructorTimeoutTransformer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
import java.util.Collections;
diff --git a/src/test/java/org/apache/sling/uca/impl/AgentIT.java b/src/test/java/org/apache/sling/cta/impl/AgentIT.java
similarity index 96%
rename from src/test/java/org/apache/sling/uca/impl/AgentIT.java
rename to src/test/java/org/apache/sling/cta/impl/AgentIT.java
index 0fd4d8a..eaeb63a 100644
--- a/src/test/java/org/apache/sling/uca/impl/AgentIT.java
+++ b/src/test/java/org/apache/sling/cta/impl/AgentIT.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
import static java.time.Duration.ofSeconds;
import static java.util.Objects.requireNonNull;
-import static org.apache.sling.uca.impl.HttpClientLauncher.ClientType.HC3;
-import static org.apache.sling.uca.impl.HttpClientLauncher.ClientType.HC4;
-import static org.apache.sling.uca.impl.HttpClientLauncher.ClientType.JavaNet;
-import static org.apache.sling.uca.impl.HttpClientLauncher.ClientType.OkHttp;
+import static org.apache.sling.cta.impl.HttpClientLauncher.ClientType.HC3;
+import static org.apache.sling.cta.impl.HttpClientLauncher.ClientType.HC4;
+import static org.apache.sling.cta.impl.HttpClientLauncher.ClientType.JavaNet;
+import static org.apache.sling.cta.impl.HttpClientLauncher.ClientType.OkHttp;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTimeout;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -40,7 +40,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.commons.httpclient.ConnectTimeoutException;
-import org.apache.sling.uca.impl.HttpClientLauncher.ClientType;
+import org.apache.sling.cta.impl.HttpClientLauncher.ClientType;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
diff --git a/src/test/java/org/apache/sling/uca/impl/AgentLauncher.java b/src/test/java/org/apache/sling/cta/impl/AgentLauncher.java
similarity index 97%
rename from src/test/java/org/apache/sling/uca/impl/AgentLauncher.java
rename to src/test/java/org/apache/sling/cta/impl/AgentLauncher.java
index 93a006b..a3b4113 100644
--- a/src/test/java/org/apache/sling/uca/impl/AgentLauncher.java
+++ b/src/test/java/org/apache/sling/cta/impl/AgentLauncher.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
import java.io.File;
import java.io.IOException;
@@ -29,7 +29,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.sling.uca.impl.HttpClientLauncher.ClientType;
+import org.apache.sling.cta.impl.HttpClientLauncher.ClientType;
/**
* Launches the {@link HttpClientLauncher} as a separate process with the timeout agent enabled
diff --git a/src/test/java/org/apache/sling/uca/impl/ErrorDescriptor.java b/src/test/java/org/apache/sling/cta/impl/ErrorDescriptor.java
similarity index 93%
rename from src/test/java/org/apache/sling/uca/impl/ErrorDescriptor.java
rename to src/test/java/org/apache/sling/cta/impl/ErrorDescriptor.java
index 840ea05..d70b76f 100644
--- a/src/test/java/org/apache/sling/uca/impl/ErrorDescriptor.java
+++ b/src/test/java/org/apache/sling/cta/impl/ErrorDescriptor.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
import java.io.IOException;
-import org.apache.sling.uca.impl.HttpClientLauncher.ClientType;
+import org.apache.sling.cta.impl.HttpClientLauncher.ClientType;
/**
* Data class for defining specific error messages related to individual {@link ClientType client types}.
diff --git a/src/test/java/org/apache/sling/uca/impl/HttpClientLauncher.java b/src/test/java/org/apache/sling/cta/impl/HttpClientLauncher.java
similarity index 99%
rename from src/test/java/org/apache/sling/uca/impl/HttpClientLauncher.java
rename to src/test/java/org/apache/sling/cta/impl/HttpClientLauncher.java
index d2408de..b7e731d 100644
--- a/src/test/java/org/apache/sling/uca/impl/HttpClientLauncher.java
+++ b/src/test/java/org/apache/sling/cta/impl/HttpClientLauncher.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/src/test/java/org/apache/sling/uca/impl/MisbehavingServerControl.java b/src/test/java/org/apache/sling/cta/impl/MisbehavingServerControl.java
similarity index 97%
rename from src/test/java/org/apache/sling/uca/impl/MisbehavingServerControl.java
rename to src/test/java/org/apache/sling/cta/impl/MisbehavingServerControl.java
index 0161006..d18ac2c 100644
--- a/src/test/java/org/apache/sling/uca/impl/MisbehavingServerControl.java
+++ b/src/test/java/org/apache/sling/cta/impl/MisbehavingServerControl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
import java.time.Duration;
diff --git a/src/test/java/org/apache/sling/uca/impl/MisbehavingServerExtension.java b/src/test/java/org/apache/sling/cta/impl/MisbehavingServerExtension.java
similarity index 99%
rename from src/test/java/org/apache/sling/uca/impl/MisbehavingServerExtension.java
rename to src/test/java/org/apache/sling/cta/impl/MisbehavingServerExtension.java
index f5bfe1f..780c104 100644
--- a/src/test/java/org/apache/sling/uca/impl/MisbehavingServerExtension.java
+++ b/src/test/java/org/apache/sling/cta/impl/MisbehavingServerExtension.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
import java.io.IOException;
import java.time.Duration;
diff --git a/src/test/java/org/apache/sling/uca/impl/RecordedThrowable.java b/src/test/java/org/apache/sling/cta/impl/RecordedThrowable.java
similarity index 97%
rename from src/test/java/org/apache/sling/uca/impl/RecordedThrowable.java
rename to src/test/java/org/apache/sling/cta/impl/RecordedThrowable.java
index 63ba806..2ef0fee 100644
--- a/src/test/java/org/apache/sling/uca/impl/RecordedThrowable.java
+++ b/src/test/java/org/apache/sling/cta/impl/RecordedThrowable.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
/**
* Basic information about a {@link Throwable} that was recorded in a file
diff --git a/src/test/java/org/apache/sling/uca/impl/TestTimeouts.java b/src/test/java/org/apache/sling/cta/impl/TestTimeouts.java
similarity index 98%
rename from src/test/java/org/apache/sling/uca/impl/TestTimeouts.java
rename to src/test/java/org/apache/sling/cta/impl/TestTimeouts.java
index 0d5cb36..3948ae3 100644
--- a/src/test/java/org/apache/sling/uca/impl/TestTimeouts.java
+++ b/src/test/java/org/apache/sling/cta/impl/TestTimeouts.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.uca.impl;
+package org.apache.sling.cta.impl;
import java.time.Duration;
import java.util.Objects;
[sling-org-apache-sling-connection-timeout-agent] 03/05: Adjust
class location mechanism for OSGi environments
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/osgi-fixes
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-connection-timeout-agent.git
commit af55e244477b12de061992f531b90ea705864728
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 27 15:36:11 2019 +0200
Adjust class location mechanism for OSGi environments
---
.../apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java b/src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java
index 490507e..2bd1899 100644
--- a/src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java
+++ b/src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java
@@ -20,8 +20,10 @@ import java.lang.instrument.ClassFileTransformer;
import java.security.ProtectionDomain;
import java.util.Set;
+import javassist.ByteArrayClassPath;
import javassist.ClassPool;
import javassist.CtClass;
+import javassist.LoaderClassPath;
import javassist.bytecode.Descriptor;
/**
@@ -43,11 +45,18 @@ public abstract class MBeanAwareTimeoutTransformer implements ClassFileTransform
@Override
public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) {
+
try {
if (classesToTransform.contains(className)) {
Log.get().log("%s asked to transform %s", getClass().getSimpleName(), className);
- ClassPool defaultPool = ClassPool.getDefault();
- CtClass cc = defaultPool.get(Descriptor.toJavaName(className));
+ ClassPool classPool = new ClassPool(true);
+ // in OSGi environments access is automatically permitted to all classes, even for a Java agent
+ // therefore we need to adjust the default class path
+ // 1. append all classes accessible to the specified class loader
+ classPool.appendClassPath(new LoaderClassPath(loader));
+ // 2. insert the current definition of the class
+ classPool.insertClassPath(new ByteArrayClassPath(Descriptor.toJavaName(className), classfileBuffer));
+ CtClass cc = classPool.get(Descriptor.toJavaName(className));
if ( cc == null ) {
Log.get().log("Could not find a class for %s in the default class pool, skipping transformation", className);
} else {
[sling-org-apache-sling-connection-timeout-agent] 04/05:
ClassPool.get never returns null, so skip that check
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/osgi-fixes
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-connection-timeout-agent.git
commit 1519e97befd466da649c239d8bf788b87bbb9888
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 27 15:36:34 2019 +0200
ClassPool.get never returns null, so skip that check
---
.../apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java b/src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java
index 2bd1899..d30745a 100644
--- a/src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java
+++ b/src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java
@@ -57,13 +57,9 @@ public abstract class MBeanAwareTimeoutTransformer implements ClassFileTransform
// 2. insert the current definition of the class
classPool.insertClassPath(new ByteArrayClassPath(Descriptor.toJavaName(className), classfileBuffer));
CtClass cc = classPool.get(Descriptor.toJavaName(className));
- if ( cc == null ) {
- Log.get().log("Could not find a class for %s in the default class pool, skipping transformation", className);
- } else {
- classfileBuffer = doTransformClass(cc);
- Log.get().log("Transformation of %s complete", className);
- this.agentInfo.registerTransformedClass(className);
- }
+ classfileBuffer = doTransformClass(cc);
+ Log.get().log("Transformation of %s complete", className);
+ this.agentInfo.registerTransformedClass(className);
}
return classfileBuffer;
} catch (Exception e) {
[sling-org-apache-sling-connection-timeout-agent] 05/05: Fix or
ignore some Sonar warnings
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/osgi-fixes
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-connection-timeout-agent.git
commit 0f8511b1ac6f5786d14c35054b08d213a67620f3
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 27 15:41:51 2019 +0200
Fix or ignore some Sonar warnings
---
src/main/java/org/apache/sling/cta/impl/Agent.java | 9 +++++++--
src/main/java/org/apache/sling/cta/impl/Log.java | 9 +++++----
.../org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java | 4 ++--
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/sling/cta/impl/Agent.java b/src/main/java/org/apache/sling/cta/impl/Agent.java
index 3c5776b..d4d5ff2 100644
--- a/src/main/java/org/apache/sling/cta/impl/Agent.java
+++ b/src/main/java/org/apache/sling/cta/impl/Agent.java
@@ -28,7 +28,7 @@ import javax.management.MBeanRegistrationException;
import javax.management.NotCompliantMBeanException;
public class Agent {
-
+
public static void premain(String args, Instrumentation inst) {
String[] parsedArgs = args != null ? args.split(",") : new String[0];
@@ -68,5 +68,10 @@ public class Agent {
}
Log.get().log("All transformers installed");
- }
+ }
+
+ // prevent instantiation
+ private Agent() {
+
+ }
}
diff --git a/src/main/java/org/apache/sling/cta/impl/Log.java b/src/main/java/org/apache/sling/cta/impl/Log.java
index e0e3213..0b7f4e3 100644
--- a/src/main/java/org/apache/sling/cta/impl/Log.java
+++ b/src/main/java/org/apache/sling/cta/impl/Log.java
@@ -32,7 +32,7 @@ import java.util.Formatter;
*/
abstract class Log {
- private static Log INSTANCE;
+ private static Log INSTANCE; // NOSONAR - name is OK for static fields
/**
* Configures the global logger instance
@@ -87,13 +87,14 @@ abstract class Log {
@Override
public void log(String msg, Object... args) {
- System.out.format(LOG_ENTRY_PREFIX + msg + " %n", args);
+ System.out.format(LOG_ENTRY_PREFIX + msg + " %n", args); // NOSONAR - this is a logger, OK to use System.out
}
@Override
public void fatal(String msg, Throwable t) {
- t.printStackTrace(); // ensure _something_ is printed
- throw new RuntimeException(LOG_ENTRY_PREFIX + msg, t);
+ // ensure _something_ is printed, throwable might not be printed
+ t.printStackTrace(); // NOSONAR - OK to use printStackTrace, we are a logger
+ throw new RuntimeException(LOG_ENTRY_PREFIX + msg, t); // NOSONAR - we don't want custom exceptions
}
}
diff --git a/src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java b/src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java
index d30745a..d3118f0 100644
--- a/src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java
+++ b/src/main/java/org/apache/sling/cta/impl/MBeanAwareTimeoutTransformer.java
@@ -64,7 +64,7 @@ public abstract class MBeanAwareTimeoutTransformer implements ClassFileTransform
return classfileBuffer;
} catch (Exception e) {
Log.get().fatal("Transformation failed", e);
- return null;
+ return null; // NOSONAR: null return is OK in case no transform is performed
}
}
@@ -75,6 +75,6 @@ public abstract class MBeanAwareTimeoutTransformer implements ClassFileTransform
* @return the new class definition
* @throws Exception in case of any problems while transforming
*/
- protected abstract byte[] doTransformClass(CtClass cc) throws Exception;
+ protected abstract byte[] doTransformClass(CtClass cc) throws Exception; // NOSONAR - throwing Exception is OK, we don't want custom exceptions
}
\ No newline at end of file