commit 9f05667878da3c24fc6098fdf9cfefadd40d6a7a Author: Karsten Loesing karsten.loesing@gmx.net Date: Thu Jul 5 10:58:44 2018 +0200

Rename packages.

Rename root package org.torproject.collector to org.torproject.metrics.collector and ..index to ..indexer.

Implements #24291. --- CHANGELOG.md | 7 +++++ build.xml | 10 +++---- .../torproject/{ => metrics}/collector/Main.java | 26 ++++++++--------- .../bridgedescs/BridgeDescriptorParser.java | 4 +-- .../bridgedescs/BridgeSnapshotReader.java | 4 +-- .../collector/bridgedescs/DescriptorBuilder.java | 2 +- .../bridgedescs/SanitizedBridgesWriter.java | 12 ++++---- .../{ => metrics}/collector/conf/Annotation.java | 2 +- .../collector/conf/Configuration.java | 2 +- .../collector/conf/ConfigurationException.java | 2 +- .../{ => metrics}/collector/conf/Key.java | 2 +- .../{ => metrics}/collector/conf/SourceType.java | 2 +- .../collector/cron/CollecTorMain.java | 12 ++++---- .../{ => metrics}/collector/cron/Scheduler.java | 8 ++--- .../{ => metrics}/collector/cron/ShutdownHook.java | 2 +- .../collector/exitlists/ExitListDownloader.java | 12 ++++---- .../collector/indexer}/CreateIndexJson.java | 10 +++---- .../collector/onionperf/OnionPerfDownloader.java | 10 +++---- .../persist/BridgeExtraInfoPersistence.java | 4 +-- .../persist/BridgeServerDescriptorPersistence.java | 4 +-- .../collector/persist/ConsensusPersistence.java | 4 +-- .../collector/persist/DescriptorPersistence.java | 2 +- .../collector/persist/ExitlistPersistence.java | 4 +-- .../collector/persist/ExtraInfoPersistence.java | 4 +-- .../persist/MicroConsensusPersistence.java | 4 +-- .../collector/persist/OnionPerfPersistence.java | 4 +-- .../collector/persist/PersistenceUtils.java | 2 +- .../persist/ServerDescriptorPersistence.java | 4 +-- .../collector/persist/StatusPersistence.java | 4 +-- .../collector/persist/VotePersistence.java | 4 +-- .../persist/WebServerAccessLogPersistence.java | 2 +- .../collector/persist/package-info.java | 2 +- .../collector/relaydescs/ArchiveReader.java | 2 +- .../collector/relaydescs/ArchiveWriter.java | 16 +++++----- .../relaydescs/CachedRelayDescriptorReader.java | 2 +- .../collector/relaydescs/ReferenceChecker.java | 2 +- .../relaydescs/RelayDescriptorDownloader.java | 2 +- .../relaydescs/RelayDescriptorParser.java | 2 +- .../{ => metrics}/collector/sync/Criterium.java | 2 +- .../collector/sync/ProcessCriterium.java | 2 +- .../{ => metrics}/collector/sync/SyncManager.java | 9 +++--- .../collector/sync/SyncPersistence.java | 34 +++++++++++----------- .../{ => metrics}/collector/sync/package-info.java | 2 +- .../collector/webstats/LogFileMap.java | 2 +- .../collector/webstats/LogMetadata.java | 2 +- .../collector/webstats/SanitizeWeblogs.java | 17 +++++------ .../{ => metrics}/collector/MainTest.java | 10 +++---- .../bridgedescs/BridgeDescriptorParserTest.java | 4 +-- .../ExtraInfoTestDescriptorBuilder.java | 2 +- .../NetworkStatusTestDescriptorBuilder.java | 2 +- .../bridgedescs/SanitizedBridgesWriterTest.java | 10 +++---- .../bridgedescs/ServerTestDescriptorBuilder.java | 2 +- .../collector/bridgedescs/TarballTestBuilder.java | 2 +- .../bridgedescs/TestDescriptorBuilder.java | 2 +- .../collector/conf/ConfigurationTest.java | 8 ++--- .../{ => metrics}/collector/cron/Broken.java | 6 ++-- .../collector/cron/CollecTorMainTest.java | 10 +++---- .../{ => metrics}/collector/cron/Counter.java | 6 ++-- .../{ => metrics}/collector/cron/Dummy.java | 6 ++-- .../collector/cron/SchedulerTest.java | 8 ++--- .../collector/persist/PersistUtilsTest.java | 2 +- .../collector/relaydescs/ReferenceCheckerTest.java | 2 +- .../collector/sync/FileCollector.java | 2 +- .../collector/sync/SyncPersistenceTest.java | 6 ++-- .../collector/webstats/LogFileMapTest.java | 2 +- .../collector/webstats/LogMetadataTest.java | 2 +- .../collector/webstats/SanitizeWeblogsTest.java | 2 +- 67 files changed, 187 insertions(+), 182 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a88792..cf2cfd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Changes in version 1.?.? - 2018-??-?? + + * Minor changes + - Rename root package org.torproject.collector to + org.torproject.metrics.collector and ..index to ..indexer. + + # Changes in version 1.6.0 - 2018-05-23

* Medium changes diff --git a/build.xml b/build.xml index e78c160..0c79d1e 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> <property name="release.version" value="1.6.0-dev" /> - <property name="project-main-class" value="org.torproject.collector.Main" /> + <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.4.0" /> <property name="jarincludes" value="collector.properties logback.xml" /> @@ -29,13 +29,13 @@

