Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Network Health
Metrics
Library
Commits
d00b8ac0
Commit
d00b8ac0
authored
Oct 19, 2016
by
iwakeh
Committed by
Karsten Loesing
Oct 19, 2016
Browse files
Changed 'descriptor.collector' default value to DescriptorIndexCollector.
Implements task-20404.
parent
f7f56dd8
Changes
3
Hide whitespace changes
Inline
Side-by-side
CHANGELOG.md
View file @
d00b8ac0
# Changes in version 1.?.? - 2016-1?-??
*
Major changes
-
Make the DescriptorCollector implementation that uses CollecTor's
index.json file to determine which descriptor files to fetch the
new default. Applications must provide gson-2.2.4.jar or higher
as dependency.
*
Minor changes
-
Avoid running into an IOException and logging a warning for it.
...
...
src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java
View file @
d00b8ac0
...
...
@@ -72,7 +72,7 @@ public final class DescriptorSourceFactory {
* @since 1.0.0
*/
public
static
final
String
COLLECTOR_DEFAULT
=
"org.torproject.descriptor.i
mpl
.DescriptorCollector
Impl
"
;
"org.torproject.descriptor.i
ndex
.Descriptor
Index
Collector"
;
/**
* Property name for overriding the implementation of the
...
...
src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java
View file @
d00b8ac0
...
...
@@ -9,10 +9,10 @@ import org.torproject.descriptor.DescriptorDownloader;
import
org.torproject.descriptor.DescriptorParser
;
import
org.torproject.descriptor.DescriptorReader
;
import
org.torproject.descriptor.ImplementationNotAccessibleException
;
import
org.torproject.descriptor.impl.DescriptorCollectorImpl
;
import
org.torproject.descriptor.impl.DescriptorDownloaderImpl
;
import
org.torproject.descriptor.impl.DescriptorParserImpl
;
import
org.torproject.descriptor.impl.DescriptorReaderImpl
;
import
org.torproject.descriptor.index.DescriptorIndexCollector
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertNull
;
...
...
@@ -35,7 +35,7 @@ public class DescriptorSourceFactoryTest {
public
void
testDefaults
()
{
setProperties
(
defaults
);
DescriptorCollector
dc
=
DescriptorSourceFactory
.
createDescriptorCollector
();
assertTrue
(
dc
instanceof
DescriptorCollector
Impl
);
assertTrue
(
dc
instanceof
Descriptor
Index
Collector
);
DescriptorDownloader
dd
=
DescriptorSourceFactory
.
createDescriptorDownloader
();
assertTrue
(
dd
instanceof
DescriptorDownloaderImpl
);
DescriptorParser
dp
=
DescriptorSourceFactory
.
createDescriptorParser
();
...
...
@@ -101,7 +101,7 @@ public class DescriptorSourceFactoryTest {
}
class
DummyCollectorImplementation
extends
DescriptorCollector
Impl
{
class
DummyCollectorImplementation
extends
Descriptor
Index
Collector
{
static
int
count
;
public
DummyCollectorImplementation
()
{
count
++;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment