Author: cziegeler
Date: Tue Apr 23 07:05:23 2013
New Revision: 1470829
URL: http://svn.apache.org/r1470829
Log:
Minor code cleanup
Modified:
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/ClusterViewServiceImpl.java
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/announcement/AnnouncementRegistry.java
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/announcement/AnnouncementRegistryImpl.java
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/connector/ConnectorRegistryImpl.java
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/connector/TopologyConnectorClientInformation.java
Modified:
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/ClusterViewServiceImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/ClusterViewServiceImpl.java?rev=1470829&r1=1470828&r2=1470829&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/ClusterViewServiceImpl.java
(original)
+++
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/ClusterViewServiceImpl.java
Tue Apr 23 07:05:23 2013
@@ -48,8 +48,8 @@ import org.slf4j.LoggerFactory;
* This class is a reader only - it accesses the repository to read the
* currently established view
*/
-@Service
@Component
+@Service(value = ClusterViewService.class)
public class ClusterViewServiceImpl implements ClusterViewService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -62,7 +62,7 @@ public class ClusterViewServiceImpl impl
@Reference
private Config config;
-
+
/** the cluster view representing the isolated mode - ie only my own
instance in one cluster. used at bootstrap **/
private ClusterView isolatedClusterView;
Modified:
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java?rev=1470829&r1=1470828&r2=1470829&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java
(original)
+++
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java
Tue Apr 23 07:05:23 2013
@@ -59,8 +59,8 @@ import org.slf4j.LoggerFactory;
* Local heartbeats are stored in the repository. Remote heartbeats are POSTs
to
* remote TopologyConnectorServlets.
*/
-@Service(value = { HeartbeatHandler.class })
@Component
+@Service(value = { HeartbeatHandler.class })
public class HeartbeatHandler implements Runnable {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -85,7 +85,7 @@ public class HeartbeatHandler implements
@Reference
private Config config;
-
+
@Reference
private VotingHandler votingHandler;
@@ -117,7 +117,7 @@ public class HeartbeatHandler implements
protected void deactivate() {
scheduler.removeJob(NAME);
}
-
+
/**
* The initialize method is called by the DiscoveryServiceImpl.activate
* as we require the discoveryService (and the discoveryService has
@@ -140,7 +140,7 @@ public class HeartbeatHandler implements
logger.error("activate: Could not start heartbeat runner: " + e,
e);
}
}
-
+
public void run() {
// issue a heartbeat
issueHeartbeat();
@@ -211,12 +211,12 @@ public class HeartbeatHandler implements
+ maxLongLength + "d", System.currentTimeMillis());
String prefix = "0";
-
+
String leaderElectionRepositoryDescriptor =
config.getLeaderElectionRepositoryDescriptor();
if (leaderElectionRepositoryDescriptor!=null &&
leaderElectionRepositoryDescriptor.length()!=0) {
// when this property is configured, check the value of
the repository descriptor
// and if that value is set, include it in the leader
election id
-
+
final Session session =
resourceResolver.adaptTo(Session.class);
if ( session != null ) {
String value = session.getRepository()
@@ -248,7 +248,7 @@ public class HeartbeatHandler implements
}
}
- /** Check whether the established view matches the reality, ie matches the
+ /** Check whether the established view matches the reality, ie matches the
* heartbeats
*/
private void checkView() {
@@ -286,7 +286,7 @@ public class HeartbeatHandler implements
} else {
votingHandler.analyzeVotings(resourceResolver);
}
-
+
final VotingView winningVoting = VotingHelper.getWinningVoting(
resourceResolver, config);
int numOpenNonWinningVotes = VotingHelper.listOpenNonWinningVotings(
Modified:
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/announcement/AnnouncementRegistry.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/announcement/AnnouncementRegistry.java?rev=1470829&r1=1470828&r2=1470829&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/announcement/AnnouncementRegistry.java
(original)
+++
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/announcement/AnnouncementRegistry.java
Tue Apr 23 07:05:23 2013
@@ -29,7 +29,7 @@ import org.apache.sling.discovery.Instan
*/
public interface AnnouncementRegistry {
- public static enum ListScope {
+ enum ListScope {
OnlyInherited, // lists only announcements that were inherited from a
// TopologyConnectorServlet by a client
AllLocally, // lists all announcements that were received by the local
Modified:
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/announcement/AnnouncementRegistryImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/announcement/AnnouncementRegistryImpl.java?rev=1470829&r1=1470828&r2=1470829&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/announcement/AnnouncementRegistryImpl.java
(original)
+++
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/announcement/AnnouncementRegistryImpl.java
Tue Apr 23 07:05:23 2013
@@ -43,7 +43,7 @@ import org.apache.sling.settings.SlingSe
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Component(metatype = true, label = "Internal Topology Announcement Registry")
+@Component
@Service(value = AnnouncementRegistry.class)
public class AnnouncementRegistryImpl implements AnnouncementRegistry {
Modified:
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/connector/ConnectorRegistryImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/connector/ConnectorRegistryImpl.java?rev=1470829&r1=1470828&r2=1470829&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/connector/ConnectorRegistryImpl.java
(original)
+++
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/connector/ConnectorRegistryImpl.java
Tue Apr 23 07:05:23 2013
@@ -39,7 +39,7 @@ import org.osgi.service.component.Compon
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Component(metatype = true, label = "Internal Topology Connector Registry")
+@Component
@Service(value = ConnectorRegistry.class)
public class ConnectorRegistryImpl implements ConnectorRegistry {
Modified:
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/connector/TopologyConnectorClientInformation.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/connector/TopologyConnectorClientInformation.java?rev=1470829&r1=1470828&r2=1470829&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/connector/TopologyConnectorClientInformation.java
(original)
+++
sling/trunk/contrib/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/connector/TopologyConnectorClientInformation.java
Tue Apr 23 07:05:23 2013
@@ -25,30 +25,27 @@ import java.net.URL;
*/
public interface TopologyConnectorClientInformation {
- public static enum OriginInfo {
+ enum OriginInfo {
Config, // this connector was created via config
WebConsole, // this connector was created via the wbconsole
Programmatically // this connector was created programmatically
}
/** the endpoint url where this connector is connecting to **/
- public URL getConnectorUrl();
+ URL getConnectorUrl();
/** return the http status code of the last post to the servlet, -1 if no
post was ever done **/
- public int getStatusCode();
-
+ int getStatusCode();
+
/** whether or not this connector was able to successfully connect **/
- public boolean isConnected();
+ boolean isConnected();
/** the sling id of the remote end **/
- public String getRemoteSlingId();
-
- // public List<String> listFallbackConnectorUrls();
+ String getRemoteSlingId();
/** the unique id of this connector **/
- public String getId();
+ String getId();
/** the information about how this connector was created **/
- public OriginInfo getOriginInfo();
-
+ OriginInfo getOriginInfo();
}
