activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbert...@apache.org
Subject [07/10] activemq-artemis git commit: removing dead code on openwire - AMQPersistenceAdapter & AMQMessageStore
Date Fri, 28 Aug 2015 19:33:50 GMT
removing dead code on openwire - AMQPersistenceAdapter & AMQMessageStore


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/5f16adde
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5f16adde
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5f16adde

Branch: refs/heads/master
Commit: 5f16adde437eff8bcf1b9238b935c8b9ce31474e
Parents: 8927456
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Fri Aug 28 14:42:02 2015 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Fri Aug 28 15:05:43 2015 -0400

----------------------------------------------------------------------
 .../protocol/openwire/OpenWireConnection.java   |  7 ++-
 .../openwire/OpenWireProtocolManager.java       |  6 --
 .../protocol/openwire/amq/AMQMessageStore.java  | 21 -------
 .../openwire/amq/AMQPersistenceAdapter.java     | 60 --------------------
 4 files changed, 4 insertions(+), 90 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5f16adde/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index bcd345a..a0101b8 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -1076,9 +1076,10 @@ public class OpenWireConnection implements RemotingConnection, CommandVisitor,
S
             result.setConnectionContext(context);
             //todo implement reconnect https://issues.apache.org/jira/browse/ARTEMIS-194
             if (context.isReconnect() || (context.isNetworkConnection() && this.acceptorUsed.isAuditNetworkProducers()))
{
-               if (protocolManager.getPersistenceAdapter() != null) {
-                  result.setLastStoredSequenceId(protocolManager.getPersistenceAdapter().getLastProducerSequenceId(id));
-               }
+               // once implemented ARTEMIS-194, we need to set the storedSequenceID here
somehow
+               // We have different semantics on Artemis Journal, but we could adapt something
for this
+               // TBD during the implemetnation of ARTEMIS-194
+               result.setLastStoredSequenceId(0);
             }
             SessionState ss = state.getSessionState(id.getParentId());
             if (ss != null) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5f16adde/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
index 0072662..27cc955 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
@@ -45,7 +45,6 @@ import org.apache.activemq.artemis.core.postoffice.Bindings;
 import org.apache.activemq.artemis.core.postoffice.QueueBinding;
 import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQConnectionContext;
 import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQConsumer;
-import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQPersistenceAdapter;
 import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQProducerBrokerExchange;
 import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQSession;
 import org.apache.activemq.artemis.core.remoting.impl.netty.NettyServerConnection;
@@ -538,11 +537,6 @@ public class OpenWireProtocolManager implements ProtocolManager<Interceptor>,
No
       session.removeProducer(id);
    }
 
-   public AMQPersistenceAdapter getPersistenceAdapter() {
-      // TODO Auto-generated method stub
-      return null;
-   }
-
    public AMQSession getSession(SessionId sessionId) {
       return sessions.get(sessionId);
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5f16adde/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQMessageStore.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQMessageStore.java
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQMessageStore.java
deleted file mode 100644
index 281c6dc..0000000
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQMessageStore.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * 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.activemq.artemis.core.protocol.openwire.amq;
-
-public interface AMQMessageStore {
-
-}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5f16adde/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQPersistenceAdapter.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQPersistenceAdapter.java
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQPersistenceAdapter.java
deleted file mode 100644
index 00d9742..0000000
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQPersistenceAdapter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.activemq.artemis.core.protocol.openwire.amq;
-
-import java.io.IOException;
-import java.util.Set;
-
-import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.command.ProducerId;
-
-public class AMQPersistenceAdapter {
-
-   /**
-    * Returns a set of all the {@link org.apache.activemq.command.ActiveMQDestination}
-    * objects that the persistence store is aware exist.
-    *
-    * @return active destinations
-    */
-   Set<ActiveMQDestination> getDestinations() {
-      return null;
-   }
-
-   /**
-    * Factory method to create a new queue message store with the given destination name
-    *
-    * @param destination
-    * @return the message store
-    * @throws IOException
-    */
-   AMQMessageStore createQueueMessageStore(ActiveMQQueue destination) throws IOException
{
-      return null;
-   }
-
-   /**
-    * return the last stored producer sequenceId for this producer Id
-    * used to suppress duplicate sends on failover reconnect at the transport
-    * when a reconnect occurs
-    *
-    * @param id the producerId to find a sequenceId for
-    * @return the last stored sequence id or -1 if no suppression needed
-    */
-   public long getLastProducerSequenceId(ProducerId id) {
-      return 0;
-   }
-}


Mime
View raw message