Skip to content

Commit

Permalink
remove unused code (#8619)
Browse files Browse the repository at this point in the history 
WorkMgrService v1
DbAuthorizer
SSL unused and dangerous code
Unused CLI args

commit-id:ba0c291e
  • Loading branch information
@dhalperi
dhalperi committed Dec 10, 2022
1 parent 9d81647 commit 6d2267a
Show file tree
Hide file tree
Showing 33 changed files with 88 additions and 3,532 deletions.
3 changes: 0 additions & 3 deletions library_deps.bzl
View file
Expand Up @@ -57,8 +57,6 @@ BATFISH_MAVEN_ARTIFACTS = [
"org.glassfish.jersey.core:jersey-server:2.35",
"org.glassfish.jersey.inject:jersey-hk2:2.35",
"org.glassfish.jersey.media:jersey-media-json-jackson:2.35",
"org.glassfish.jersey.media:jersey-media-json-jettison:2.35",
"org.glassfish.jersey.media:jersey-media-multipart:2.35",
maven.artifact(group = "org.glassfish.jersey.test-framework", artifact = "jersey-test-framework-core", version = "2.35", exclusions = [maven.exclusion(group = "junit", artifact = "junit")]),
maven.artifact(group = "org.glassfish.jersey.test-framework.providers", artifact = "jersey-test-framework-provider-grizzly2", version = "2.35", exclusions = [maven.exclusion(group = "junit", artifact = "junit")]),
"org.hamcrest:hamcrest:2.2",
Expand All @@ -70,6 +68,5 @@ BATFISH_MAVEN_ARTIFACTS = [
"org.parboiled:parboiled-core:1.4.1",
"org.parboiled:parboiled-java:1.4.1",
"org.skyscreamer:jsonassert:1.5.1",
"org.xerial:sqlite-jdbc:3.39.3.0",
"org.yaml:snakeyaml:1.33",
]
156 changes: 4 additions & 152 deletions maven_install.json
View file
@@ -1,8 +1,8 @@
{
"dependency_tree": {
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": 1075385428,
"__RESOLVED_ARTIFACTS_HASH": 1887853535,
"__INPUT_ARTIFACTS_HASH": -67215273,
"__RESOLVED_ARTIFACTS_HASH": 992482287,
"conflict_resolution": {
"com.google.errorprone:error_prone_annotations:2.15.0": "com.google.errorprone:error_prone_annotations:2.16"
},
Expand Down Expand Up @@ -4028,6 +4028,7 @@
"org.glassfish.jersey.core:jersey-common:2.35"
],
"exclusions": [
"junit:junit",
"org.hamcrest:hamcrest-core"
],
"file": "v1/https/repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-jaxb/2.35/jersey-media-jaxb-2.35.jar",
Expand Down Expand Up @@ -4056,6 +4057,7 @@
"org.glassfish.jersey.core:jersey-common:jar:sources:2.35"
],
"exclusions": [
"junit:junit",
"org.hamcrest:hamcrest-core"
],
"file": "v1/https/repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-jaxb/2.35/jersey-media-jaxb-2.35-sources.jar",
Expand Down Expand Up @@ -4137,124 +4139,6 @@
"sha256": "c5626d366f0c5a2f67fe298b3d6b70165e8abfd804545e8c4dd0e27d329bfbcf",
"url": "https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jackson/2.35/jersey-media-json-jackson-2.35-sources.jar"
},
{
"coord": "org.glassfish.jersey.media:jersey-media-json-jettison:2.35",
"dependencies": [
"jakarta.activation:jakarta.activation-api:1.2.2",
"jakarta.annotation:jakarta.annotation-api:1.3.5",
"jakarta.ws.rs:jakarta.ws.rs-api:2.1.6",
"jakarta.xml.bind:jakarta.xml.bind-api:2.3.3",
"org.codehaus.jettison:jettison:1.5.1",
"org.glassfish.hk2.external:jakarta.inject:2.6.1",
"org.glassfish.hk2:osgi-resource-locator:1.0.3",
"org.glassfish.jersey.core:jersey-common:2.35",
"org.glassfish.jersey.media:jersey-media-jaxb:2.35"
],
"directDependencies": [
"jakarta.xml.bind:jakarta.xml.bind-api:2.3.3",
"org.codehaus.jettison:jettison:1.5.1",
"org.glassfish.jersey.core:jersey-common:2.35",
"org.glassfish.jersey.media:jersey-media-jaxb:2.35"
],
"exclusions": [
"org.hamcrest:hamcrest-core"
],
"file": "v1/https/repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jettison/2.35/jersey-media-json-jettison-2.35.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jettison/2.35/jersey-media-json-jettison-2.35.jar"
],
"packages": [
"org.glassfish.jersey.jettison",
"org.glassfish.jersey.jettison.internal",
"org.glassfish.jersey.jettison.internal.entity"
],
"sha256": "4f67e52c79d0d6bece6b91219bb3472abe5fd2f5004f9f66d727911eabb9903d",
"url": "https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jettison/2.35/jersey-media-json-jettison-2.35.jar"
},
{
"coord": "org.glassfish.jersey.media:jersey-media-json-jettison:jar:sources:2.35",
"dependencies": [
"jakarta.activation:jakarta.activation-api:jar:sources:1.2.2",
"jakarta.annotation:jakarta.annotation-api:jar:sources:1.3.5",
"jakarta.ws.rs:jakarta.ws.rs-api:jar:sources:2.1.6",
"jakarta.xml.bind:jakarta.xml.bind-api:jar:sources:2.3.3",
"org.codehaus.jettison:jettison:jar:sources:1.5.1",
"org.glassfish.hk2.external:jakarta.inject:jar:sources:2.6.1",
"org.glassfish.hk2:osgi-resource-locator:jar:sources:1.0.3",
"org.glassfish.jersey.core:jersey-common:jar:sources:2.35",
"org.glassfish.jersey.media:jersey-media-jaxb:jar:sources:2.35"
],
"directDependencies": [
"jakarta.xml.bind:jakarta.xml.bind-api:jar:sources:2.3.3",
"org.codehaus.jettison:jettison:jar:sources:1.5.1",
"org.glassfish.jersey.core:jersey-common:jar:sources:2.35",
"org.glassfish.jersey.media:jersey-media-jaxb:jar:sources:2.35"
],
"exclusions": [
"org.hamcrest:hamcrest-core"
],
"file": "v1/https/repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jettison/2.35/jersey-media-json-jettison-2.35-sources.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jettison/2.35/jersey-media-json-jettison-2.35-sources.jar"
],
"packages": [],
"sha256": "9f465fd5b05452404818a4245ec8830dd68e86c0465199dc52d86e829a3a5618",
"url": "https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jettison/2.35/jersey-media-json-jettison-2.35-sources.jar"
},
{
"coord": "org.glassfish.jersey.media:jersey-media-multipart:2.35",
"dependencies": [
"jakarta.annotation:jakarta.annotation-api:1.3.5",
"jakarta.ws.rs:jakarta.ws.rs-api:2.1.6",
"org.glassfish.hk2.external:jakarta.inject:2.6.1",
"org.glassfish.hk2:osgi-resource-locator:1.0.3",
"org.glassfish.jersey.core:jersey-common:2.35",
"org.jvnet.mimepull:mimepull:1.9.13"
],
"directDependencies": [
"org.glassfish.jersey.core:jersey-common:2.35",
"org.jvnet.mimepull:mimepull:1.9.13"
],
"exclusions": [
"org.hamcrest:hamcrest-core"
],
"file": "v1/https/repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-multipart/2.35/jersey-media-multipart-2.35.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-multipart/2.35/jersey-media-multipart-2.35.jar"
],
"packages": [
"org.glassfish.jersey.media.multipart",
"org.glassfish.jersey.media.multipart.file",
"org.glassfish.jersey.media.multipart.internal"
],
"sha256": "abb9230ce23d7b80a4d1766f3f5647f9e386344c2d200113d16c438a4b6d0bbe",
"url": "https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-multipart/2.35/jersey-media-multipart-2.35.jar"
},
{
"coord": "org.glassfish.jersey.media:jersey-media-multipart:jar:sources:2.35",
"dependencies": [
"jakarta.annotation:jakarta.annotation-api:jar:sources:1.3.5",
"jakarta.ws.rs:jakarta.ws.rs-api:jar:sources:2.1.6",
"org.glassfish.hk2.external:jakarta.inject:jar:sources:2.6.1",
"org.glassfish.hk2:osgi-resource-locator:jar:sources:1.0.3",
"org.glassfish.jersey.core:jersey-common:jar:sources:2.35",
"org.jvnet.mimepull:mimepull:jar:sources:1.9.13"
],
"directDependencies": [
"org.glassfish.jersey.core:jersey-common:jar:sources:2.35",
"org.jvnet.mimepull:mimepull:jar:sources:1.9.13"
],
"exclusions": [
"org.hamcrest:hamcrest-core"
],
"file": "v1/https/repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-multipart/2.35/jersey-media-multipart-2.35-sources.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-multipart/2.35/jersey-media-multipart-2.35-sources.jar"
],
"packages": [],
"sha256": "7819358778c53f3ec2681578b75c79afbd8ee2e27b228928ea5a9f34134cd26f",
"url": "https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-multipart/2.35/jersey-media-multipart-2.35-sources.jar"
},
{
"coord": "org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.35",
"dependencies": [
Expand Down Expand Up @@ -4673,38 +4557,6 @@
"sha256": "cb0264f39f0572f896094246c4ca548bbd886a396460ebaa7f9cfc02407ef163",
"url": "https://repo1.maven.org/maven2/org/jline/jline/3.13.1/jline-3.13.1-sources.jar"
},
{
"coord": "org.jvnet.mimepull:mimepull:1.9.13",
"dependencies": [],
"directDependencies": [],
"exclusions": [
"org.hamcrest:hamcrest-core"
],
"file": "v1/https/repo1.maven.org/maven2/org/jvnet/mimepull/mimepull/1.9.13/mimepull-1.9.13.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/org/jvnet/mimepull/mimepull/1.9.13/mimepull-1.9.13.jar"
],
"packages": [
"org.jvnet.mimepull"
],
"sha256": "5518bd3c5d88bea3b303952b22618313d6bf0ca7f131f78368108a04ebba3f17",
"url": "https://repo1.maven.org/maven2/org/jvnet/mimepull/mimepull/1.9.13/mimepull-1.9.13.jar"
},
{
"coord": "org.jvnet.mimepull:mimepull:jar:sources:1.9.13",
"dependencies": [],
"directDependencies": [],
"exclusions": [
"org.hamcrest:hamcrest-core"
],
"file": "v1/https/repo1.maven.org/maven2/org/jvnet/mimepull/mimepull/1.9.13/mimepull-1.9.13-sources.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/org/jvnet/mimepull/mimepull/1.9.13/mimepull-1.9.13-sources.jar"
],
"packages": [],
"sha256": "ab3a19c2ca22d2701523294e0e2d48cf306b81469da7e069facc177ec3e05130",
"url": "https://repo1.maven.org/maven2/org/jvnet/mimepull/mimepull/1.9.13/mimepull-1.9.13-sources.jar"
},
{
"coord": "org.lz4:lz4-java:1.8.0",
"dependencies": [],
Expand Down
18 changes: 0 additions & 18 deletions projects/BUILD.bazel
View file
@@ -1,19 +1 @@
load("@batfish//skylark:javadoc.bzl", "java_doc")

exports_files(["VERSION"])

java_doc(
name = "javadoc",
libs = [
"//projects/client",
"//projects/batfish-common-protocol:common",
"//projects/coordinator:coordinator",
"//projects/batfish:batfish",
"//projects/allinone:allinone",
"//projects/question:question",
],
pkgs = [
"org.batfish",
],
tags = ["manual"],
)
28 changes: 4 additions & 24 deletions projects/allinone/src/main/java/org/batfish/allinone/AllInOne.java
View file
Expand Up @@ -137,19 +137,10 @@ public void run() {
private void runBatfish() throws ExecutionException, InterruptedException {
String batfishArgs =
String.format(
"%s -%s %s -%s %s %s -%s %s",
"%s -%s %s",
_settings.getBatfishArgs(),
org.batfish.config.Settings.ARG_RUN_MODE,
_settings.getBatfishRunMode(),
org.batfish.config.Settings.ARG_COORDINATOR_REGISTER,
"true",
"",
org.batfish.config.Settings.ARG_TRACING_ENABLE,
_settings.getTracingEnable());
// If we are running a command file, just use an ephemeral port for worker
if (_settings.getCommandFile() != null) {
batfishArgs += String.format(" -%s %s", org.batfish.config.Settings.ARG_SERVICE_PORT, 0);
}
_settings.getBatfishRunMode());

String[] initialArgArray = getArgArrayFromString(batfishArgs);
List<String> args = new ArrayList<>(Arrays.asList(initialArgArray));
Expand All @@ -172,23 +163,12 @@ public void run() {
}

private BindPortFutures runCoordinator() {
String coordinatorArgs =
String.format(
"%s -%s %s",
_settings.getCoordinatorArgs(),
org.batfish.coordinator.config.Settings.ARG_TRACING_ENABLE,
_settings.getTracingEnable());
String coordinatorArgs = _settings.getCoordinatorArgs();
// If we are using a command file, just pick ephemeral ports to listen on
if (_settings.getCommandFile() != null) {
coordinatorArgs +=
String.format(
" -%s %s -%s %s -%s %s",
org.batfish.coordinator.config.Settings.ARG_SERVICE_POOL_PORT,
0,
org.batfish.coordinator.config.Settings.ARG_SERVICE_WORK_PORT,
0,
org.batfish.coordinator.config.Settings.ARG_SERVICE_WORK_V2_PORT,
0);
" -%s %s", org.batfish.coordinator.config.Settings.ARG_SERVICE_WORK_V2_PORT, 0);
}
String[] initialArgArray = getArgArrayFromString(coordinatorArgs);
List<String> args = new ArrayList<>(Arrays.asList(initialArgArray));
Expand Down
39 changes: 14 additions & 25 deletions projects/allinone/src/main/java/org/batfish/allinone/config/Settings.java
View file
Expand Up @@ -26,9 +26,6 @@ public class Settings extends BaseSettings {
public static final String ARG_SERVICE_NAME = "servicename";
private static final String ARG_SNAPSHOT_DIR =
org.batfish.client.config.Settings.ARG_SNAPSHOT_DIR;
private static final String ARG_TRACING_AGENT_HOST = "tracingagenthost";
private static final String ARG_TRACING_AGENT_PORT = "tracingagentport";
private static final String ARG_TRACING_ENABLE = "tracingenable";
private static final String ARG_VERSION = "version";

private static final String EXECUTABLE_NAME = "allinone";
Expand All @@ -44,8 +41,6 @@ public class Settings extends BaseSettings {
private String _runMode;
private String _serviceName;
private String _snapshotDir;
private String _tracingAgentHost;
private Integer _tracingAgentPort;
private boolean _tracingEnable;

public Settings(String[] args) {
Expand Down Expand Up @@ -115,14 +110,6 @@ public String getSnapshotDir() {
return _snapshotDir;
}

public Integer getTracingAgentPort() {
return _tracingAgentPort;
}

public String getTracingAgentHost() {
return _tracingAgentHost;
}

public boolean getTracingEnable() {
return _tracingEnable;
}
Expand All @@ -142,9 +129,6 @@ private void initConfigDefaults() {
setDefaultProperty(ARG_RUN_CLIENT, true);
setDefaultProperty(ARG_RUN_MODE, "batch");
setDefaultProperty(ARG_SERVICE_NAME, "allinone-service");
setDefaultProperty(ARG_TRACING_AGENT_HOST, "localhost");
setDefaultProperty(ARG_TRACING_AGENT_PORT, 5775);
setDefaultProperty(ARG_TRACING_ENABLE, false);
setDefaultProperty(ARG_VERSION, false);
}

Expand Down Expand Up @@ -181,13 +165,21 @@ private void initOptions() {

addOption(ARG_SNAPSHOT_DIR, "where the snapshot sits", "snapshot_dir");

addOption(ARG_TRACING_AGENT_HOST, "jaeger agent host", "jaeger_agent_host");

addOption(ARG_TRACING_AGENT_PORT, "jaeger agent port", "jaeger_agent_port");

addBooleanOption(ARG_TRACING_ENABLE, "enable tracing");

addBooleanOption(ARG_VERSION, "print the version number of the code and exit");

// deprecated and ignored
for (String deprecatedStringArg :
new String[] {
"tracingagenthost", "tracingagentport",
}) {
addOption(deprecatedStringArg, DEPRECATED_ARG_DESC, "ignored");
}
for (String deprecatedBooleanArg :
new String[] {
"tracingenable",
}) {
addBooleanOption(deprecatedBooleanArg, DEPRECATED_ARG_DESC);
}
}

private void parseCommandLine(String[] args) {
Expand Down Expand Up @@ -217,8 +209,5 @@ private void parseCommandLine(String[] args) {
_runMode = getStringOptionValue(ARG_RUN_MODE);
_serviceName = getStringOptionValue(ARG_SERVICE_NAME);
_snapshotDir = getStringOptionValue(ARG_SNAPSHOT_DIR);
_tracingAgentHost = getStringOptionValue(ARG_TRACING_AGENT_HOST);
_tracingAgentPort = getIntegerOptionValue(ARG_TRACING_AGENT_PORT);
_tracingEnable = getBooleanOptionValue(ARG_TRACING_ENABLE);
}
}

0 comments on commit 6d2267a

Please sign in to comment.