Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion THIRD-PARTY.properties
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDD
javax.servlet.jsp--jsp-api--2.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
javax.transaction--transaction-api--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
org.glassfish.jersey--jersey-bom--2.27=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
org.glassfish.jersey--jersey-bom--2.27=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,4 @@ public String nextKey() {
public int nextInt(int bound) {
return rand.nextInt(bound);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ public void run() {
}

}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ public void run() {
runTime = System.currentTimeMillis() - start;
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,4 @@ public Map<String, Object> getComponentConfiguration() {
public void cleanup() {
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -147,4 +147,4 @@ private void loadConfigKeys(Map<String, Object> conf) {
}
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@ public static void login(Map<String, Object> conf, Configuration hdfsConfig) thr
}
}
}
}
}
2 changes: 1 addition & 1 deletion external/storm-hdfs/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ log4j.rootLogger = WARN, out

log4j.appender.out = org.apache.log4j.ConsoleAppender
log4j.appender.out.layout = org.apache.log4j.PatternLayout
log4j.appender.out.layout.ConversionPattern = %d (%t) [%p - %l] %m%n
log4j.appender.out.layout.ConversionPattern = %d (%t) [%p - %l] %m%n
2 changes: 1 addition & 1 deletion external/storm-jms/src/test/resources/jndi.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# limitations under the License.

java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
java.naming.provider.url = vm://localhost?broker.persistent=false
java.naming.provider.url = vm://localhost?broker.persistent=false
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*******************************************************************************
/*
* 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
Expand All @@ -14,7 +14,7 @@
* 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.storm.kafka.monitor;

Expand Down
2 changes: 1 addition & 1 deletion flux/flux-core/src/test/resources/configs/test.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@

topology.name: substitution-topology
a.list.property: ["A string list"]
some.other.property: foo bar
some.other.property: foo bar
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# limitations under the License.

hbase.rootdir=hdfs://hadoop:54310/hbase
hbase.zookeeper.quorum=hadoop
hbase.zookeeper.quorum=hadoop
2 changes: 1 addition & 1 deletion flux/flux-examples/src/main/resources/hdfs_bolt.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ hdfs.write.dir=/incoming

# The HDFS directory where files will be moved once the bolt has
# finished writing to it.
hdfs.dest.dir=/complete
hdfs.dest.dir=/complete
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ public void execute(TupleWindow inputWindow) {
public void declareOutputFields(OutputFieldsDeclarer declarer) {
declarer.declare(new Fields(DUMMY_FIELD));
}
}
}
20 changes: 18 additions & 2 deletions storm-checkstyle/src/main/resources/storm/storm_checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<property name="eachLine" value="true"/>
</module>

<module name="NewlineAtEndOfFile"/>

<module name="LineLength">
<property name="fileExtensions" value="java"/>
<property name="max" value="100"/>
Expand All @@ -84,7 +86,7 @@
<property name="onCommentFormat" value='^\s*"""\s*(?:[,;]|.+)$'/>
</module>
<module name="SuppressWithPlainTextCommentFilter">
<property name="checkFormat" value="IndentationCheck"/>
<property name="checkFormat" value="\.IndentationCheck$"/>
<property name="offCommentFormat" value='^""".?'/>
<property name="onCommentFormat" value='.'/>
</module>
Expand Down Expand Up @@ -409,13 +411,20 @@
RECORD_DEF, RECORD_PATTERN_DEF"/>
</module>
<module name="OperatorWrap">
<property name="id" value="OperatorWrapNL"/>
<property name="option" value="NL"/>
<property name="tokens"
value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF,
TYPE_EXTENSION_AND "/>
<property name="severity" value="warning"/>
</module>
<module name="OperatorWrap">
<property name="id" value="OperatorWrapEOL"/>
<property name="option" value="EOL"/>
<property name="tokens" value="LAMBDA"/>
<property name="severity" value="warning"/>
</module>
<module name="AnnotationLocation">
<property name="id" value="AnnotationLocationTypeAndPackage"/>
<property name="tokens"
Expand Down Expand Up @@ -505,10 +514,17 @@
<property name="severity" value="warning"/>
</module>
<module name="TodoComment">
<property name="id" value="TodoFormat"/>
<property name="format" value="^[ \t]*(?!TODO:)(?i:TODO)\b:?"/>
<message key="todo.match"
value="''TODO:'' must be written in all caps and followed by a colon."/>
</module>
<module name="TodoComment">
<property name="id" value="BoxComments"/>
<property name="format" value="^[ \t]*([*=#])\1{8,}[ \t]*$"/>
<message key="todo.match"
value="Comment uses box-like repetitive character pattern."/>
</module>
<module name="EmptyCatchBlock">
<property name="commentFormat" value="\w+"/>
</module>
Expand All @@ -535,4 +551,4 @@
<property name="influenceFormat" value="1"/>
</module>
</module>
</module>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,4 @@ public void close() {
public long getRemoteBlobstoreUpdateTime() throws IOException {
return -1L; // not supported
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -141,4 +141,4 @@ public void haltTransferThd() {
transferQueue.close();
}

}
}
4 changes: 1 addition & 3 deletions storm-client/src/jvm/org/apache/storm/executor/Executor.java
Original file line number Diff line number Diff line change
Expand Up @@ -724,9 +724,7 @@ private Map<String, Map<String, LoadAwareCustomStreamGrouping>> outboundComponen
return ret;
}

// =============================================================================
// ============================ getter methods =================================
// =============================================================================
// getter methods

private Map<String, Object> normalizedComponentConf(
Map<String, Object> topoConf, WorkerTopologyContext topologyContext, String componentId) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -361,4 +361,4 @@ void resetWeight() {
weight = MAX_WEIGHT;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,7 @@ private byte[] getKeyBytes(List<Object> values) {
return raw;
}

/*==================================================
* Helper Classes
*==================================================*/
// Helper Classes

