Skip to content

STORM-1000: Use static member classes when permitted #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 1 commit into from
Sep 1, 2015
Merged

STORM-1000: Use static member classes when permitted #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions external/storm-kafka/src/jvm/storm/kafka/ExponentialBackoffMsgRetryManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public Set<Long> clearInvalidMessages(Long kafkaOffset) {
* </li>
* </ul>
*/
class MessageRetryRecord {
private class MessageRetryRecord {
private final long offset;
private final int retryNum;
private final long retryTimeUTC;
Expand Down Expand Up @@ -169,7 +169,7 @@ public int hashCode() {
}
}

class RetryTimeComparator implements Comparator<MessageRetryRecord> {
private static class RetryTimeComparator implements Comparator<MessageRetryRecord> {

@Override
public int compare(MessageRetryRecord record1, MessageRetryRecord record2) {
Expand Down
2 changes: 1 addition & 1 deletion storm-core/src/jvm/backtype/storm/coordination/BatchSubtopologyBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ private static interface InputDeclaration {
String getComponent();
}

private class BoltDeclarerImpl extends BaseConfigurationDeclarer<BoltDeclarer> implements BoltDeclarer {
private static class BoltDeclarerImpl extends BaseConfigurationDeclarer<BoltDeclarer> implements BoltDeclarer {
Component _component;

public BoltDeclarerImpl(Component component) {
Expand Down
2 changes: 1 addition & 1 deletion storm-core/src/jvm/backtype/storm/drpc/LinearDRPCTopologyBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ private static interface InputDeclaration {
public void declare(String prevComponent, InputDeclarer declarer);
}

private class InputDeclarerImpl extends BaseConfigurationDeclarer<LinearDRPCInputDeclarer> implements LinearDRPCInputDeclarer {
private static class InputDeclarerImpl extends BaseConfigurationDeclarer<LinearDRPCInputDeclarer> implements LinearDRPCInputDeclarer {
Component _component;

public InputDeclarerImpl(Component component) {
Expand Down
2 changes: 1 addition & 1 deletion storm-core/src/jvm/backtype/storm/security/auth/SaslTransportPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public TServer getServer(TProcessor processor) throws IOException, TTransportExc
*
* This is used on the server side to set the UGI for each specific call.
*/
private class TUGIWrapProcessor implements TProcessor {
private static class TUGIWrapProcessor implements TProcessor {
final TProcessor wrapped;

TUGIWrapProcessor(TProcessor wrapped) {
Expand Down
2 changes: 1 addition & 1 deletion storm-core/src/jvm/backtype/storm/security/auth/authorizer/DRPCSimpleACLAuthorizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class DRPCSimpleACLAuthorizer extends DRPCAuthorizerBase {
protected IPrincipalToLocal _ptol;
protected boolean _permitWhenMissingFunctionEntry = false;

protected class AclFunctionEntry {
protected static class AclFunctionEntry {
final public Set<String> clientUsers;
final public String invocationUser;
public AclFunctionEntry(Collection<String> clientUsers,
Expand Down
2 changes: 1 addition & 1 deletion storm-core/src/jvm/backtype/storm/security/auth/authorizer/ImpersonationAuthorizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ private boolean isAllowedToImpersonateUser(Set<String> authorizedGroups, String
return false;
}

protected class ImpersonationACL {
protected static class ImpersonationACL {
public String impersonatingUser;
//Groups this user is authorized to impersonate.
public Set<String> authorizedGroups;
Expand Down
2 changes: 1 addition & 1 deletion storm-core/src/jvm/backtype/storm/testing/OpaqueMemoryTransactionalSpout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public IOpaquePartitionedTransactionalSpout.Coordinator getCoordinator(Map conf,
return new Coordinator();
}

class Coordinator implements IOpaquePartitionedTransactionalSpout.Coordinator {
private static class Coordinator implements IOpaquePartitionedTransactionalSpout.Coordinator {
@Override
public boolean isReady() {
return true;
Expand Down
2 changes: 1 addition & 1 deletion storm-core/src/jvm/backtype/storm/transactional/TransactionalTopologyBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public SpoutDeclarer addConfigurations(Map conf) {
}
}

private class BoltDeclarerImpl extends BaseConfigurationDeclarer<BoltDeclarer> implements BoltDeclarer {
private static class BoltDeclarerImpl extends BaseConfigurationDeclarer<BoltDeclarer> implements BoltDeclarer {
Component _component;

public BoltDeclarerImpl(Component component) {
Expand Down
2 changes: 1 addition & 1 deletion storm-core/src/jvm/storm/trident/planner/SubtopologyBolt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public Map<String, Object> getComponentConfiguration() {
}


protected class InitialReceiver {
protected static class InitialReceiver {
List<TridentProcessor> _receivers = new ArrayList();
RootFactory _factory;
ProjectionFactory _project;
Expand Down
2 changes: 1 addition & 1 deletion storm-core/src/jvm/storm/trident/spout/RichSpoutBatchExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public void close() {

}

class RichSpoutCoordinator implements ITridentSpout.BatchCoordinator {
private static class RichSpoutCoordinator implements ITridentSpout.BatchCoordinator {
@Override
public Object initializeTransaction(long txid, Object prevMetadata, Object currMetadata) {
return null;
Expand Down
2 changes: 1 addition & 1 deletion storm-core/src/jvm/storm/trident/testing/FeederBatchSpout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public boolean isReady(long txid) {
}
}

public class FeederEmitter implements ITridentSpout.Emitter<Map<Integer, List<List<Object>>>> {
private static class FeederEmitter implements ITridentSpout.Emitter<Map<Integer, List<List<Object>>>> {

int _index;

Expand Down
2 changes: 1 addition & 1 deletion storm-core/src/jvm/storm/trident/topology/TridentBoltExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public String toString() {
}
}

public class CoordinatedOutputCollector implements IOutputCollector {
private static class CoordinatedOutputCollector implements IOutputCollector {
IOutputCollector _delegate;

TrackedBatch _currBatch = null;;
Expand Down
4 changes: 2 additions & 2 deletions storm-core/src/jvm/storm/trident/topology/TridentTopologyBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ private static interface InputDeclaration {
String getStream();
}

private class SpoutDeclarerImpl extends BaseConfigurationDeclarer<SpoutDeclarer> implements SpoutDeclarer {
private static class SpoutDeclarerImpl extends BaseConfigurationDeclarer<SpoutDeclarer> implements SpoutDeclarer {
SpoutComponent _component;

public SpoutDeclarerImpl(SpoutComponent component) {
Expand All @@ -346,7 +346,7 @@ public SpoutDeclarer addConfigurations(Map conf) {
}
}

private class BoltDeclarerImpl extends BaseConfigurationDeclarer<BoltDeclarer> implements BoltDeclarer {
private static class BoltDeclarerImpl extends BaseConfigurationDeclarer<BoltDeclarer> implements BoltDeclarer {
Component _component;

public BoltDeclarerImpl(Component component) {
Expand Down