You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/09/21 20:45:03 UTC
[1/4] activemq-artemis git commit: This closes #785
Repository: activemq-artemis
Updated Branches:
refs/heads/master 905b7eace -> 3d8fbc139
This closes #785
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3d8fbc13
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3d8fbc13
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3d8fbc13
Branch: refs/heads/master
Commit: 3d8fbc139585d83e466f4246de19878d57709bda
Parents: 905b7ea 0e8f582
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Sep 21 16:31:14 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Sep 21 16:31:14 2016 -0400
----------------------------------------------------------------------
.../artemis/utils/ActiveMQScheduledComponentTest.java | 1 +
.../activemq/artemis/jdbc/store/sql/GenericSQLProvider.java | 1 +
.../artemis/core/server/impl/ActiveMQServerImpl.java | 2 ++
.../apache/activemq/artemis/core/server/impl/QueueImpl.java | 1 +
docs/hacking-guide/en/ide.md | 8 +++++++-
etc/ide-settings/IDEA-artemis-inspections.xml | 8 ++++++++
etc/ide-settings/org.eclipse.jdt.core.prefs | 2 ++
7 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[4/4] activemq-artemis git commit: Add missing @Overrides
Posted by cl...@apache.org.
Add missing @Overrides
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/02a7ac29
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/02a7ac29
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/02a7ac29
Branch: refs/heads/master
Commit: 02a7ac29497ad9d4134085b8a647cab8fc8fa4ff
Parents: 905b7ea
Author: Ville Skytt� <vi...@iki.fi>
Authored: Wed Sep 21 13:15:12 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Sep 21 16:31:14 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/utils/ActiveMQScheduledComponentTest.java | 1 +
.../apache/activemq/artemis/jdbc/store/sql/GenericSQLProvider.java | 1 +
.../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 2 ++
.../org/apache/activemq/artemis/core/server/impl/QueueImpl.java | 1 +
4 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/02a7ac29/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ActiveMQScheduledComponentTest.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ActiveMQScheduledComponentTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ActiveMQScheduledComponentTest.java
index bf920e7..b4b7daf 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ActiveMQScheduledComponentTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ActiveMQScheduledComponentTest.java
@@ -56,6 +56,7 @@ public class ActiveMQScheduledComponentTest {
final ActiveMQScheduledComponent local = new ActiveMQScheduledComponent(scheduledExecutorService, executorService, 100, TimeUnit.MILLISECONDS, false) {
+ @Override
public void run() {
if (count.get() == 0) {
try {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/02a7ac29/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/sql/GenericSQLProvider.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/sql/GenericSQLProvider.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/sql/GenericSQLProvider.java
index a246dd5..f7b37f7 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/sql/GenericSQLProvider.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/sql/GenericSQLProvider.java
@@ -201,6 +201,7 @@ public class GenericSQLProvider implements SQLProvider {
public static class Factory implements SQLProvider.Factory {
+ @Override
public SQLProvider create(String tableName) {
return new GenericSQLProvider(tableName);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/02a7ac29/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 7e32f43..1f28754 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -2400,6 +2400,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
return new Date().getTime() - startDate.getTime();
}
+ @Override
public boolean addClientConnection(String clientId, boolean unique) {
final AtomicInteger i = connectedClientIds.putIfAbsent(clientId, new AtomicInteger(1));
if (i != null) {
@@ -2413,6 +2414,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
return true;
}
+ @Override
public void removeClientConnection(String clientId) {
AtomicInteger i = connectedClientIds.get(clientId);
if (i != null && i.decrementAndGet() == 0) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/02a7ac29/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index 99ce43f..d5862c8 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -1100,6 +1100,7 @@ public class QueueImpl implements Queue {
}
}
+ @Override
public void expire(final MessageReference ref) throws Exception {
SimpleString messageExpiryAddress = expiryAddressFromMessageAddress(ref);
if (messageExpiryAddress == null) {
[3/4] activemq-artemis git commit: Flag missing @Override as error in
Eclipse
Posted by cl...@apache.org.
Flag missing @Override as error in Eclipse
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0e8f582f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0e8f582f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0e8f582f
Branch: refs/heads/master
Commit: 0e8f582f1b4705cf35d8281d321f44112c55e044
Parents: 5329311
Author: Ville Skytt� <vi...@iki.fi>
Authored: Wed Sep 21 13:45:42 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Sep 21 16:31:14 2016 -0400
----------------------------------------------------------------------
etc/ide-settings/org.eclipse.jdt.core.prefs | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0e8f582f/etc/ide-settings/org.eclipse.jdt.core.prefs
----------------------------------------------------------------------
diff --git a/etc/ide-settings/org.eclipse.jdt.core.prefs b/etc/ide-settings/org.eclipse.jdt.core.prefs
index 330f389..d6074ef 100644
--- a/etc/ide-settings/org.eclipse.jdt.core.prefs
+++ b/etc/ide-settings/org.eclipse.jdt.core.prefs
@@ -19,6 +19,8 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.processAnnotations=enabled
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
[2/4] activemq-artemis git commit: Add IDEA inspection settings,
flag missing @Override as error
Posted by cl...@apache.org.
Add IDEA inspection settings, flag missing @Override as error
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/53293115
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/53293115
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/53293115
Branch: refs/heads/master
Commit: 53293115709c98036914576e16a8148adf504604
Parents: 02a7ac2
Author: Ville Skytt� <vi...@iki.fi>
Authored: Wed Sep 21 13:30:52 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Sep 21 16:31:14 2016 -0400
----------------------------------------------------------------------
docs/hacking-guide/en/ide.md | 8 +++++++-
etc/ide-settings/IDEA-artemis-inspections.xml | 8 ++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/53293115/docs/hacking-guide/en/ide.md
----------------------------------------------------------------------
diff --git a/docs/hacking-guide/en/ide.md b/docs/hacking-guide/en/ide.md
index f38fb81..88435a5 100644
--- a/docs/hacking-guide/en/ide.md
+++ b/docs/hacking-guide/en/ide.md
@@ -36,7 +36,7 @@ After you add the JDK to the IDE, add also the vm.jar specific to your platform
There's a [SOF Question](http://stackoverflow.com/questions/27906481/can-intellij-14-be-used-to-work-with-ibm-jdk-1-7/32852361#32852361) about this that could be useful in case you are running into this issue.
-### Style Templates for Idea
+### Style Templates and Inspection Settings for Idea
We have shared the style templates that are good for this project. If you want to apply them use these steps:
@@ -45,6 +45,12 @@ We have shared the style templates that are good for this project. If you want t
* Select both Code Style Templates and File templates (it's the default option)
* Select OK and restart Idea
+Similarly, to import inspection settings:
+
+* File->Settings->Editor->Inspections->Manage->Import
+* Select the file ./artemis-cloned-folder/etc/ide-settings/IDEA-artemis-inspections.xml
+* Select OK
+
### Issue: My JUnit tests are not runnable with in the IDE.
If the "Run <classname>" or "Run all tests" option is not present. It is likely that the default profile has not been
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/53293115/etc/ide-settings/IDEA-artemis-inspections.xml
----------------------------------------------------------------------
diff --git a/etc/ide-settings/IDEA-artemis-inspections.xml b/etc/ide-settings/IDEA-artemis-inspections.xml
new file mode 100644
index 0000000..c6ec80b
--- /dev/null
+++ b/etc/ide-settings/IDEA-artemis-inspections.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inspections version="1.0">
+ <option name="myName" value="Artemis" />
+ <inspection_tool class="MissingOverrideAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+ <option name="ignoreObjectMethods" value="false" />
+ <option name="ignoreAnonymousClassMethods" value="false" />
+ </inspection_tool>
+</inspections>