<target name="coverage-check"> <cobertura-check totallinerate="31" totalbranchrate="26" > - <regex pattern="org.torproject.collector.bridgedescs" + <regex pattern="org.torproject.metrics.collector.bridgedescs" branchrate="87" linerate="73"/> - <regex pattern="org.torproject.collector.conf" + <regex pattern="org.torproject.metrics.collector.conf" branchrate="87" linerate="100"/> - <regex pattern="org.torproject.collector.cron" + <regex pattern="org.torproject.metrics.collector.cron" branchrate="66" linerate="72" /> - <regex pattern="org.torproject.collector.Main" + <regex pattern="org.torproject.metrics.collector.Main" branchrate="100" linerate="91" /> </cobertura-check> </target> diff --git a/src/main/java/org/torproject/collector/Main.java b/src/main/java/org/torproject/metrics/collector/Main.java similarity index 80% rename from src/main/java/org/torproject/collector/Main.java rename to src/main/java/org/torproject/metrics/collector/Main.java index 70cdbfa..6233dd2 100644 --- a/src/main/java/org/torproject/collector/Main.java +++ b/src/main/java/org/torproject/metrics/collector/Main.java @@ -1,20 +1,20 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector; +package org.torproject.metrics.collector;

-import org.torproject.collector.bridgedescs.SanitizedBridgesWriter; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; -import org.torproject.collector.cron.CollecTorMain; -import org.torproject.collector.cron.Scheduler; -import org.torproject.collector.cron.ShutdownHook; -import org.torproject.collector.exitlists.ExitListDownloader; -import org.torproject.collector.index.CreateIndexJson; -import org.torproject.collector.onionperf.OnionPerfDownloader; -import org.torproject.collector.relaydescs.ArchiveWriter; -import org.torproject.collector.webstats.SanitizeWeblogs; +import org.torproject.metrics.collector.bridgedescs.SanitizedBridgesWriter; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.cron.CollecTorMain; +import org.torproject.metrics.collector.cron.Scheduler; +import org.torproject.metrics.collector.cron.ShutdownHook; +import org.torproject.metrics.collector.exitlists.ExitListDownloader; +import org.torproject.metrics.collector.indexer.CreateIndexJson; +import org.torproject.metrics.collector.onionperf.OnionPerfDownloader; +import org.torproject.metrics.collector.relaydescs.ArchiveWriter; +import org.torproject.metrics.collector.webstats.SanitizeWeblogs;

import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java similarity index 93% rename from src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java rename to src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java index 1b115ad..5134f0f 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java @@ -1,9 +1,9 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs;

-import org.torproject.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.ConfigurationException;

import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java similarity index 98% rename from src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java rename to src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java index 487aac8..1a58d84 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java @@ -1,9 +1,9 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs;

-import org.torproject.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.ConfigurationException;

