Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-25 19:30:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to dropwizard 0.7.

Browse Source
This commit is contained in:
Moxie Marlinspike
2014-05-07 13:50:40 -07:00
parent 5d169c523f
commit b433b9c879
47 changed files with 742 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
View File

@@ -17,8 +17,6 @@
package org.whispersystems.textsecuregcm;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yammer.dropwizard.config.Configuration;
import com.yammer.dropwizard.db.DatabaseConfiguration;
import org.whispersystems.textsecuregcm.configuration.ApnConfiguration;
import org.whispersystems.textsecuregcm.configuration.FederationConfiguration;
import org.whispersystems.textsecuregcm.configuration.GcmConfiguration;
@@ -35,6 +33,9 @@ import org.whispersystems.textsecuregcm.configuration.WebsocketConfiguration;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import io.dropwizard.Configuration;
import io.dropwizard.db.DataSourceFactory;
public class WhisperServerConfiguration extends Configuration {
@NotNull
@@ -74,7 +75,7 @@ public class WhisperServerConfiguration extends Configuration {
@Valid
@NotNull
@JsonProperty
private DatabaseConfiguration database = new DatabaseConfiguration();
private DataSourceFactory database = new DataSourceFactory();
@Valid
@NotNull
@@ -87,7 +88,7 @@ public class WhisperServerConfiguration extends Configuration {
@Valid
@JsonProperty
private MetricsConfiguration metrics = new MetricsConfiguration();
private MetricsConfiguration viz = new MetricsConfiguration();
@Valid
@JsonProperty
@@ -125,7 +126,7 @@ public class WhisperServerConfiguration extends Configuration {
return redis;
}
public DatabaseConfiguration getDatabaseConfiguration() {
public DataSourceFactory getDataSourceFactory() {
return database;
}
@@ -142,6 +143,6 @@ public class WhisperServerConfiguration extends Configuration {
}
public MetricsConfiguration getMetricsConfiguration() {
return metrics;
return viz;
}
}