/**
* This interface is responsible for choosing a subset of the target tasks to use for a given key.
Expand Down Expand Up @@ -196,4 +194,4 @@ public Integer chooseTask(int[] assignedTasks) {
return taskIdWithMinLoad;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -173,4 +173,4 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
LOG.error("Exception thrown while decoding messages in channel {}; exception: ", ctx.channel(), cause);
ctx.close();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ public Long getDataFrom(CgroupCore core) throws IOException {
previousTime = now;
return msGuarantee;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,4 @@ public Object getValueAndReset() {
}

public abstract T getDataFrom(CgroupCore core) throws Exception;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,4 @@ public interface DimensionHandler {
*/
void setDimensions(Map<String, String> dimensions);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ public boolean equals(Object o) {
public int hashCode() {
return taskId + componentId.hashCode() + streamId.hashCode();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ void degister(MetricFilter metricFilter) {
meters.entrySet().removeIf(entry -> metricFilter.matches(entry.getKey(), entry.getValue()));
timers.entrySet().removeIf(entry -> metricFilter.matches(entry.getKey(), entry.getValue()));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ private synchronized int getUserHz() throws IOException {
}
return userHz;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@ public void setDimensions(Map<String, String> dimensions) {
public void close() throws IOException {
super.close();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@ public void prepare(MetricRegistry metricsRegistry, Map<String, Object> topoConf
public void close() throws IOException {
super.close();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,4 @@ public void prepare(MetricRegistry metricsRegistry, Map<String, Object> topoConf
public void close() throws IOException {
super.close();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,4 @@ public void close() throws IOException {
reporter.close();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ default void prepare(MetricRegistryProvider metricRegistryProvider, Map<String,
void start();

void stop();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ public String toLocal(String principalName) {
}


}
}
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,4 @@ private Boolean checkUserGroupAllowed(Set<String> userGroups, Set<String> config
}
return false;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ public void handle(Callback[] callbacks) throws UnsupportedCallbackException {
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,4 @@ public KeyStore getKeyStore(String keystorePath, String keystorePassword) throws
}
return keystore;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@ private synchronized void reloadCert(String trustStorePath, String keystorePassw
}
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,7 @@ public static <K1, K2> Map windowSetConverter(
return ret;
}

// =====================================================================================
// key transformers
// =====================================================================================

/**
* Provides a way to transform one key into another.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,4 @@ public void close() throws Exception {
localOverrideClient = null;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@ public void log(final ShellMsg shellMsg) {
break;
}
}
}
}
2 changes: 1 addition & 1 deletion storm-client/src/jvm/org/apache/storm/utils/JCQueue.java
Original file line number Diff line number Diff line change
Expand Up @@ -582,4 +582,4 @@ void afterFlush(boolean wasFull) {
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ void setUpContext(Class<?> ownerCls, ShellProcess process,
* @param msg - the {@link ShellMsg} containing the message to log.
*/
void log(ShellMsg msg);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ branch=not-a-real-branch
date=today
user=me
url=https://storm.apache.org/
srcChecksum=0
srcChecksum=0
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ public static void main(String[] args) throws Exception {
ServerUtils.execCommand(newArgs);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ protected final void addCommandArguments(String... arguments) {
public String getCommandWithArguments() {
return StringUtils.join(commandWithArguments, " ");
}
}
}
Loading