import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.digest.DigestUtils; diff --git a/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/DescriptorBuilder.java similarity index 97% rename from src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java rename to src/main/java/org/torproject/metrics/collector/bridgedescs/DescriptorBuilder.java index 9d23adf..367e2e2 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/DescriptorBuilder.java @@ -1,7 +1,7 @@ /* Copyright 2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs;

import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java similarity index 99% rename from src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java rename to src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java index af54e03..23b91ad 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java @@ -1,16 +1,16 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs;

-import org.torproject.collector.conf.Annotation; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; -import org.torproject.collector.cron.CollecTorMain; import org.torproject.descriptor.BridgeExtraInfoDescriptor; import org.torproject.descriptor.BridgeNetworkStatus; import org.torproject.descriptor.BridgeServerDescriptor; +import org.torproject.metrics.collector.conf.Annotation; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.cron.CollecTorMain;

import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Base64; diff --git a/src/main/java/org/torproject/collector/conf/Annotation.java b/src/main/java/org/torproject/metrics/collector/conf/Annotation.java similarity index 95% rename from src/main/java/org/torproject/collector/conf/Annotation.java rename to src/main/java/org/torproject/metrics/collector/conf/Annotation.java index 6a8094e..a796f4d 100644 --- a/src/main/java/org/torproject/collector/conf/Annotation.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Annotation.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.conf; +package org.torproject.metrics.collector.conf;

/** This enum contains all currently valid descriptor annotations. */ public enum Annotation { diff --git a/src/main/java/org/torproject/collector/conf/Configuration.java b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java similarity index 99% rename from src/main/java/org/torproject/collector/conf/Configuration.java rename to src/main/java/org/torproject/metrics/collector/conf/Configuration.java index 72bd5fc..503ebbf 100644 --- a/src/main/java/org/torproject/collector/conf/Configuration.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.conf; +package org.torproject.metrics.collector.conf;

import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/conf/ConfigurationException.java b/src/main/java/org/torproject/metrics/collector/conf/ConfigurationException.java similarity index 87% rename from src/main/java/org/torproject/collector/conf/ConfigurationException.java rename to src/main/java/org/torproject/metrics/collector/conf/ConfigurationException.java index 1d55341..5257434 100644 --- a/src/main/java/org/torproject/collector/conf/ConfigurationException.java +++ b/src/main/java/org/torproject/metrics/collector/conf/ConfigurationException.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.conf; +package org.torproject.metrics.collector.conf;

public class ConfigurationException extends Exception {

diff --git a/src/main/java/org/torproject/collector/conf/Key.java b/src/main/java/org/torproject/metrics/collector/conf/Key.java similarity index 98% rename from src/main/java/org/torproject/collector/conf/Key.java rename to src/main/java/org/torproject/metrics/collector/conf/Key.java index 5e91e3e..ba4bcd9 100644 --- a/src/main/java/org/torproject/collector/conf/Key.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Key.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.conf; +package org.torproject.metrics.collector.conf;

import java.net.URL; import java.nio.file.Path; diff --git a/src/main/java/org/torproject/collector/conf/SourceType.java b/src/main/java/org/torproject/metrics/collector/conf/SourceType.java similarity index 76% rename from src/main/java/org/torproject/collector/conf/SourceType.java rename to src/main/java/org/torproject/metrics/collector/conf/SourceType.java index 0ae18ce..984ff21 100644 --- a/src/main/java/org/torproject/collector/conf/SourceType.java +++ b/src/main/java/org/torproject/metrics/collector/conf/SourceType.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.conf; +package org.torproject.metrics.collector.conf;

public enum SourceType { Cache, diff --git a/src/main/java/org/torproject/collector/cron/CollecTorMain.java b/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java similarity index 93% rename from src/main/java/org/torproject/collector/cron/CollecTorMain.java rename to src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java index d2a92f6..95f7445 100644 --- a/src/main/java/org/torproject/collector/cron/CollecTorMain.java +++ b/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java @@ -1,14 +1,14 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.cron; +package org.torproject.metrics.collector.cron;

-import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; -import org.torproject.collector.conf.SourceType; -import org.torproject.collector.sync.SyncManager; import org.torproject.descriptor.Descriptor; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.conf.SourceType; +import org.torproject.metrics.collector.sync.SyncManager;

import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/cron/Scheduler.java b/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java similarity index 96% rename from src/main/java/org/torproject/collector/cron/Scheduler.java rename to src/main/java/org/torproject/metrics/collector/cron/Scheduler.java index ca8bc0a..1fc0039 100644 --- a/src/main/java/org/torproject/collector/cron/Scheduler.java +++ b/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java @@ -1,11 +1,11 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.cron; +package org.torproject.metrics.collector.cron;

-import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key;

import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/cron/ShutdownHook.java b/src/main/java/org/torproject/metrics/collector/cron/ShutdownHook.java similarity index 93% rename from src/main/java/org/torproject/collector/cron/ShutdownHook.java rename to src/main/java/org/torproject/metrics/collector/cron/ShutdownHook.java index b9bade6..70699f6 100644 --- a/src/main/java/org/torproject/collector/cron/ShutdownHook.java +++ b/src/main/java/org/torproject/metrics/collector/cron/ShutdownHook.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.cron; +package org.torproject.metrics.collector.cron;

import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java similarity index 95% rename from src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java rename to src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java index 587f563..4ef8974 100644 --- a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java @@ -1,17 +1,17 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.exitlists; +package org.torproject.metrics.collector.exitlists;

-import org.torproject.collector.conf.Annotation; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; -import org.torproject.collector.cron.CollecTorMain; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorParser; import org.torproject.descriptor.DescriptorSourceFactory; import org.torproject.descriptor.ExitList; +import org.torproject.metrics.collector.conf.Annotation; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.cron.CollecTorMain;

import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/index/CreateIndexJson.java b/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java similarity index 95% rename from src/main/java/org/torproject/collector/index/CreateIndexJson.java rename to src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java index 5f030eb..55ebd15 100644 --- a/src/main/java/org/torproject/collector/index/CreateIndexJson.java +++ b/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java @@ -1,16 +1,16 @@ /* Copyright 2015--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.index; +package org.torproject.metrics.collector.indexer;

-import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; -import org.torproject.collector.cron.CollecTorMain; import org.torproject.descriptor.index.DirectoryNode; import org.torproject.descriptor.index.FileNode; import org.torproject.descriptor.index.IndexNode; import org.torproject.descriptor.internal.FileType; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.cron.CollecTorMain;

import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/onionperf/OnionPerfDownloader.java b/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java similarity index 97% rename from src/main/java/org/torproject/collector/onionperf/OnionPerfDownloader.java rename to src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java index 16a05e7..ab7c4f9 100644 --- a/src/main/java/org/torproject/collector/onionperf/OnionPerfDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java @@ -1,16 +1,16 @@ /* Copyright 2012--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.onionperf; +package org.torproject.metrics.collector.onionperf;

-import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; -import org.torproject.collector.cron.CollecTorMain; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorParser; import org.torproject.descriptor.DescriptorSourceFactory; import org.torproject.descriptor.TorperfResult; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.cron.CollecTorMain;

import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/persist/BridgeExtraInfoPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/BridgeExtraInfoPersistence.java similarity index 90% rename from src/main/java/org/torproject/collector/persist/BridgeExtraInfoPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/BridgeExtraInfoPersistence.java index 1b8a602..23245c3 100644 --- a/src/main/java/org/torproject/collector/persist/BridgeExtraInfoPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/BridgeExtraInfoPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist;

-import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.BridgeExtraInfoDescriptor; +import org.torproject.metrics.collector.conf.Annotation;

import java.nio.file.Paths;

diff --git a/src/main/java/org/torproject/collector/persist/BridgeServerDescriptorPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/BridgeServerDescriptorPersistence.java similarity index 90% rename from src/main/java/org/torproject/collector/persist/BridgeServerDescriptorPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/BridgeServerDescriptorPersistence.java index 8ff7a1a..7694f14 100644 --- a/src/main/java/org/torproject/collector/persist/BridgeServerDescriptorPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/BridgeServerDescriptorPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist;

-import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.BridgeServerDescriptor; +import org.torproject.metrics.collector.conf.Annotation;

import java.nio.file.Paths;

diff --git a/src/main/java/org/torproject/collector/persist/ConsensusPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/ConsensusPersistence.java similarity index 91% rename from src/main/java/org/torproject/collector/persist/ConsensusPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/ConsensusPersistence.java index 4425634..b48077f 100644 --- a/src/main/java/org/torproject/collector/persist/ConsensusPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/ConsensusPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist;

-import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.RelayNetworkStatusConsensus; +import org.torproject.metrics.collector.conf.Annotation;

import java.nio.file.Paths;

diff --git a/src/main/java/org/torproject/collector/persist/DescriptorPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/DescriptorPersistence.java similarity index 98% rename from src/main/java/org/torproject/collector/persist/DescriptorPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/DescriptorPersistence.java index 01c9fad..ea3d67d 100644 --- a/src/main/java/org/torproject/collector/persist/DescriptorPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/DescriptorPersistence.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist;

import org.torproject.descriptor.Descriptor;

diff --git a/src/main/java/org/torproject/collector/persist/ExitlistPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/ExitlistPersistence.java similarity index 89% rename from src/main/java/org/torproject/collector/persist/ExitlistPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/ExitlistPersistence.java index d992cd5..307f3fa 100644 --- a/src/main/java/org/torproject/collector/persist/ExitlistPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/ExitlistPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist;

-import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.ExitList; +import org.torproject.metrics.collector.conf.Annotation;

import java.nio.file.Paths;

diff --git a/src/main/java/org/torproject/collector/persist/ExtraInfoPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/ExtraInfoPersistence.java similarity index 90% rename from src/main/java/org/torproject/collector/persist/ExtraInfoPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/ExtraInfoPersistence.java index 93bdfe5..4ac8cba 100644 --- a/src/main/java/org/torproject/collector/persist/ExtraInfoPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/ExtraInfoPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist;

-import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.RelayExtraInfoDescriptor; +import org.torproject.metrics.collector.conf.Annotation;

import java.nio.file.Paths;

diff --git a/src/main/java/org/torproject/collector/persist/MicroConsensusPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/MicroConsensusPersistence.java similarity index 92% rename from src/main/java/org/torproject/collector/persist/MicroConsensusPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/MicroConsensusPersistence.java index 1858334..a3e189a 100644 --- a/src/main/java/org/torproject/collector/persist/MicroConsensusPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/MicroConsensusPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist;

-import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.RelayNetworkStatusConsensus; +import org.torproject.metrics.collector.conf.Annotation;

import java.nio.file.Paths;

diff --git a/src/main/java/org/torproject/collector/persist/OnionPerfPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/OnionPerfPersistence.java similarity index 92% rename from src/main/java/org/torproject/collector/persist/OnionPerfPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/OnionPerfPersistence.java index d8e1b33..bc654a4 100644 --- a/src/main/java/org/torproject/collector/persist/OnionPerfPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/OnionPerfPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist;

-import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.TorperfResult; +import org.torproject.metrics.collector.conf.Annotation;

import java.nio.file.Paths; import java.nio.file.StandardOpenOption; diff --git a/src/main/java/org/torproject/collector/persist/PersistenceUtils.java b/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java similarity index 98% rename from src/main/java/org/torproject/collector/persist/PersistenceUtils.java rename to src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java index 0537145..7d30cb1 100644 --- a/src/main/java/org/torproject/collector/persist/PersistenceUtils.java +++ b/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist;

import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/persist/ServerDescriptorPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/ServerDescriptorPersistence.java similarity index 91% rename from src/main/java/org/torproject/collector/persist/ServerDescriptorPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/ServerDescriptorPersistence.java index cd5d92c..bb0ae64 100644 --- a/src/main/java/org/torproject/collector/persist/ServerDescriptorPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/ServerDescriptorPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist;

-import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.RelayServerDescriptor; +import org.torproject.metrics.collector.conf.Annotation;

import java.nio.file.Paths;

diff --git a/src/main/java/org/torproject/collector/persist/StatusPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/StatusPersistence.java similarity index 90% rename from src/main/java/org/torproject/collector/persist/StatusPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/StatusPersistence.java index 165cf6c..c3cbf9e 100644 --- a/src/main/java/org/torproject/collector/persist/StatusPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/StatusPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist;

-import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.BridgeNetworkStatus; +import org.torproject.metrics.collector.conf.Annotation;

import java.nio.file.Paths;

diff --git a/src/main/java/org/torproject/collector/persist/VotePersistence.java b/src/main/java/org/torproject/metrics/collector/persist/VotePersistence.java similarity index 95% rename from src/main/java/org/torproject/collector/persist/VotePersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/VotePersistence.java index 45f117f..a1bb032 100644 --- a/src/main/java/org/torproject/collector/persist/VotePersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/VotePersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist;

-import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.RelayNetworkStatusVote; +import org.torproject.metrics.collector.conf.Annotation;

import org.apache.commons.codec.digest.DigestUtils;

diff --git a/src/main/java/org/torproject/collector/persist/WebServerAccessLogPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java similarity index 97% rename from src/main/java/org/torproject/collector/persist/WebServerAccessLogPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java index dab4112..b10f706 100644 --- a/src/main/java/org/torproject/collector/persist/WebServerAccessLogPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist;

import org.torproject.descriptor.WebServerAccessLog; import org.torproject.descriptor.internal.FileType; diff --git a/src/main/java/org/torproject/collector/persist/package-info.java b/src/main/java/org/torproject/metrics/collector/persist/package-info.java similarity index 87% rename from src/main/java/org/torproject/collector/persist/package-info.java rename to src/main/java/org/torproject/metrics/collector/persist/package-info.java index 6f75116..d3f6d2f 100644 --- a/src/main/java/org/torproject/collector/persist/package-info.java +++ b/src/main/java/org/torproject/metrics/collector/persist/package-info.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist;

/** This package containes decorating classes for descriptors that * simply determine the two storage paths based on the descriptor diff --git a/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java similarity index 99% rename from src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java rename to src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java index c665acb..22a3113 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java @@ -1,7 +1,7 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.relaydescs; +package org.torproject.metrics.collector.relaydescs;

import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; diff --git a/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java similarity index 98% rename from src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java rename to src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java index e8d717a..11388f2 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java @@ -1,14 +1,8 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.relaydescs; - -import org.torproject.collector.conf.Annotation; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; -import org.torproject.collector.conf.SourceType; -import org.torproject.collector.cron.CollecTorMain; +package org.torproject.metrics.collector.relaydescs; + import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorParser; import org.torproject.descriptor.DescriptorSourceFactory; @@ -17,6 +11,12 @@ import org.torproject.descriptor.RelayNetworkStatusConsensus; import org.torproject.descriptor.RelayNetworkStatusVote; import org.torproject.descriptor.RelayServerDescriptor; import org.torproject.descriptor.UnparseableDescriptor; +import org.torproject.metrics.collector.conf.Annotation; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.conf.SourceType; +import org.torproject.metrics.collector.cron.CollecTorMain;

import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java similarity index 99% rename from src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java rename to src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java index 4986509..5b5d218 100644 --- a/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java @@ -1,7 +1,7 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.relaydescs; +package org.torproject.metrics.collector.relaydescs;

import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.digest.DigestUtils; diff --git a/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ReferenceChecker.java similarity index 99% rename from src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java rename to src/main/java/org/torproject/metrics/collector/relaydescs/ReferenceChecker.java index df0508a..83b3ae9 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ReferenceChecker.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.relaydescs; +package org.torproject.metrics.collector.relaydescs;

import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorReader; diff --git a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java similarity index 99% rename from src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java rename to src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java index 453a466..a65ea9a 100644 --- a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java @@ -1,7 +1,7 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.relaydescs; +package org.torproject.metrics.collector.relaydescs;

import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; diff --git a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java similarity index 99% rename from src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java rename to src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java index be26040..74e0ce9 100644 --- a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java @@ -1,7 +1,7 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.relaydescs; +package org.torproject.metrics.collector.relaydescs;

import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Hex; diff --git a/src/main/java/org/torproject/collector/sync/Criterium.java b/src/main/java/org/torproject/metrics/collector/sync/Criterium.java similarity index 86% rename from src/main/java/org/torproject/collector/sync/Criterium.java rename to src/main/java/org/torproject/metrics/collector/sync/Criterium.java index b612794..c9d6212 100644 --- a/src/main/java/org/torproject/collector/sync/Criterium.java +++ b/src/main/java/org/torproject/metrics/collector/sync/Criterium.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.sync; +package org.torproject.metrics.collector.sync;

/** Interface for decisions to be made in the sync-process. */ public interface Criterium<T> { diff --git a/src/main/java/org/torproject/collector/sync/ProcessCriterium.java b/src/main/java/org/torproject/metrics/collector/sync/ProcessCriterium.java similarity index 92% rename from src/main/java/org/torproject/collector/sync/ProcessCriterium.java rename to src/main/java/org/torproject/metrics/collector/sync/ProcessCriterium.java index 8edcf15..d4ec149 100644 --- a/src/main/java/org/torproject/collector/sync/ProcessCriterium.java +++ b/src/main/java/org/torproject/metrics/collector/sync/ProcessCriterium.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.sync; +package org.torproject.metrics.collector.sync;

import org.torproject.descriptor.Descriptor;

diff --git a/src/main/java/org/torproject/collector/sync/SyncManager.java b/src/main/java/org/torproject/metrics/collector/sync/SyncManager.java similarity index 95% rename from src/main/java/org/torproject/collector/sync/SyncManager.java rename to src/main/java/org/torproject/metrics/collector/sync/SyncManager.java index c7300b4..005501f 100644 --- a/src/main/java/org/torproject/collector/sync/SyncManager.java +++ b/src/main/java/org/torproject/metrics/collector/sync/SyncManager.java @@ -1,11 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.sync; - -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; +package org.torproject.metrics.collector.sync;

import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorCollector; @@ -13,6 +9,9 @@ import org.torproject.descriptor.DescriptorReader; import org.torproject.descriptor.DescriptorSourceFactory; import org.torproject.descriptor.UnparseableDescriptor; import org.torproject.descriptor.index.DescriptorIndexCollector; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key;

import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/sync/SyncPersistence.java b/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java similarity index 82% rename from src/main/java/org/torproject/collector/sync/SyncPersistence.java rename to src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java index 142be7a..bbd3103 100644 --- a/src/main/java/org/torproject/collector/sync/SyncPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java @@ -1,24 +1,8 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.sync; +package org.torproject.metrics.collector.sync;

-import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; -import org.torproject.collector.persist.BridgeExtraInfoPersistence; -import org.torproject.collector.persist.BridgeServerDescriptorPersistence; -import org.torproject.collector.persist.ConsensusPersistence; -import org.torproject.collector.persist.DescriptorPersistence; -import org.torproject.collector.persist.ExitlistPersistence; -import org.torproject.collector.persist.ExtraInfoPersistence; -import org.torproject.collector.persist.MicroConsensusPersistence; -import org.torproject.collector.persist.OnionPerfPersistence; -import org.torproject.collector.persist.PersistenceUtils; -import org.torproject.collector.persist.ServerDescriptorPersistence; -import org.torproject.collector.persist.StatusPersistence; -import org.torproject.collector.persist.VotePersistence; -import org.torproject.collector.persist.WebServerAccessLogPersistence; import org.torproject.descriptor.BridgeExtraInfoDescriptor; import org.torproject.descriptor.BridgeNetworkStatus; import org.torproject.descriptor.BridgeServerDescriptor; @@ -30,6 +14,22 @@ import org.torproject.descriptor.RelayNetworkStatusVote; import org.torproject.descriptor.RelayServerDescriptor; import org.torproject.descriptor.TorperfResult; import org.torproject.descriptor.WebServerAccessLog; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.persist.BridgeExtraInfoPersistence; +import org.torproject.metrics.collector.persist.BridgeServerDescriptorPersistence; +import org.torproject.metrics.collector.persist.ConsensusPersistence; +import org.torproject.metrics.collector.persist.DescriptorPersistence; +import org.torproject.metrics.collector.persist.ExitlistPersistence; +import org.torproject.metrics.collector.persist.ExtraInfoPersistence; +import org.torproject.metrics.collector.persist.MicroConsensusPersistence; +import org.torproject.metrics.collector.persist.OnionPerfPersistence; +import org.torproject.metrics.collector.persist.PersistenceUtils; +import org.torproject.metrics.collector.persist.ServerDescriptorPersistence; +import org.torproject.metrics.collector.persist.StatusPersistence; +import org.torproject.metrics.collector.persist.VotePersistence; +import org.torproject.metrics.collector.persist.WebServerAccessLogPersistence;

import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/sync/package-info.java b/src/main/java/org/torproject/metrics/collector/sync/package-info.java similarity index 90% rename from src/main/java/org/torproject/collector/sync/package-info.java rename to src/main/java/org/torproject/metrics/collector/sync/package-info.java index 241fde7..401fb84 100644 --- a/src/main/java/org/torproject/collector/sync/package-info.java +++ b/src/main/java/org/torproject/metrics/collector/sync/package-info.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.sync; +package org.torproject.metrics.collector.sync;

/** This package coordinates syncing and merging the fetched data. * <p>The central class for this process is <code>SyncManager</code>, which diff --git a/src/main/java/org/torproject/collector/webstats/LogFileMap.java b/src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java similarity index 98% rename from src/main/java/org/torproject/collector/webstats/LogFileMap.java rename to src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java index c1a6802..0d23f9a 100644 --- a/src/main/java/org/torproject/collector/webstats/LogFileMap.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java @@ -1,7 +1,7 @@ /* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.webstats; +package org.torproject.metrics.collector.webstats;

import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/webstats/LogMetadata.java b/src/main/java/org/torproject/metrics/collector/webstats/LogMetadata.java similarity index 98% rename from src/main/java/org/torproject/collector/webstats/LogMetadata.java rename to src/main/java/org/torproject/metrics/collector/webstats/LogMetadata.java index ee0db1a..c74cbcb 100644 --- a/src/main/java/org/torproject/collector/webstats/LogMetadata.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/LogMetadata.java @@ -1,7 +1,7 @@ /* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.webstats; +package org.torproject.metrics.collector.webstats;

import static org.torproject.descriptor.log.WebServerAccessLogImpl.MARKER;

diff --git a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java similarity index 95% rename from src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java rename to src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java index 88d1456..3d25cea 100644 --- a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java @@ -1,7 +1,7 @@ /* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.webstats; +package org.torproject.metrics.collector.webstats;

import static java.util.stream.Collectors.counting; import static java.util.stream.Collectors.groupingBy; @@ -9,14 +9,6 @@ import static java.util.stream.Collectors.groupingByConcurrent; import static java.util.stream.Collectors.reducing; import static java.util.stream.Collectors.summingLong;

-import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; -import org.torproject.collector.conf.SourceType; -import org.torproject.collector.cron.CollecTorMain; - -import org.torproject.collector.persist.PersistenceUtils; -import org.torproject.collector.persist.WebServerAccessLogPersistence; import org.torproject.descriptor.DescriptorParseException; import org.torproject.descriptor.Method; import org.torproject.descriptor.WebServerAccessLog; @@ -25,6 +17,13 @@ import org.torproject.descriptor.log.InternalLogDescriptor; import org.torproject.descriptor.log.InternalWebServerAccessLog; import org.torproject.descriptor.log.WebServerAccessLogImpl; import org.torproject.descriptor.log.WebServerAccessLogLine; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.conf.SourceType; +import org.torproject.metrics.collector.cron.CollecTorMain; +import org.torproject.metrics.collector.persist.PersistenceUtils; +import org.torproject.metrics.collector.persist.WebServerAccessLogPersistence;

import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/org/torproject/collector/MainTest.java b/src/test/java/org/torproject/metrics/collector/MainTest.java similarity index 96% rename from src/test/java/org/torproject/collector/MainTest.java rename to src/test/java/org/torproject/metrics/collector/MainTest.java index 28d3571..6459040 100644 --- a/src/test/java/org/torproject/collector/MainTest.java +++ b/src/test/java/org/torproject/metrics/collector/MainTest.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector; +package org.torproject.metrics.collector;

import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -9,10 +9,10 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail;

-import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; -import org.torproject.collector.cron.Scheduler; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.cron.Scheduler;

import org.hamcrest.Matchers; import org.junit.Rule; diff --git a/src/test/java/org/torproject/collector/bridgedescs/BridgeDescriptorParserTest.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParserTest.java similarity index 92% rename from src/test/java/org/torproject/collector/bridgedescs/BridgeDescriptorParserTest.java rename to src/test/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParserTest.java index 2d4e175..040d161 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/BridgeDescriptorParserTest.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParserTest.java @@ -1,9 +1,9 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs;

-import org.torproject.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.Configuration;

import org.junit.Test;

diff --git a/src/test/java/org/torproject/collector/bridgedescs/ExtraInfoTestDescriptorBuilder.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/ExtraInfoTestDescriptorBuilder.java similarity index 97% rename from src/test/java/org/torproject/collector/bridgedescs/ExtraInfoTestDescriptorBuilder.java rename to src/test/java/org/torproject/metrics/collector/bridgedescs/ExtraInfoTestDescriptorBuilder.java index 71d52e9..45d6925 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/ExtraInfoTestDescriptorBuilder.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/ExtraInfoTestDescriptorBuilder.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs;

import java.util.Arrays;

diff --git a/src/test/java/org/torproject/collector/bridgedescs/NetworkStatusTestDescriptorBuilder.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/NetworkStatusTestDescriptorBuilder.java similarity index 95% rename from src/test/java/org/torproject/collector/bridgedescs/NetworkStatusTestDescriptorBuilder.java rename to src/test/java/org/torproject/metrics/collector/bridgedescs/NetworkStatusTestDescriptorBuilder.java index b8c1cc9..d04fc3c 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/NetworkStatusTestDescriptorBuilder.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/NetworkStatusTestDescriptorBuilder.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs;

import java.util.Arrays;

diff --git a/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java similarity index 99% rename from src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java rename to src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java index 41a88c6..91332a5 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java @@ -1,17 +1,17 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs;

import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail;

-import org.torproject.collector.Main; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; +import org.torproject.metrics.collector.Main; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key;

import org.junit.Before; import org.junit.Rule; diff --git a/src/test/java/org/torproject/collector/bridgedescs/ServerTestDescriptorBuilder.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/ServerTestDescriptorBuilder.java similarity index 98% rename from src/test/java/org/torproject/collector/bridgedescs/ServerTestDescriptorBuilder.java rename to src/test/java/org/torproject/metrics/collector/bridgedescs/ServerTestDescriptorBuilder.java index b23c9e9..c0a6bf5 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/ServerTestDescriptorBuilder.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/ServerTestDescriptorBuilder.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs;

import java.util.Arrays;

diff --git a/src/test/java/org/torproject/collector/bridgedescs/TarballTestBuilder.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/TarballTestBuilder.java similarity index 98% rename from src/test/java/org/torproject/collector/bridgedescs/TarballTestBuilder.java rename to src/test/java/org/torproject/metrics/collector/bridgedescs/TarballTestBuilder.java index 2cfe0f5..44f4490 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/TarballTestBuilder.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/TarballTestBuilder.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs;

import static org.junit.Assert.fail;

diff --git a/src/test/java/org/torproject/collector/bridgedescs/TestDescriptorBuilder.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/TestDescriptorBuilder.java similarity index 98% rename from src/test/java/org/torproject/collector/bridgedescs/TestDescriptorBuilder.java rename to src/test/java/org/torproject/metrics/collector/bridgedescs/TestDescriptorBuilder.java index 73c00b7..2fad06a 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/TestDescriptorBuilder.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/TestDescriptorBuilder.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs;

import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java similarity index 97% rename from src/test/java/org/torproject/collector/conf/ConfigurationTest.java rename to src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java index e408109..d91013b 100644 --- a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java @@ -1,16 +1,16 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.conf; +package org.torproject.metrics.collector.conf;

import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue;

-import org.torproject.collector.MainTest; -import org.torproject.collector.cron.CollecTorMain; -import org.torproject.collector.cron.Dummy; +import org.torproject.metrics.collector.MainTest; +import org.torproject.metrics.collector.cron.CollecTorMain; +import org.torproject.metrics.collector.cron.Dummy;

import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/torproject/collector/cron/Broken.java b/src/test/java/org/torproject/metrics/collector/cron/Broken.java similarity index 81% rename from src/test/java/org/torproject/collector/cron/Broken.java rename to src/test/java/org/torproject/metrics/collector/cron/Broken.java index 95fec3b..ef896bf 100644 --- a/src/test/java/org/torproject/collector/cron/Broken.java +++ b/src/test/java/org/torproject/metrics/collector/cron/Broken.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.cron; +package org.torproject.metrics.collector.cron;

-import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException;

import java.util.concurrent.atomic.AtomicInteger;

diff --git a/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java b/src/test/java/org/torproject/metrics/collector/cron/CollecTorMainTest.java similarity index 91% rename from src/test/java/org/torproject/collector/cron/CollecTorMainTest.java rename to src/test/java/org/torproject/metrics/collector/cron/CollecTorMainTest.java index 025f96c..78b6ac7 100644 --- a/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java +++ b/src/test/java/org/torproject/metrics/collector/cron/CollecTorMainTest.java @@ -1,17 +1,17 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.cron; +package org.torproject.metrics.collector.cron;

import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail;

-import org.torproject.collector.Main; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.Key; -import org.torproject.collector.sync.SyncManager; +import org.torproject.metrics.collector.Main; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.sync.SyncManager;

import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/torproject/collector/cron/Counter.java b/src/test/java/org/torproject/metrics/collector/cron/Counter.java similarity index 72% rename from src/test/java/org/torproject/collector/cron/Counter.java rename to src/test/java/org/torproject/metrics/collector/cron/Counter.java index ad0882e..d48b62c 100644 --- a/src/test/java/org/torproject/collector/cron/Counter.java +++ b/src/test/java/org/torproject/metrics/collector/cron/Counter.java @@ -1,7 +1,7 @@ -package org.torproject.collector.cron; +package org.torproject.metrics.collector.cron;

-import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException;

import java.util.concurrent.atomic.AtomicInteger;

diff --git a/src/test/java/org/torproject/collector/cron/Dummy.java b/src/test/java/org/torproject/metrics/collector/cron/Dummy.java similarity index 66% rename from src/test/java/org/torproject/collector/cron/Dummy.java rename to src/test/java/org/torproject/metrics/collector/cron/Dummy.java index 039182b..1110676 100644 --- a/src/test/java/org/torproject/collector/cron/Dummy.java +++ b/src/test/java/org/torproject/metrics/collector/cron/Dummy.java @@ -1,7 +1,7 @@ -package org.torproject.collector.cron; +package org.torproject.metrics.collector.cron;

-import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException;

public class Dummy extends CollecTorMain {

diff --git a/src/test/java/org/torproject/collector/cron/SchedulerTest.java b/src/test/java/org/torproject/metrics/collector/cron/SchedulerTest.java similarity index 95% rename from src/test/java/org/torproject/collector/cron/SchedulerTest.java rename to src/test/java/org/torproject/metrics/collector/cron/SchedulerTest.java index 5e38a36..e0496fb 100644 --- a/src/test/java/org/torproject/collector/cron/SchedulerTest.java +++ b/src/test/java/org/torproject/metrics/collector/cron/SchedulerTest.java @@ -1,14 +1,14 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.cron; +package org.torproject.metrics.collector.cron;

import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue;

-import org.torproject.collector.MainTest; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.Key; +import org.torproject.metrics.collector.MainTest; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.Key;

import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/org/torproject/collector/persist/PersistUtilsTest.java b/src/test/java/org/torproject/metrics/collector/persist/PersistUtilsTest.java similarity index 98% rename from src/test/java/org/torproject/collector/persist/PersistUtilsTest.java rename to src/test/java/org/torproject/metrics/collector/persist/PersistUtilsTest.java index d2801be..6774923 100644 --- a/src/test/java/org/torproject/collector/persist/PersistUtilsTest.java +++ b/src/test/java/org/torproject/metrics/collector/persist/PersistUtilsTest.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist;

import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/src/test/java/org/torproject/collector/relaydescs/ReferenceCheckerTest.java b/src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java similarity index 98% rename from src/test/java/org/torproject/collector/relaydescs/ReferenceCheckerTest.java rename to src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java index da2d9ad..19672fc 100644 --- a/src/test/java/org/torproject/collector/relaydescs/ReferenceCheckerTest.java +++ b/src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.relaydescs; +package org.torproject.metrics.collector.relaydescs;

import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/org/torproject/collector/sync/FileCollector.java b/src/test/java/org/torproject/metrics/collector/sync/FileCollector.java similarity index 93% rename from src/test/java/org/torproject/collector/sync/FileCollector.java rename to src/test/java/org/torproject/metrics/collector/sync/FileCollector.java index 681b113..57d9216 100644 --- a/src/test/java/org/torproject/collector/sync/FileCollector.java +++ b/src/test/java/org/torproject/metrics/collector/sync/FileCollector.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.sync; +package org.torproject.metrics.collector.sync;

import java.io.File; import java.io.IOException; diff --git a/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java b/src/test/java/org/torproject/metrics/collector/sync/SyncPersistenceTest.java similarity index 99% rename from src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java rename to src/test/java/org/torproject/metrics/collector/sync/SyncPersistenceTest.java index 489a413..0a20338 100644 --- a/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java +++ b/src/test/java/org/torproject/metrics/collector/sync/SyncPersistenceTest.java @@ -1,15 +1,15 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.sync; +package org.torproject.metrics.collector.sync;

import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue;

-import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.Key; import org.torproject.descriptor.DescriptorParser; import org.torproject.descriptor.DescriptorSourceFactory; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.Key;

import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/torproject/collector/webstats/LogFileMapTest.java b/src/test/java/org/torproject/metrics/collector/webstats/LogFileMapTest.java similarity index 93% rename from src/test/java/org/torproject/collector/webstats/LogFileMapTest.java rename to src/test/java/org/torproject/metrics/collector/webstats/LogFileMapTest.java index d55ba40..89cfc10 100644 --- a/src/test/java/org/torproject/collector/webstats/LogFileMapTest.java +++ b/src/test/java/org/torproject/metrics/collector/webstats/LogFileMapTest.java @@ -1,7 +1,7 @@ /* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.webstats; +package org.torproject.metrics.collector.webstats;

import static org.junit.Assert.assertTrue;

diff --git a/src/test/java/org/torproject/collector/webstats/LogMetadataTest.java b/src/test/java/org/torproject/metrics/collector/webstats/LogMetadataTest.java similarity index 98% rename from src/test/java/org/torproject/collector/webstats/LogMetadataTest.java rename to src/test/java/org/torproject/metrics/collector/webstats/LogMetadataTest.java index 6121e8d..9a58cb9 100644 --- a/src/test/java/org/torproject/collector/webstats/LogMetadataTest.java +++ b/src/test/java/org/torproject/metrics/collector/webstats/LogMetadataTest.java @@ -1,7 +1,7 @@ /* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.webstats; +package org.torproject.metrics.collector.webstats;

import static org.junit.Assert.assertEquals;

diff --git a/src/test/java/org/torproject/collector/webstats/SanitizeWeblogsTest.java b/src/test/java/org/torproject/metrics/collector/webstats/SanitizeWeblogsTest.java similarity index 88% rename from src/test/java/org/torproject/collector/webstats/SanitizeWeblogsTest.java rename to src/test/java/org/torproject/metrics/collector/webstats/SanitizeWeblogsTest.java index 9ad4996..a550c41 100644 --- a/src/test/java/org/torproject/collector/webstats/SanitizeWeblogsTest.java +++ b/src/test/java/org/torproject/metrics/collector/webstats/SanitizeWeblogsTest.java @@ -1,7 +1,7 @@ /* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */

-package org.torproject.collector.webstats; +package org.torproject.metrics.collector.webstats;

import static org.junit.Assert.assertEquals;