Skip to content

Commit

Permalink
modified to static
Browse files Browse the repository at this point in the history
  • Loading branch information
Damick committed Aug 7, 2015
1 parent 8a05298 commit ff2806d
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 133 deletions.
55 changes: 10 additions & 45 deletions cli/src/main/java/denominator/cli/Denominator.java
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,8 @@
package denominator.cli;

import com.google.common.base.Ascii;
import com.google.common.base.CaseFormat;
import com.google.common.base.Charsets;
import com.google.common.base.Function;
import com.google.common.base.Functions;
import com.google.common.base.Joiner;
import com.google.common.base.Predicate;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
import com.google.common.base.*;
import com.google.common.collect.*;
import com.google.common.collect.ImmutableList.Builder;
import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Ordering;
import com.google.common.io.Files;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
Expand All @@ -34,19 +23,8 @@
import denominator.Denominator.Version;
import denominator.Provider;
import denominator.Providers;
import denominator.cli.GeoResourceRecordSetCommands.GeoRegionList;
import denominator.cli.GeoResourceRecordSetCommands.GeoResourceRecordAddRegions;
import denominator.cli.GeoResourceRecordSetCommands.GeoResourceRecordSetApplyTTL;
import denominator.cli.GeoResourceRecordSetCommands.GeoResourceRecordSetGet;
import denominator.cli.GeoResourceRecordSetCommands.GeoResourceRecordSetList;
import denominator.cli.GeoResourceRecordSetCommands.GeoTypeList;
import denominator.cli.ResourceRecordSetCommands.ResourceRecordSetAdd;
import denominator.cli.ResourceRecordSetCommands.ResourceRecordSetApplyTTL;
import denominator.cli.ResourceRecordSetCommands.ResourceRecordSetDelete;
import denominator.cli.ResourceRecordSetCommands.ResourceRecordSetGet;
import denominator.cli.ResourceRecordSetCommands.ResourceRecordSetList;
import denominator.cli.ResourceRecordSetCommands.ResourceRecordSetRemove;
import denominator.cli.ResourceRecordSetCommands.ResourceRecordSetReplace;
import denominator.cli.GeoResourceRecordSetCommands.*;
import denominator.cli.ResourceRecordSetCommands.*;
import denominator.cli.ZoneCommands.ZoneAdd;
import denominator.cli.ZoneCommands.ZoneDelete;
import denominator.cli.ZoneCommands.ZoneList;
Expand All @@ -56,12 +34,8 @@
import denominator.ultradns.UltraDNSProvider;
import feign.Logger;
import feign.Logger.Level;
import io.airlift.airline.Cli;
import io.airlift.airline.*;
import io.airlift.airline.Cli.CliBuilder;
import io.airlift.airline.Command;
import io.airlift.airline.Help;
import io.airlift.airline.Option;
import io.airlift.airline.OptionType;
import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.jce.provider.X509CertParser;
Expand All @@ -79,12 +53,7 @@
import java.net.URL;
import java.security.KeyFactory;
import java.security.spec.PKCS8EncodedKeySpec;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.Map.Entry;

import static com.google.common.base.Preconditions.checkArgument;
Expand Down Expand Up @@ -428,13 +397,12 @@ void overrideFromEnv(Map<String, String> env) {
}
}

