Fix non org.apache.druid files and add package name checkstyle rule (#6367)

* Fix non org.apache.druid files and add package name checkstyle rule

* PR comment
This commit is contained in:
Jonathan Wei 2018-09-21 17:58:19 -07:00 committed by Slim Bouguerra
parent 399a5659b2
commit 364bf9d1f9
8 changed files with 25 additions and 8 deletions

View File

@ -193,5 +193,10 @@
<property name="illegalPattern" value="true"/> <property name="illegalPattern" value="true"/>
<property name="message" value="Use org.apache.druid.common.config.NullHandling.nullToEmptyIfNeeded instead"/> <property name="message" value="Use org.apache.druid.common.config.NullHandling.nullToEmptyIfNeeded instead"/>
</module> </module>
<module name="PackageName">
<property name="format" value="^org.apache.druid.*$"/>
</module>
<module name="PackageDeclaration"/>
</module> </module>
</module> </module>

View File

@ -17,7 +17,9 @@
* under the License. * under the License.
*/ */
//CHECKSTYLE.OFF: PackageName
package org.apache.parquet.avro; package org.apache.parquet.avro;
//CHECKSTYLE.ON: PackageName
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
@ -37,6 +39,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
/**
* This class must in package org.apache.parquet.avro to access the AvroRecordMaterializer constructor
*/
public class DruidParquetReadSupport extends AvroReadSupport<GenericRecord> public class DruidParquetReadSupport extends AvroReadSupport<GenericRecord>
{ {

View File

@ -17,10 +17,10 @@
* under the License. * under the License.
*/ */
package org.apache.druid.emitter.statsd;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.druid.emitter.statsd.DimensionConverter;
import org.apache.druid.emitter.statsd.StatsDMetric;
import org.apache.druid.java.util.common.DateTimes; import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import org.apache.druid.java.util.emitter.service.ServiceMetricEvent;
import org.junit.Test; import org.junit.Test;

View File

@ -17,11 +17,11 @@
* under the License. * under the License.
*/ */
package org.apache.druid.emitter.statsd;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import org.apache.druid.java.util.emitter.service.ServiceMetricEvent;
import com.timgroup.statsd.StatsDClient; import com.timgroup.statsd.StatsDClient;
import org.apache.druid.emitter.statsd.StatsDEmitter;
import org.apache.druid.emitter.statsd.StatsDEmitterConfig;
import org.apache.druid.java.util.common.DateTimes; import org.apache.druid.java.util.common.DateTimes;
import org.junit.Test; import org.junit.Test;

View File

@ -17,7 +17,9 @@
* under the License. * under the License.
*/ */
//CHECKSTYLE.OFF: PackageName
package org.apache.hadoop.fs; package org.apache.hadoop.fs;
//CHECKSTYLE.ON: PackageName
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
import org.apache.druid.java.util.common.logger.Logger; import org.apache.druid.java.util.common.logger.Logger;

View File

@ -17,7 +17,10 @@
* under the License. * under the License.
*/ */
//CHECKSTYLE.OFF: PackageName
package org.testng; package org.testng;
//CHECKSTYLE.ON: PackageName
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
import com.google.inject.Injector; import com.google.inject.Injector;
@ -43,6 +46,9 @@ import java.net.URL;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.List; import java.util.List;
/**
* This class must be in package org.testng to access protected methods like TestNG.getDefault().getConfiguration()
*/
public class DruidTestRunnerFactory implements ITestRunnerFactory public class DruidTestRunnerFactory implements ITestRunnerFactory
{ {
private static final Logger LOG = new Logger(DruidTestRunnerFactory.class); private static final Logger LOG = new Logger(DruidTestRunnerFactory.class);

View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package io.druid.tests.security; package org.apache.druid.tests.security;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;

View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package io.druid.segment.realtime.firehose; package org.apache.druid.segment.realtime.firehose;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
@ -26,7 +26,6 @@ import org.apache.druid.data.input.impl.JSONParseSpec;
import org.apache.druid.data.input.impl.MapInputRowParser; import org.apache.druid.data.input.impl.MapInputRowParser;
import org.apache.druid.data.input.impl.TimestampSpec; import org.apache.druid.data.input.impl.TimestampSpec;
import org.apache.druid.jackson.DefaultObjectMapper; import org.apache.druid.jackson.DefaultObjectMapper;
import org.apache.druid.segment.realtime.firehose.EventReceiverFirehoseFactory;
import org.apache.druid.server.metrics.EventReceiverFirehoseRegister; import org.apache.druid.server.metrics.EventReceiverFirehoseRegister;
import org.apache.druid.server.security.AllowAllAuthenticator; import org.apache.druid.server.security.AllowAllAuthenticator;
import org.apache.druid.server.security.AuthConfig; import org.apache.druid.server.security.AuthConfig;
@ -39,7 +38,7 @@ import org.junit.Test;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Locale; import java.util.Locale;
public class EventReceiverFirehostIdleTest public class EventReceiverFirehoseIdleTest
{ {
private static final int CAPACITY = 300; private static final int CAPACITY = 300;
private static final long MAX_IDLE_TIME = 5_000L; private static final long MAX_IDLE_TIME = 5_000L;