void setProxyFromEnv() {
setProtocolProxyFromEnv("http");
setProtocolProxyFromEnv("https");
static void setProxyFromEnv() {
setProtocolProxyFromEnv("http", System.getenv("HTTP_PROXY"));
setProtocolProxyFromEnv("https", System.getenv("HTTPS_PROXY"));
}

void setProtocolProxyFromEnv(String proto) {
String envProxy = getEnv(Ascii.toUpperCase(proto) + "_PROXY");
static void setProtocolProxyFromEnv(String proto, String envProxy) {
if (envProxy != null && !envProxy.isEmpty()) {
try {
URL proxyUrl = new URL(envProxy);
Expand All @@ -452,9 +420,6 @@ void setProtocolProxyFromEnv(String proto) {
}
}
}
String getEnv(String name) {
return System.getenv(name);
}

/**
* return a lazy iterator where possible to improve the perceived responsiveness of the cli
Expand Down
108 changes: 20 additions & 88 deletions cli/src/test/java/denominator/cli/DenominatorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,8 @@
import denominator.DNSApiManager;
import denominator.ResourceRecordSetApi;
import denominator.cli.Denominator.ListProviders;
import denominator.cli.GeoResourceRecordSetCommands.GeoRegionList;
import denominator.cli.GeoResourceRecordSetCommands.GeoResourceRecordAddRegions;
import denominator.cli.GeoResourceRecordSetCommands.GeoResourceRecordSetApplyTTL;
import denominator.cli.GeoResourceRecordSetCommands.GeoResourceRecordSetGet;
import denominator.cli.GeoResourceRecordSetCommands.GeoResourceRecordSetList;
import denominator.cli.GeoResourceRecordSetCommands.GeoTypeList;
import denominator.cli.ResourceRecordSetCommands.ResourceRecordSetAdd;
import denominator.cli.ResourceRecordSetCommands.ResourceRecordSetApplyTTL;
import denominator.cli.ResourceRecordSetCommands.ResourceRecordSetDelete;
import denominator.cli.ResourceRecordSetCommands.ResourceRecordSetGet;
import denominator.cli.ResourceRecordSetCommands.ResourceRecordSetList;
import denominator.cli.ResourceRecordSetCommands.ResourceRecordSetRemove;
import denominator.cli.ResourceRecordSetCommands.ResourceRecordSetReplace;
import denominator.cli.GeoResourceRecordSetCommands.*;
import denominator.cli.ResourceRecordSetCommands.*;
import denominator.cli.ZoneCommands.ZoneAdd;
import denominator.cli.ZoneCommands.ZoneDelete;
import denominator.cli.ZoneCommands.ZoneList;
Expand All @@ -44,17 +33,10 @@
import java.net.URL;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.*;

import static denominator.assertj.ModelAssertions.assertThat;
import static denominator.model.ResourceRecordSets.a;
import static denominator.model.ResourceRecordSets.cert;
import static denominator.model.ResourceRecordSets.srv;
import static denominator.model.ResourceRecordSets.*;
import static java.util.Arrays.asList;
import static org.junit.Assert.fail;

Expand Down Expand Up @@ -1216,45 +1198,18 @@ public void testGeoResourceRecordSetAddRegionsBadJson() {

@Test
public void testProxySettingsWithPort() {
Denominator.DenominatorCommand cmd = new Denominator.DenominatorCommand() {
@Override
protected Iterator<String> doRun(DNSApiManager mgr) {
return null;
}
@Override
String getEnv(String name) {
if (name.equals("HTTPS_PROXY")) {
return "https://10.0.0.1:8989";
} else if (name.equals("HTTP_PROXY")) {
return "http://localhost:7878";
}
return null;
}
};
cmd.setProxyFromEnv();
assertThat(System.getProperty("http.proxyHost")).isEqualTo("localhost");
assertThat(System.getProperty("http.proxyPort")).isEqualTo("7878");
assertThat(System.getProperty("https.proxyHost")).isEqualTo("10.0.0.1");
assertThat(System.getProperty("https.proxyPort")).isEqualTo("8989");
Denominator.DenominatorCommand.setProtocolProxyFromEnv("http", "http://localhost:7878");
Denominator.DenominatorCommand.setProtocolProxyFromEnv("https", "https://10.0.0.1:8989");
assertThat(System.getProperty("http.proxyHost")).isEqualTo("localhost");
assertThat(System.getProperty("http.proxyPort")).isEqualTo("7878");
assertThat(System.getProperty("https.proxyHost")).isEqualTo("10.0.0.1");
assertThat(System.getProperty("https.proxyPort")).isEqualTo("8989");
}

@Test
public void testProxySettingsWithDefaultPorts() {
Denominator.DenominatorCommand cmd = new Denominator.DenominatorCommand() {
@Override
protected Iterator<String> doRun(DNSApiManager mgr) {
return null;
}
@Override
String getEnv(String name) {
if (name.equals("HTTPS_PROXY")) {
return "https://10.0.0.1";
} else if (name.equals("HTTP_PROXY")) {
return "http://localhost";
}
return null;
}
};
cmd.setProxyFromEnv();
Denominator.DenominatorCommand.setProtocolProxyFromEnv("http", "http://localhost");
Denominator.DenominatorCommand.setProtocolProxyFromEnv("https", "https://10.0.0.1");
assertThat(System.getProperty("http.proxyHost")).isEqualTo("localhost");
assertThat(System.getProperty("http.proxyPort")).isEqualTo("80");
assertThat(System.getProperty("https.proxyHost")).isEqualTo("10.0.0.1");
Expand All @@ -1265,22 +1220,10 @@ String getEnv(String name) {
public void testProxySettingsFromProperties() {
System.setProperty("http.proxyHost", "192.168.0.1");
System.setProperty("https.proxyHost", "192.168.0.2");
Denominator.DenominatorCommand cmd = new Denominator.DenominatorCommand() {
@Override
protected Iterator<String> doRun(DNSApiManager mgr) {
return null;
}
@Override
String getEnv(String name) {
if (name.equals("HTTPS_PROXY")) {
return "https://10.0.0.1";
} else if (name.equals("HTTP_PROXY")) {
return "http://localhost";
}
return null;
}
};
cmd.setProxyFromEnv();

Denominator.DenominatorCommand.setProtocolProxyFromEnv("http", "http://localhost");
Denominator.DenominatorCommand.setProtocolProxyFromEnv("https", "https://10.0.0.1");

assertThat(System.getProperty("http.proxyHost")).isEqualTo("192.168.0.1");
assertThat(System.getProperty("http.proxyPort")).isNull();
assertThat(System.getProperty("https.proxyHost")).isEqualTo("192.168.0.2");
Expand All @@ -1302,20 +1245,9 @@ public void checkAssertion() throws Exception {
"invalid https proxy configuration: no protocol: 10.0.0.1:8443\n");
}
});
Denominator.DenominatorCommand cmd = new Denominator.DenominatorCommand() {
@Override
protected Iterator<String> doRun(DNSApiManager mgr) {
return null;
}
@Override
String getEnv(String name) {
if (name.equals("HTTPS_PROXY")) {
return "10.0.0.1:8443";
}
return "http://localhost";
}
};
cmd.setProxyFromEnv();

Denominator.DenominatorCommand.setProtocolProxyFromEnv("http", "http://localhost");
Denominator.DenominatorCommand.setProtocolProxyFromEnv("https", "10.0.0.1:8443");
}

@Before
Expand Down

0 comments on commit ff2806d

Please sign in to comment.