diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentRepresentation.java b/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentRepresentation.java index e99fbd38..be07de7a 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentRepresentation.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentRepresentation.java @@ -50,7 +50,8 @@ public DeploymentRepresentation( this.assignment = assignment; if (resources == null) { this.resources = ImmutableMap.of(); - } else { + } + else { this.resources = ImmutableMap.copyOf(resources); } } diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentSlot.java b/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentSlot.java index 38b5d773..920b0cd8 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentSlot.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentSlot.java @@ -37,7 +37,8 @@ import static io.airlift.airship.shared.SlotLifecycleState.UNKNOWN; import static io.airlift.airship.shared.SlotStatus.createSlotStatus; -public class DeploymentSlot implements Slot +public class DeploymentSlot + implements Slot { private static final Logger log = Logger.get(DeploymentSlot.class); @@ -208,7 +209,8 @@ public SlotStatus assign(Installation installation) SlotLifecycleState state; if (shouldStart) { state = lifecycleManager.start(deployment); - } else { + } + else { state = STOPPED; } @@ -402,7 +404,6 @@ private void lock() } } - private void unlock() { lockOwner = null; diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/DirectoryDeploymentManager.java b/airship-agent/src/main/java/io/airlift/airship/agent/DirectoryDeploymentManager.java index 19c26491..f7c10d12 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/DirectoryDeploymentManager.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/DirectoryDeploymentManager.java @@ -24,7 +24,8 @@ import static io.airlift.airship.shared.FileUtils.listFiles; import static io.airlift.json.JsonCodec.jsonCodec; -public class DirectoryDeploymentManager implements DeploymentManager +public class DirectoryDeploymentManager + implements DeploymentManager { private static final Logger log = Logger.get(DirectoryDeploymentManager.class); private final JsonCodec jsonCodec = jsonCodec(DeploymentRepresentation.class); diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/DirectoryDeploymentManagerFactory.java b/airship-agent/src/main/java/io/airlift/airship/agent/DirectoryDeploymentManagerFactory.java index 5f890d8a..cedc55ab 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/DirectoryDeploymentManagerFactory.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/DirectoryDeploymentManagerFactory.java @@ -20,7 +20,8 @@ import static io.airlift.airship.shared.FileUtils.listFiles; -public class DirectoryDeploymentManagerFactory implements DeploymentManagerFactory +public class DirectoryDeploymentManagerFactory + implements DeploymentManagerFactory { private final String location; private final Duration tarTimeout; @@ -102,13 +103,14 @@ private String toBaseName(Installation installation) String baseName; if (mavenCoordinates != null) { baseName = mavenCoordinates.getArtifactId(); - } else if (configSpec.startsWith("@")) { + } + else if (configSpec.startsWith("@")) { baseName = configSpec.substring(1); - } else { + } + else { baseName = configSpec; } return baseName; } - } diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/LauncherLifecycleManager.java b/airship-agent/src/main/java/io/airlift/airship/agent/LauncherLifecycleManager.java index cfd3aea1..bfe2d080 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/LauncherLifecycleManager.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/LauncherLifecycleManager.java @@ -27,7 +27,8 @@ import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; import static io.airlift.airship.shared.SlotLifecycleState.UNKNOWN; -public class LauncherLifecycleManager implements LifecycleManager +public class LauncherLifecycleManager + implements LifecycleManager { private static final Logger log = Logger.get(LauncherLifecycleManager.class); diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/LockTimeoutException.java b/airship-agent/src/main/java/io/airlift/airship/agent/LockTimeoutException.java index 356b5dff..23579f84 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/LockTimeoutException.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/LockTimeoutException.java @@ -5,7 +5,8 @@ import java.util.List; -public class LockTimeoutException extends RuntimeException +public class LockTimeoutException + extends RuntimeException { public LockTimeoutException(Thread ownerThread, Duration lockWait, List acquisitionLocation) { @@ -14,5 +15,4 @@ public LockTimeoutException(Thread ownerThread, Duration lockWait, List stopped assertEquals(manager.kill(appleDeployment), STOPPED); assertEquals(manager.status(appleDeployment), STOPPED); - } @Test diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/MockDeploymentManager.java b/airship-agent/src/test/java/io/airlift/airship/agent/MockDeploymentManager.java index 4331f941..b472c49b 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/MockDeploymentManager.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/MockDeploymentManager.java @@ -19,7 +19,8 @@ import java.io.File; import java.util.UUID; -public class MockDeploymentManager implements DeploymentManager +public class MockDeploymentManager + implements DeploymentManager { private final String location; private final UUID slotId = UUID.randomUUID(); diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/MockDeploymentManagerFactory.java b/airship-agent/src/test/java/io/airlift/airship/agent/MockDeploymentManagerFactory.java index 2eb5edb2..80442490 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/MockDeploymentManagerFactory.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/MockDeploymentManagerFactory.java @@ -18,7 +18,8 @@ import java.util.List; -public class MockDeploymentManagerFactory implements DeploymentManagerFactory +public class MockDeploymentManagerFactory + implements DeploymentManagerFactory { @Override public List loadSlots() diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/MockLifecycleManager.java b/airship-agent/src/test/java/io/airlift/airship/agent/MockLifecycleManager.java index d936a537..064d1539 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/MockLifecycleManager.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/MockLifecycleManager.java @@ -22,7 +22,8 @@ import static com.google.common.collect.Maps.newHashMap; -public class MockLifecycleManager implements LifecycleManager +public class MockLifecycleManager + implements LifecycleManager { private final Map states = newHashMap(); private final Set nodeConfigUpdated = Sets.newHashSet(); diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/ResourcesUtil.java b/airship-agent/src/test/java/io/airlift/airship/agent/ResourcesUtil.java index c9bf036d..651685e1 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/ResourcesUtil.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/ResourcesUtil.java @@ -15,7 +15,7 @@ private ResourcesUtil() { } - public static Map TEST_RESOURCES = ImmutableMap.builder() + public static Map TEST_RESOURCES = ImmutableMap.builder() .put("cpu", 8) .put("memory", 1024) .build(); diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestAgent.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestAgent.java index 25b543f1..114a4c81 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestAgent.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestAgent.java @@ -30,7 +30,7 @@ public void setup() .setSlotsDir(new File(tempDir, "slots").getAbsolutePath()) .setResourcesFile(resourcesFile.getAbsolutePath()); - nodeInfo = new NodeInfo("test", "pool", "nodeId", InetAddress.getByAddress(new byte[]{127, 0, 0, 1}), null, null, "location", "binarySpec", "configSpec"); + nodeInfo = new NodeInfo("test", "pool", "nodeId", InetAddress.getByAddress(new byte[] {127, 0, 0, 1}), null, null, "location", "binarySpec", "configSpec"); agent = new Agent( config, @@ -48,5 +48,4 @@ public void test() assertEquals(agent.getLocation(), agent.getLocation()); assertEquals(agent.getResources(), TEST_RESOURCES); } - } diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestAgentConfig.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestAgentConfig.java index 2b539f5f..46dedfcc 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestAgentConfig.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestAgentConfig.java @@ -27,12 +27,12 @@ public class TestAgentConfig public void testDefaults() { ConfigAssertions.assertRecordedDefaults(ConfigAssertions.recordDefaults(AgentConfig.class) - .setSlotsDir("slots") - .setResourcesFile("etc/resources.properties") - .setLauncherTimeout(new Duration(5, TimeUnit.SECONDS)) - .setLauncherStopTimeout(new Duration(15, TimeUnit.SECONDS)) - .setTarTimeout(new Duration(1, TimeUnit.MINUTES)) - .setMaxLockWait(new Duration(1, TimeUnit.SECONDS)) + .setSlotsDir("slots") + .setResourcesFile("etc/resources.properties") + .setLauncherTimeout(new Duration(5, TimeUnit.SECONDS)) + .setLauncherStopTimeout(new Duration(15, TimeUnit.SECONDS)) + .setTarTimeout(new Duration(1, TimeUnit.MINUTES)) + .setMaxLockWait(new Duration(1, TimeUnit.SECONDS)) ); } diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestAgentResource.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestAgentResource.java index e01b82e3..69ff94a7 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestAgentResource.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestAgentResource.java @@ -54,5 +54,4 @@ public void testGetAllSlotsStatus() assertEquals(actual.getResources(), TEST_RESOURCES); assertEquals(actual.getLocation(), agent.getLocation()); } - } diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestDirectoryDeploymentManager.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestDirectoryDeploymentManager.java index ff9db3e9..fd61d486 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestDirectoryDeploymentManager.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestDirectoryDeploymentManager.java @@ -24,7 +24,8 @@ import static io.airlift.airship.shared.FileUtils.deleteRecursively; import static org.testng.Assert.assertEquals; -public class TestDirectoryDeploymentManager extends AbstractDeploymentManagerTest +public class TestDirectoryDeploymentManager + extends AbstractDeploymentManagerTest { private File tempDir; private InstallationHelper installationHelper; @@ -50,7 +51,6 @@ public void tearDown() if (installationHelper != null) { installationHelper.destroy(); } - } @Test diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestLauncherLifecycleManager.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestLauncherLifecycleManager.java index 3c09bb15..5e2029ef 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestLauncherLifecycleManager.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestLauncherLifecycleManager.java @@ -43,7 +43,8 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -public class TestLauncherLifecycleManager extends AbstractLifecycleManagerTest +public class TestLauncherLifecycleManager + extends AbstractLifecycleManagerTest { private File tempDir; private File slotDir; diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestMockDeploymentManager.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestMockDeploymentManager.java index fd86369d..c17ee685 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestMockDeploymentManager.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestMockDeploymentManager.java @@ -16,7 +16,8 @@ import io.airlift.airship.shared.InstallationHelper; import org.testng.annotations.BeforeMethod; -public class TestMockDeploymentManager extends AbstractDeploymentManagerTest +public class TestMockDeploymentManager + extends AbstractDeploymentManagerTest { @BeforeMethod protected void setUp() diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestMockLifecycleManager.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestMockLifecycleManager.java index 6ef6e045..6e1850a7 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestMockLifecycleManager.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestMockLifecycleManager.java @@ -22,7 +22,8 @@ import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT; -public class TestMockLifecycleManager extends AbstractLifecycleManagerTest +public class TestMockLifecycleManager + extends AbstractLifecycleManagerTest { @BeforeMethod protected void setUp() @@ -35,7 +36,7 @@ protected void setUp() new File("apple"), new File("apple-data"), APPLE_ASSIGNMENT, - ImmutableMap.of( "memory", 512)); + ImmutableMap.of("memory", 512)); bananaDeployment = new Deployment( UUID.randomUUID(), "location/banana", diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestServer.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestServer.java index 7abe44eb..76b69338 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestServer.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestServer.java @@ -94,7 +94,6 @@ public class TestServer private Installation bananaInstallation; private File tempDir; - @BeforeClass public void startServer() throws Exception @@ -263,7 +262,6 @@ public void testInstallSlot() assertEquals(response.getValue(), expected); } - @Test public void testTerminateSlot() throws Exception diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestSlot.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestSlot.java index 987f00a6..ad297c98 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestSlot.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestSlot.java @@ -119,6 +119,5 @@ public void testLifecycle() // stopped.kill => stopped assertEquals(slot.kill(), stopped); assertEquals(slot.status(), stopped); - } } diff --git a/airship-agent/src/test/resources/deployment.json b/airship-agent/src/test/resources/deployment.json index bedebb7e..89080efc 100644 --- a/airship-agent/src/test/resources/deployment.json +++ b/airship-agent/src/test/resources/deployment.json @@ -1,6 +1,6 @@ { - "deploymentId":"deployment1", - "nodeId" : "12345678-1234-1234-1234-123456789012", + "deploymentId": "deployment1", + "nodeId": "12345678-1234-1234-1234-123456789012", "assignment": { "binary": "food.fruit:apple:1.0", "config": "@prod:apple:1.0" diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/AgentRecord.java b/airship-cli/src/main/java/io/airlift/airship/cli/AgentRecord.java index 49f8d8da..6009a9a4 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/AgentRecord.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/AgentRecord.java @@ -12,7 +12,8 @@ import static io.airlift.airship.cli.Ansi.colorize; -public class AgentRecord implements Record +public class AgentRecord + implements Record { public static List toAgentRecords(Iterable agents) { @@ -85,12 +86,15 @@ public String getColorizedValue(Column column) AgentLifecycleState state = AgentLifecycleState.valueOf(toString(value)); if (AgentLifecycleState.ONLINE == state) { return colorize(state, Color.GREEN); - } else if (AgentLifecycleState.OFFLINE == state) { + } + else if (AgentLifecycleState.OFFLINE == state) { return colorize(state, Color.RED); - } else if (AgentLifecycleState.PROVISIONING == state) { + } + else if (AgentLifecycleState.PROVISIONING == state) { return colorize(state, Color.BLUE); } - } else if (Column.statusMessage == column) { + } + else if (Column.statusMessage == column) { return colorize(value, Color.RED); } return toString(value); diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/Airship.java b/airship-cli/src/main/java/io/airlift/airship/cli/Airship.java index 9419995b..217381d1 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/Airship.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/Airship.java @@ -94,7 +94,7 @@ public class Airship public static final Cli AIRSHIP_PARSER; static { - CliBuilder builder = Cli.builder("airship") + CliBuilder builder = Cli.builder("airship") .withDescription("cloud management system") .withDefaultCommand(HelpCommand.class) .withCommand(HelpCommand.class) @@ -191,7 +191,8 @@ public final Integer call() } @VisibleForTesting - public abstract void execute() throws Exception; + public abstract void execute() + throws Exception; } public static abstract class AirshipCommanderCommand @@ -288,7 +289,6 @@ public void execute(String environmentRef, OutputFormat outputFormat, Interactiv public abstract void execute(Commander commander) throws Exception; - public boolean ask(String question, boolean defaultValue) { return interactiveUser.ask(question, defaultValue); @@ -339,14 +339,15 @@ public void displayCoordinators(Iterable coordi outputFormat.displayCoordinators(coordinators); } - protected interface SlotExecution { + protected interface SlotExecution + { void execute(Commander commander, SlotFilter slotFilter, String expectedVersion); } - } @Command(name = "help", description = "Display help information about airship") - public static class HelpCommand extends AirshipCommand + public static class HelpCommand + extends AirshipCommand { @Inject public Help help; @@ -370,7 +371,8 @@ public String toString() } @Command(name = "show", description = "Show state of all slots") - public static class ShowCommand extends AirshipCommanderCommand + public static class ShowCommand + extends AirshipCommanderCommand { @Inject public final SlotFilter slotFilter = new SlotFilter(); @@ -395,7 +397,8 @@ public String toString() } @Command(name = "install", description = "Install software in a new slot") - public static class InstallCommand extends AirshipCommanderCommand + public static class InstallCommand + extends AirshipCommanderCommand { @Option(name = {"--count"}, description = "Number of instances to install") public int count = 1; @@ -489,7 +492,8 @@ public String toString() } @Command(name = "upgrade", description = "Upgrade software in a slot") - public static class UpgradeCommand extends AirshipCommanderCommand + public static class UpgradeCommand + extends AirshipCommanderCommand { @Inject public final SlotFilter slotFilter = new SlotFilter(); @@ -549,7 +553,8 @@ public String toString() } @Command(name = "terminate", description = "Terminate (remove) a slot") - public static class TerminateCommand extends AirshipCommanderCommand + public static class TerminateCommand + extends AirshipCommanderCommand { @Inject public final SlotFilter slotFilter = new SlotFilter(); @@ -580,7 +585,8 @@ public String toString() } @Command(name = "start", description = "Start a server") - public static class StartCommand extends AirshipCommanderCommand + public static class StartCommand + extends AirshipCommanderCommand { @Inject public final SlotFilter slotFilter = new SlotFilter(); @@ -600,7 +606,8 @@ public void execute(Commander commander, SlotFilter slotFilter, String expectedV } @Command(name = "stop", description = "Stop a server") - public static class StopCommand extends AirshipCommanderCommand + public static class StopCommand + extends AirshipCommanderCommand { @Inject public final SlotFilter slotFilter = new SlotFilter(); @@ -620,7 +627,8 @@ public void execute(Commander commander, SlotFilter slotFilter, String expectedV } @Command(name = "kill", description = "Kill a server") - public static class KillCommand extends AirshipCommanderCommand + public static class KillCommand + extends AirshipCommanderCommand { @Inject public final SlotFilter slotFilter = new SlotFilter(); @@ -640,7 +648,8 @@ public void execute(Commander commander, SlotFilter slotFilter, String expectedV } @Command(name = "restart", description = "Restart server") - public static class RestartCommand extends AirshipCommanderCommand + public static class RestartCommand + extends AirshipCommanderCommand { @Inject public final SlotFilter slotFilter = new SlotFilter(); @@ -660,7 +669,8 @@ public void execute(Commander commander, SlotFilter slotFilter, String expectedV } @Command(name = "reset-to-actual", description = "Reset slot expected state to actual") - public static class ResetToActualCommand extends AirshipCommanderCommand + public static class ResetToActualCommand + extends AirshipCommanderCommand { @Inject public final SlotFilter slotFilter = new SlotFilter(); @@ -680,7 +690,8 @@ public void execute(Commander commander, SlotFilter slotFilter, String expectedV } @Command(name = "ssh", description = "ssh to slot installation") - public static class SshCommand extends AirshipCommanderCommand + public static class SshCommand + extends AirshipCommanderCommand { @Inject public final SlotFilter slotFilter = new SlotFilter(); @@ -708,7 +719,8 @@ public String toString() } @Command(name = "show", description = "Show coordinator details") - public static class CoordinatorShowCommand extends AirshipCommanderCommand + public static class CoordinatorShowCommand + extends AirshipCommanderCommand { @Inject public final CoordinatorFilter coordinatorFilter = new CoordinatorFilter(); @@ -734,7 +746,8 @@ public String toString() } @Command(name = "provision", description = "Provision a new coordinator") - public static class CoordinatorProvisionCommand extends AirshipCommanderCommand + public static class CoordinatorProvisionCommand + extends AirshipCommanderCommand { @Option(name = "--coordinator-config", description = "Configuration for the coordinator") public String coordinatorConfig; @@ -809,7 +822,8 @@ public String toString() } @Command(name = "ssh", description = "ssh to coordinator host") - public static class CoordinatorSshCommand extends AirshipCommanderCommand + public static class CoordinatorSshCommand + extends AirshipCommanderCommand { @Inject public final CoordinatorFilter coordinatorFilter = new CoordinatorFilter(); @@ -836,7 +850,8 @@ public String toString() } @Command(name = "show", description = "Show agent details") - public static class AgentShowCommand extends AirshipCommanderCommand + public static class AgentShowCommand + extends AirshipCommanderCommand { @Inject public final AgentFilter agentFilter = new AgentFilter(); @@ -862,7 +877,8 @@ public String toString() } @Command(name = "provision", description = "Provision a new agent") - public static class AgentProvisionCommand extends AirshipCommanderCommand + public static class AgentProvisionCommand + extends AirshipCommanderCommand { @Option(name = "--agent-config", description = "Agent for the coordinator") public String agentConfig; @@ -919,7 +935,8 @@ public String toString() } @Command(name = "terminate", description = "Terminate an agent") - public static class AgentTerminateCommand extends AirshipCommanderCommand + public static class AgentTerminateCommand + extends AirshipCommanderCommand { @Arguments(title = "agent-id", description = "Agent to terminate", required = true) public String agentId; @@ -945,7 +962,8 @@ public String toString() } @Command(name = "ssh", description = "ssh to agent host") - public static class AgentSshCommand extends AirshipCommanderCommand + public static class AgentSshCommand + extends AirshipCommanderCommand { @Inject public final AgentFilter agentFilter = new AgentFilter(); @@ -972,7 +990,8 @@ public String toString() } @Command(name = "provision-local", description = "Provision a local environment") - public static class EnvironmentProvisionLocal extends AirshipCommand + public static class EnvironmentProvisionLocal + extends AirshipCommand { @Option(name = "--name", description = "Environment name") public String environment; @@ -1068,7 +1087,8 @@ public void execute() } @Command(name = "provision-aws", description = "Provision an AWS environment") - public static class EnvironmentProvisionAws extends AirshipCommand + public static class EnvironmentProvisionAws + extends AirshipCommand { @Option(name = "--name", description = "Environment name") public String environment; @@ -1280,32 +1300,32 @@ private static String createIamUserForEnvironment(AmazonIdentityManagementClient Map> policy = ImmutableMap.of("Statement", ImmutableList.builder() - .add(ImmutableMap.builder() - .put("Action", ImmutableList.of( - "ec2:CreateTags", - "ec2:DeleteTags", - "ec2:DescribeAvailabilityZones", - "ec2:DescribeInstances", - "ec2:RunInstances", - "ec2:StartInstances", - "ec2:StopInstances", - "ec2:TerminateInstances" - )) - .put("Effect", "Allow") - .put("Resource", "*") - .build()) - .add(ImmutableMap.builder() - .put("Action", ImmutableList.of( - "sdb:CreateDomain", - "sdb:PutAttributes", - "sdb:BatchDeleteAttributes", - "sdb:DeleteAttributes", - "sdb:Select" - )) - .put("Effect", "Allow") - .put("Resource", "arn:aws:sdb:*:*:domain/" + simpleDbName) - .build()) - .build() + .add(ImmutableMap.builder() + .put("Action", ImmutableList.of( + "ec2:CreateTags", + "ec2:DeleteTags", + "ec2:DescribeAvailabilityZones", + "ec2:DescribeInstances", + "ec2:RunInstances", + "ec2:StartInstances", + "ec2:StopInstances", + "ec2:TerminateInstances" + )) + .put("Effect", "Allow") + .put("Resource", "*") + .build()) + .add(ImmutableMap.builder() + .put("Action", ImmutableList.of( + "sdb:CreateDomain", + "sdb:PutAttributes", + "sdb:BatchDeleteAttributes", + "sdb:DeleteAttributes", + "sdb:Select" + )) + .put("Effect", "Allow") + .put("Resource", "arn:aws:sdb:*:*:domain/" + simpleDbName) + .build()) + .build() ); String policyJson = JsonCodec.jsonCodec(Object.class).toJson(policy); @@ -1364,7 +1384,8 @@ public String toString() } @Command(name = "show", description = "Show environment details") - public static class EnvironmentShow extends AirshipCommand + public static class EnvironmentShow + extends AirshipCommand { @Arguments(description = "Environment to show") public String ref; @@ -1405,7 +1426,8 @@ public void execute() if (realEnvironmentName.equals(ref)) { System.out.printf("* Environment: %s%n", ref); - } else { + } + else { System.out.printf("* Environment reference: %s%n", ref); System.out.printf(" Environment name: %s%n", realEnvironmentName); } @@ -1418,7 +1440,8 @@ public void execute() } @Command(name = "add", description = "Add an environment") - public static class EnvironmentAdd extends AirshipCommand + public static class EnvironmentAdd + extends AirshipCommand { @Option(name = "--name", description = "Environment name") public String environment; @@ -1457,7 +1480,8 @@ public void execute() } @Command(name = "remove", description = "Remove an environment") - public static class EnvironmentRemove extends AirshipCommand + public static class EnvironmentRemove + extends AirshipCommand { @Arguments(description = "Environment to remove") public String ref; @@ -1483,7 +1507,8 @@ public void execute() } @Command(name = "use", description = "Set the default environment") - public static class EnvironmentUse extends AirshipCommand + public static class EnvironmentUse + extends AirshipCommand { @Arguments(description = "Environment to make the default") public String ref; @@ -1506,7 +1531,8 @@ public void execute() } @Command(name = "get", description = "Get a configuration value") - public static class ConfigGet extends AirshipCommand + public static class ConfigGet + extends AirshipCommand { @Arguments(description = "Key to get") public String key; @@ -1526,7 +1552,8 @@ public void execute() } @Command(name = "get-all", description = "Get all values of configuration") - public static class ConfigGetAll extends AirshipCommand + public static class ConfigGetAll + extends AirshipCommand { @Arguments(description = "Key to get") public String key; @@ -1545,7 +1572,8 @@ public void execute() } @Command(name = "set", description = "Set a configuration value") - public static class ConfigSet extends AirshipCommand + public static class ConfigSet + extends AirshipCommand { @Arguments(usage = " ", description = "Key-value pair to set") @@ -1568,7 +1596,8 @@ public void execute() } @Command(name = "add", description = "Add a configuration value") - public static class ConfigAdd extends AirshipCommand + public static class ConfigAdd + extends AirshipCommand { @Arguments(usage = " ", description = "Key-value pair to add") @@ -1591,7 +1620,8 @@ public void execute() } @Command(name = "unset", description = "Unset a configuration value") - public static class ConfigUnset extends AirshipCommand + public static class ConfigUnset + extends AirshipCommand { @Arguments(description = "Key to unset") public String key; diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/Column.java b/airship-cli/src/main/java/io/airlift/airship/cli/Column.java index ee16f87b..a2e6e6cf 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/Column.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/Column.java @@ -23,7 +23,6 @@ public enum Column internalUri("uri"), externalUri("uri"); - private final String header; Column() diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/CommanderFactory.java b/airship-cli/src/main/java/io/airlift/airship/cli/CommanderFactory.java index f2024e95..b4eaebeb 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/CommanderFactory.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/CommanderFactory.java @@ -240,7 +240,8 @@ private LocalCommander createLocalCommander() return new LocalCommander(environment, new File(slotsDir), coordinator, repository, serviceInventory); } - private class LocalProvisioner implements Provisioner + private class LocalProvisioner + implements Provisioner { @Override public List listCoordinators() @@ -289,7 +290,8 @@ public void terminateAgents(Iterable instanceIds) } } - private class LocalRemoteCoordinatorFactory implements RemoteCoordinatorFactory + private class LocalRemoteCoordinatorFactory + implements RemoteCoordinatorFactory { @Override public RemoteCoordinator createRemoteCoordinator(Instance instance, CoordinatorLifecycleState state) @@ -298,7 +300,8 @@ public RemoteCoordinator createRemoteCoordinator(Instance instance, CoordinatorL } } - private class LocalRemoteAgentFactory implements RemoteAgentFactory + private class LocalRemoteAgentFactory + implements RemoteAgentFactory { private final Agent agent; @@ -315,7 +318,8 @@ public RemoteAgent createRemoteAgent(Instance instance, AgentLifecycleState stat } } - private class LocalRemoteAgent implements RemoteAgent + private class LocalRemoteAgent + implements RemoteAgent { private final Agent agent; @@ -373,7 +377,8 @@ public void setServiceInventory(List serviceInventory) } } - private static class LocalRemoteSlot implements RemoteSlot + private static class LocalRemoteSlot + implements RemoteSlot { private final Slot slot; private final String instanceId; @@ -433,7 +438,8 @@ public SlotStatus kill() } } - public static class ToUriFunction implements Function + public static class ToUriFunction + implements Function { public URI apply(String uri) { diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/Config.java b/airship-cli/src/main/java/io/airlift/airship/cli/Config.java index ef5798a1..f58eee44 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/Config.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/Config.java @@ -19,7 +19,8 @@ import java.util.List; import java.util.Map.Entry; -public class Config implements Iterable>> +public class Config + implements Iterable>> { private final LinkedListMultimap configuration; private final File file; diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/CoordinatorRecord.java b/airship-cli/src/main/java/io/airlift/airship/cli/CoordinatorRecord.java index 996a44c4..49384d3b 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/CoordinatorRecord.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/CoordinatorRecord.java @@ -10,7 +10,8 @@ import static io.airlift.airship.cli.Ansi.colorize; -public class CoordinatorRecord implements Record +public class CoordinatorRecord + implements Record { public static ImmutableList toCoordinatorRecords(Iterable coordinators) { @@ -83,12 +84,15 @@ public String getColorizedValue(Column column) CoordinatorLifecycleState state = CoordinatorLifecycleState.valueOf(toString(value)); if (CoordinatorLifecycleState.ONLINE == state) { return colorize(state, Color.GREEN); - } else if (CoordinatorLifecycleState.OFFLINE == state) { + } + else if (CoordinatorLifecycleState.OFFLINE == state) { return colorize(state, Color.RED); - } else if (CoordinatorLifecycleState.PROVISIONING == state) { + } + else if (CoordinatorLifecycleState.PROVISIONING == state) { return colorize(state, Color.BLUE); } - } else if (Column.statusMessage == column) { + } + else if (Column.statusMessage == column) { return colorize(value, Color.RED); } return toString(value); diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/Exec.java b/airship-cli/src/main/java/io/airlift/airship/cli/Exec.java index d801be9e..1a3c10a0 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/Exec.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/Exec.java @@ -34,10 +34,10 @@ public static void execLocal(String command) String[] args; if (command == null) { - args = new String[]{shell, "-l"}; + args = new String[] {shell, "-l"}; } else { - args = new String[]{shell, "-c", shellQuote(command)}; + args = new String[] {shell, "-c", shellQuote(command)}; } posix.execv(shell, args); } @@ -62,10 +62,10 @@ public static void execRemote(String host, String command) String[] args; if (command == null) { - args = new String[]{ssh, host}; + args = new String[] {ssh, host}; } else { - args = new String[]{ssh, host, "-t", shellQuote(command)}; + args = new String[] {ssh, host, "-t", shellQuote(command)}; } posix.execv(ssh, args); @@ -103,7 +103,6 @@ public static String findFileCommon(String name, String path, boolean executable int length = name.length(); if (!Platform.IS_WINDOWS) { - if (length > 1 && Character.isLetter(name.charAt(0)) && name.charAt(1) == '/') { if (isMatch(executableOnly, name)) { return name; diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/HttpCommander.java b/airship-cli/src/main/java/io/airlift/airship/cli/HttpCommander.java index 9237bd9a..bb523945 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/HttpCommander.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/HttpCommander.java @@ -39,7 +39,8 @@ import static io.airlift.http.client.JsonBodyGenerator.jsonBodyGenerator; import static io.airlift.http.client.JsonResponseHandler.createJsonResponseHandler; -public class HttpCommander implements Commander +public class HttpCommander + implements Commander { private static final JsonCodec> SLOTS_CODEC = JsonCodec.listJsonCodec(SlotStatusRepresentation.class); private static final JsonCodec ASSIGNMENT_CODEC = JsonCodec.jsonCodec(AssignmentRepresentation.class); @@ -388,7 +389,8 @@ public boolean sshAgent(AgentFilter agentFilter, String command) return true; } - public static class TextBodyGenerator implements BodyGenerator + public static class TextBodyGenerator + implements BodyGenerator { public static TextBodyGenerator textBodyGenerator(String instance) { diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/LocalCommander.java b/airship-cli/src/main/java/io/airlift/airship/cli/LocalCommander.java index 5bb49763..7acde8f6 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/LocalCommander.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/LocalCommander.java @@ -37,7 +37,8 @@ import static io.airlift.airship.shared.VersionsUtil.createAgentsVersion; import static io.airlift.airship.shared.VersionsUtil.createSlotsVersion; -public class LocalCommander implements Commander +public class LocalCommander + implements Commander { private static final JsonCodec SERVICE_DESCRIPTORS_CODEC = JsonCodec.jsonCodec(ServiceDescriptorsRepresentation.class); diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/RealInteractiveUser.java b/airship-cli/src/main/java/io/airlift/airship/cli/RealInteractiveUser.java index 166a8aa5..3532149d 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/RealInteractiveUser.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/RealInteractiveUser.java @@ -4,7 +4,8 @@ import java.io.IOException; import java.io.InputStreamReader; -public class RealInteractiveUser implements InteractiveUser +public class RealInteractiveUser + implements InteractiveUser { @Override public boolean ask(String question, boolean defaultValue) diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/SimpleRecord.java b/airship-cli/src/main/java/io/airlift/airship/cli/SimpleRecord.java index f88d796d..9ce98114 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/SimpleRecord.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/SimpleRecord.java @@ -8,7 +8,8 @@ import static com.google.common.collect.Maps.newLinkedHashMap; import static io.airlift.airship.cli.Ansi.colorize; -public class SimpleRecord implements Record +public class SimpleRecord + implements Record { public static Builder builder() { diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/SlotFilter.java b/airship-cli/src/main/java/io/airlift/airship/cli/SlotFilter.java index 992296e9..eee79635 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/SlotFilter.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/SlotFilter.java @@ -146,7 +146,8 @@ public String toString() private static Predicate> emptyPredicate() { - return new Predicate>() { + return new Predicate>() + { @Override public boolean apply(@Nullable List input) { diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/SlotRecord.java b/airship-cli/src/main/java/io/airlift/airship/cli/SlotRecord.java index 7d9cdd8c..2851bf1a 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/SlotRecord.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/SlotRecord.java @@ -9,7 +9,8 @@ import static io.airlift.airship.cli.Ansi.colorize; -public class SlotRecord implements Record +public class SlotRecord + implements Record { public static ImmutableList toSlotRecords(Iterable slots) @@ -87,10 +88,12 @@ public String getColorizedValue(Column column) SlotLifecycleState state = SlotLifecycleState.lookup(toString(value)); if (SlotLifecycleState.RUNNING == state) { return colorize(state, Color.GREEN); - } else if (SlotLifecycleState.UNKNOWN == state) { + } + else if (SlotLifecycleState.UNKNOWN == state) { return colorize(state, Color.RED); } - } else if (Column.statusMessage == column) { + } + else if (Column.statusMessage == column) { return colorize(value, Color.RED); } return toString(value); diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/TableOutputFormat.java b/airship-cli/src/main/java/io/airlift/airship/cli/TableOutputFormat.java index c154dee9..ff70f995 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/TableOutputFormat.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/TableOutputFormat.java @@ -19,7 +19,8 @@ import static io.airlift.airship.cli.CoordinatorRecord.toCoordinatorRecords; import static io.airlift.airship.cli.SlotRecord.toSlotRecords; -public class TableOutputFormat implements OutputFormat +public class TableOutputFormat + implements OutputFormat { private final String environmentRef; private final Config config; @@ -71,7 +72,8 @@ private Column getHostColumn() { if ("true".equalsIgnoreCase(config.get("environment." + environmentRef + ".use-internal-address"))) { return internalHost; - } else { + } + else { return externalHost; } } diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/TablePrinter.java b/airship-cli/src/main/java/io/airlift/airship/cli/TablePrinter.java index e6e321fd..c0bc667c 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/TablePrinter.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/TablePrinter.java @@ -112,5 +112,4 @@ private static String spaces(int count) } return result.toString(); } - } diff --git a/airship-cli/src/test/java/io/airlift/airship/cli/AirshipTestRun.java b/airship-cli/src/test/java/io/airlift/airship/cli/AirshipTestRun.java index 9cb0ab7f..d1663d73 100644 --- a/airship-cli/src/test/java/io/airlift/airship/cli/AirshipTestRun.java +++ b/airship-cli/src/test/java/io/airlift/airship/cli/AirshipTestRun.java @@ -33,7 +33,6 @@ public static void main(String[] args) execute("environment", "use", "local"); example(); - } private static void example() diff --git a/airship-cli/src/test/java/io/airlift/airship/cli/TestAirship.java b/airship-cli/src/test/java/io/airlift/airship/cli/TestAirship.java index e5e61f0e..e1d68417 100644 --- a/airship-cli/src/test/java/io/airlift/airship/cli/TestAirship.java +++ b/airship-cli/src/test/java/io/airlift/airship/cli/TestAirship.java @@ -481,7 +481,8 @@ private void execute(String... args) } } - private static class MockOutputFormat implements OutputFormat + private static class MockOutputFormat + implements OutputFormat { private List coordinators; private List agents; @@ -513,7 +514,8 @@ public void displaySlots(Iterable slots) } } - private static class MockInteractiveUser implements InteractiveUser + private static class MockInteractiveUser + implements InteractiveUser { private boolean answer; diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Bundle.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Bundle.java index 75446cc3..c1f4c4ac 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Bundle.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Bundle.java @@ -41,7 +41,6 @@ public boolean isSnapshot() return snapshot; } - @Override public boolean equals(Object o) { diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/GitUtils.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/GitUtils.java index 8ff33195..2f9d6622 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/GitUtils.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/GitUtils.java @@ -30,7 +30,6 @@ public static Ref getBranch(Repository repository, String name) return repository.getRefDatabase().getRefs(Constants.R_HEADS).get(name); } - public static RevCommit getCommit(Repository repository, Ref ref) { RevWalk revWalk = new RevWalk(repository); @@ -60,7 +59,6 @@ public InputStream getInput() }; } - public static Map getEntries(Repository repository, RevTree tree) throws IOException { diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/IgnoreHiddenFilter.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/IgnoreHiddenFilter.java index aff59eff..71f9017c 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/IgnoreHiddenFilter.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/IgnoreHiddenFilter.java @@ -6,7 +6,7 @@ import java.io.IOException; class IgnoreHiddenFilter - extends TreeFilter + extends TreeFilter { @Override public boolean include(TreeWalk walker) @@ -26,5 +26,4 @@ public TreeFilter clone() { return this; } - } diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Maven.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Maven.java index 91b07d0c..efa51e15 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Maven.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Maven.java @@ -60,7 +60,7 @@ public Maven(@Nullable Metadata.Repository snapshotsRepositoryInfo, { validateRepositoryMetadata(snapshotsRepositoryInfo, "snapshots"); validateRepositoryMetadata(releasesRepositoryInfo, "releases"); - + final SettingsBuildingRequest request = new DefaultSettingsBuildingRequest() .setGlobalSettingsFile(DEFAULT_GLOBAL_SETTINGS_FILE) .setUserSettingsFile(DEFAULT_USER_SETTINGS_FILE) @@ -97,7 +97,7 @@ private static void validateRepositoryMetadata(Metadata.Repository info, String Preconditions.checkNotNull(info.getId(), "%s repository id is null", name); Preconditions.checkNotNull(info.getUri(), "%s repository uri is null", name); } - + private static RemoteRepository makeRemoteRepository(Metadata.Repository info, Server server, boolean snapshot) { return new RemoteRepository(info.getId(), "default", info.getUri()) @@ -156,5 +156,4 @@ public boolean contains(String groupId, String artifactId, String version, Strin return true; } - } diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Model.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Model.java index acb1940b..c029a653 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Model.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Model.java @@ -249,5 +249,4 @@ public int compare(String tag1, String tag2) return Ints.compare(extractVersion(tag1), extractVersion(tag2)); } } - } diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ReleaseCommand.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ReleaseCommand.java index 42d8f609..cfb469f0 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ReleaseCommand.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ReleaseCommand.java @@ -14,7 +14,6 @@ import static java.lang.String.format; - @Command(name = "release", description = "Build and release a config bundle") public class ReleaseCommand implements Callable @@ -74,6 +73,4 @@ public Void call() return null; } - - } diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/SnapshotCommand.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/SnapshotCommand.java index 29472933..cfd09112 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/SnapshotCommand.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/SnapshotCommand.java @@ -57,6 +57,5 @@ public Void call() System.out.println(format("Uploaded %s-%s", bundle.getName(), bundle.getVersionString())); return null; - } } diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ZipGenerator.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ZipGenerator.java index 1c485a16..46c25d9e 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ZipGenerator.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ZipGenerator.java @@ -22,6 +22,5 @@ public void write(OutputStream out) throws IOException { ZipPackager.packageEntries(out, entries); - } } diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ZipPackager.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ZipPackager.java index d024e415..97baa53a 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ZipPackager.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ZipPackager.java @@ -25,5 +25,4 @@ public static void packageEntries(OutputStream output, Map provisionAgents(String agentConfig, { if (agentConfig == null) { agentConfig = agentDefaultConfig; - } if (instanceType == null) { instanceType = agentDefaultInstanceType; @@ -492,7 +492,7 @@ contentTypeText, mimeVersion, encodingText, format(attachmentFormat, "installer. contentDownloadUrl, mimeVersion, encodingText, format(attachmentFormat, "airship-install.sh"), "", coordinatorInstall.toASCIIString(), "", - boundaryLine , + boundaryLine, contentExecUrl, mimeVersion, encodingText, format(attachmentFormat, "airship-install-prep.sh"), "", coordinatorInstallPrep.toASCIIString(), @@ -572,7 +572,7 @@ contentTypeText, mimeVersion, encodingText, format(attachmentFormat, "installer. contentDownloadUrl, mimeVersion, encodingText, format(attachmentFormat, "airship-install.sh"), "", coordinatorInstall.toASCIIString(), "", - boundaryLine , + boundaryLine, contentExecUrl, mimeVersion, encodingText, format(attachmentFormat, "airship-install-prep.sh"), "", coordinatorInstallPrep.toASCIIString(), diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Coordinator.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Coordinator.java index e18312c9..31202805 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Coordinator.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Coordinator.java @@ -368,7 +368,6 @@ private List> updateAllAgents() if (remoteAgent.status().getState() == AgentLifecycleState.PROVISIONING) { instanceIds.add(remoteAgent.status().getAgentId()); } - } // remove any agents not in the provisioner list @@ -558,7 +557,7 @@ public SlotStatus apply(RemoteSlot slot) SlotStatus slotStatus = slot.assign(installation); return slotStatus; } - }) ; + }); } private boolean sameBinary(Collection values) @@ -567,7 +566,8 @@ private boolean sameBinary(Collection values) return true; } final Assignment assignment = Iterables.getFirst(values, null); - return Iterables.all(values, new Predicate() { + return Iterables.all(values, new Predicate() + { @Override public boolean apply(@Nullable Assignment input) { @@ -878,7 +878,8 @@ public Callable apply(@Nullable final F item) catch (ExecutionException e) { if (e.getCause() != null) { failures.add(e.getCause()); - } else { + } + else { failures.add(e); } } @@ -923,6 +924,5 @@ public T call() { return function.apply(item); } - } } diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorFilterBuilder.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorFilterBuilder.java index fe3ea764..c222753f 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorFilterBuilder.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorFilterBuilder.java @@ -28,12 +28,12 @@ public static Predicate build(UriInfo uriInfo) { CoordinatorFilterBuilder builder = new CoordinatorFilterBuilder(); for (Entry> entry : uriInfo.getQueryParameters().entrySet()) { - if ("uuid" .equals(entry.getKey())) { + if ("uuid".equals(entry.getKey())) { for (String uuidFilter : entry.getValue()) { builder.addUuidFilter(uuidFilter); } } - if ("!uuid" .equals(entry.getKey())) { + if ("!uuid".equals(entry.getKey())) { for (String notUuidFilter : entry.getValue()) { builder.addNotUuidFilter(notUuidFilter); } @@ -291,7 +291,8 @@ public URI buildUri(HttpUriBuilder uriBuilder) return uriBuilder.build(); } - public static class UuidPredicate implements Predicate + public static class UuidPredicate + implements Predicate { private final String uuid; @@ -307,7 +308,8 @@ public boolean apply(@Nullable CoordinatorStatus coordinatorStatus) } } - public static class HostPredicate implements Predicate + public static class HostPredicate + implements Predicate { private final UriHostPredicate predicate; @@ -324,7 +326,8 @@ public boolean apply(@Nullable CoordinatorStatus coordinatorStatus) } } - public static class MachinePredicate implements Predicate + public static class MachinePredicate + implements Predicate { private final GlobPredicate predicate; @@ -340,7 +343,8 @@ public boolean apply(@Nullable CoordinatorStatus coordinatorStatus) } } - public static class StatePredicate implements Predicate + public static class StatePredicate + implements Predicate { private final CoordinatorLifecycleState state; @@ -355,5 +359,4 @@ public boolean apply(@Nullable CoordinatorStatus coordinatorStatus) return coordinatorStatus.getState() == state; } } - } diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorLifecycleResource.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorLifecycleResource.java index f227a36a..073040f3 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorLifecycleResource.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorLifecycleResource.java @@ -79,5 +79,5 @@ public Response setState(String newState, return Response.ok(transform(results, fromSlotStatus(coordinator.getAllSlotStatus(), repository))) .header(AIRSHIP_SLOTS_VERSION_HEADER, createSlotsVersion(results)) .build(); - } + } } diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorMain.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorMain.java index 4acb457f..6fafcea2 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorMain.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorMain.java @@ -26,7 +26,6 @@ import static io.airlift.airship.coordinator.ConditionalModule.installIfPropertyEquals; - public class CoordinatorMain { private static final Logger log = Logger.get(CoordinatorMain.class); diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/FileStateManager.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/FileStateManager.java index 3fe45141..00dfcf99 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/FileStateManager.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/FileStateManager.java @@ -19,7 +19,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Lists.newArrayList; -public class FileStateManager implements StateManager +public class FileStateManager + implements StateManager { private static final Logger log = Logger.get(FileStateManager.class); private final File dataDir; @@ -63,7 +64,7 @@ public Collection getAllExpectedStates() @Override public void deleteExpectedState(UUID slotId) { - new File(dataDir, slotId.toString() + ".json").delete(); + new File(dataDir, slotId.toString() + ".json").delete(); } @Override diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/GlobPredicate.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/GlobPredicate.java index 9311ff85..a262b54f 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/GlobPredicate.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/GlobPredicate.java @@ -2,7 +2,8 @@ import java.util.regex.Pattern; -public class GlobPredicate extends RegexPredicate +public class GlobPredicate + extends RegexPredicate { private final String glob; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteAgent.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteAgent.java index 3f2d11c2..da0d8fe7 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteAgent.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteAgent.java @@ -42,7 +42,8 @@ import static io.airlift.http.client.StatusResponseHandler.createStatusResponseHandler; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -public class HttpRemoteAgent implements RemoteAgent +public class HttpRemoteAgent + implements RemoteAgent { private static final Logger log = Logger.get(HttpRemoteAgent.class); diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteAgentFactory.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteAgentFactory.java index 244e8c5f..a78e0d30 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteAgentFactory.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteAgentFactory.java @@ -14,7 +14,8 @@ import io.airlift.json.JsonCodec; import io.airlift.node.NodeInfo; -public class HttpRemoteAgentFactory implements RemoteAgentFactory +public class HttpRemoteAgentFactory + implements RemoteAgentFactory { private final String environment; private final AsyncHttpClient httpClient; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteSlot.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteSlot.java index db909f73..d7914ab1 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteSlot.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteSlot.java @@ -26,7 +26,8 @@ import static io.airlift.json.JsonCodec.jsonCodec; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -public class HttpRemoteSlot implements RemoteSlot +public class HttpRemoteSlot + implements RemoteSlot { private static final Logger log = Logger.get(HttpRemoteSlot.class); private static final JsonCodec installationCodec = jsonCodec(InstallationRepresentation.class); diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRepository.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRepository.java index 665ba233..67a2810b 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRepository.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRepository.java @@ -25,7 +25,8 @@ import static io.airlift.airship.shared.MavenCoordinates.DEFAULT_BINARY_PACKAGING; import static io.airlift.airship.shared.MavenCoordinates.DEFAULT_CONFIG_PACKAGING; -public class HttpRepository implements Repository +public class HttpRepository + implements Repository { private final List baseUris; private final Pattern configShortNamePattern; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpServiceInventory.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpServiceInventory.java index b01d7491..c4ea873b 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpServiceInventory.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpServiceInventory.java @@ -43,7 +43,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; -public class HttpServiceInventory implements ServiceInventory +public class HttpServiceInventory + implements ServiceInventory { private static final Logger log = Logger.get(HttpServiceInventory.class); private final Repository repository; @@ -134,7 +135,6 @@ private List getServiceInventory(SlotStatus slotStatus) return null; } - try { String json; try { diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InMemoryStateManager.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InMemoryStateManager.java index 65dac22a..805c4c8d 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InMemoryStateManager.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InMemoryStateManager.java @@ -8,7 +8,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -public class InMemoryStateManager implements StateManager +public class InMemoryStateManager + implements StateManager { private final ConcurrentMap expectedState = new ConcurrentHashMap(); diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InputSupplierStreamingOutput.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InputSupplierStreamingOutput.java index dfc6352d..b45838e4 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InputSupplierStreamingOutput.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InputSupplierStreamingOutput.java @@ -10,7 +10,8 @@ import java.io.InputStream; import java.io.OutputStream; -class InputSupplierStreamingOutput implements StreamingOutput +class InputSupplierStreamingOutput + implements StreamingOutput { private final InputSupplier inputSupplier; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InvalidSlotFilterException.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InvalidSlotFilterException.java index d978b140..66b6d3ca 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InvalidSlotFilterException.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InvalidSlotFilterException.java @@ -1,6 +1,7 @@ package io.airlift.airship.coordinator; -public class InvalidSlotFilterException extends RuntimeException +public class InvalidSlotFilterException + extends RuntimeException { public InvalidSlotFilterException() { diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InvalidSlotFilterExceptionMapper.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InvalidSlotFilterExceptionMapper.java index 64885442..e21e6e5a 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InvalidSlotFilterExceptionMapper.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InvalidSlotFilterExceptionMapper.java @@ -4,7 +4,8 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.ext.ExceptionMapper; -public class InvalidSlotFilterExceptionMapper implements ExceptionMapper +public class InvalidSlotFilterExceptionMapper + implements ExceptionMapper { @Override public Response toResponse(InvalidSlotFilterException exception) diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/MavenMetadata.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/MavenMetadata.java index cc483bc6..681954f8 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/MavenMetadata.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/MavenMetadata.java @@ -88,7 +88,6 @@ public static class SnapshotVersion public String updated; } - private static final JAXBContext jaxbContext; static { @@ -122,5 +121,4 @@ public static void marshalMavenMetadata(File file, MavenMetadata metadata) Marshaller marshaller = jaxbContext.createMarshaller(); marshaller.marshal(metadata, file); } - } diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/MavenRepository.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/MavenRepository.java index 436ef840..2a6f1772 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/MavenRepository.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/MavenRepository.java @@ -34,7 +34,8 @@ import static io.airlift.airship.shared.MavenCoordinates.toBinaryGAV; import static io.airlift.airship.shared.MavenCoordinates.toConfigGAV; -public class MavenRepository implements Repository +public class MavenRepository + implements Repository { private static final Logger log = Logger.get(MavenRepository.class); @@ -61,7 +62,8 @@ public MavenRepository(CoordinatorConfig config) { if (config.getDefaultRepositoryGroupId() != null) { this.defaultGroupIds = ImmutableList.copyOf(config.getDefaultRepositoryGroupId()); - } else { + } + else { this.defaultGroupIds = ImmutableList.of(); } @@ -162,7 +164,6 @@ public boolean configEqualsIgnoreVersion(String config1, String config2) return coordinates1 != null && coordinates2 != null && coordinates1.equalsIgnoreVersion(coordinates2); - } @Override @@ -393,7 +394,8 @@ private String toString(URI uri) throws IOException { final URL url = uri.toURL(); - return CharStreams.toString(new InputSupplier() { + return CharStreams.toString(new InputSupplier() + { @Override public InputStreamReader getInput() throws IOException diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RegexPredicate.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RegexPredicate.java index 4bac7f8c..e4e30ee3 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RegexPredicate.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RegexPredicate.java @@ -6,7 +6,8 @@ import java.util.regex.Pattern; -public class RegexPredicate implements Predicate +public class RegexPredicate + implements Predicate { private final Pattern pattern; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/SimpleDbStateManager.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/SimpleDbStateManager.java index 1aee4c75..1109f97f 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/SimpleDbStateManager.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/SimpleDbStateManager.java @@ -26,7 +26,8 @@ import static com.google.common.collect.Lists.newArrayList; -public class SimpleDbStateManager implements StateManager +public class SimpleDbStateManager + implements StateManager { private static final Logger log = Logger.get(SimpleDbStateManager.class); private final AmazonSimpleDB simpleDb; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/StaticProvisioner.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/StaticProvisioner.java index d62b37ba..c475ffaf 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/StaticProvisioner.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/StaticProvisioner.java @@ -110,7 +110,8 @@ public StaticProvisioner(URI coordinatorsUri, public List listCoordinators() { List lines = readLines("coordinators", coordinatorsUri, coordinatorsResourceIsUp); - return ImmutableList.copyOf(Iterables.transform(lines, new Function() { + return ImmutableList.copyOf(Iterables.transform(lines, new Function() + { @Override public Instance apply(String coordinatorUri) { diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/UriHostPredicate.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/UriHostPredicate.java index d6981319..935ab95d 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/UriHostPredicate.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/UriHostPredicate.java @@ -8,7 +8,8 @@ import java.net.InetAddress; import java.net.URI; -public class UriHostPredicate implements Predicate +public class UriHostPredicate + implements Predicate { private final Predicate predicate; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthFilter.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthFilter.java index ddc57dd7..86623aa3 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthFilter.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthFilter.java @@ -155,7 +155,6 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo return; } - // verify signature AuthorizedKey authorizedKey = verifier.verify(fingerprint, signature, bytesToSign); if (authorizedKey == null) { diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/DsaPublicKey.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/DsaPublicKey.java index 8609ba11..54fdb8d0 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/DsaPublicKey.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/DsaPublicKey.java @@ -78,5 +78,4 @@ private static byte[] toJavaDsaSignature(byte[] r, byte[] s) .writeEntry(SEQUENCE, encodedNumbers) .toByteArray(); } - } diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/S3AuthorizedKeyStore.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/S3AuthorizedKeyStore.java index 7715d48c..3eeb9f53 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/S3AuthorizedKeyStore.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/S3AuthorizedKeyStore.java @@ -62,7 +62,8 @@ public S3AuthorizedKeyStore(AmazonS3 s3Client, String bucketName, String path, D if (bucketName != null) { if (path == null) { path = "/"; - } else if (!path.endsWith("/")) { + } + else if (!path.endsWith("/")) { path = path + "/"; } } @@ -71,7 +72,8 @@ public S3AuthorizedKeyStore(AmazonS3 s3Client, String bucketName, String path, D this.refreshInterval = refreshInterval; if (refreshInterval != null) { executor = Executors.newSingleThreadScheduledExecutor(new ThreadFactoryBuilder().setDaemon(true).setNameFormat("S3AuthorizedKeyStore-%s").build()); - } else { + } + else { executor = null; } @@ -191,7 +193,8 @@ public String toString() } } - private static class S3ObjectListing implements Iterable + private static class S3ObjectListing + implements Iterable { private final AmazonS3 s3Client; private final ListObjectsRequest listObjectsRequest; @@ -228,7 +231,8 @@ public Iterator apply(ObjectListing input) } } - private static class S3InputSupplier implements InputSupplier + private static class S3InputSupplier + implements InputSupplier { private final AmazonS3 s3Client; private final String bucketName; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/DerType.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/DerType.java index bc8bca96..278851ca 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/DerType.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/DerType.java @@ -2,8 +2,8 @@ public enum DerType { - INTEGER((byte)0x02), - SEQUENCE((byte)0x30); + INTEGER((byte) 0x02), + SEQUENCE((byte) 0x30); private final byte value; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemDecoder.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemDecoder.java index 62c506bc..5772e6e9 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemDecoder.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemDecoder.java @@ -69,7 +69,6 @@ else if (pem.getType().equals("RSA PRIVATE KEY")) { throw new IllegalArgumentException("Unknown key type " + pem.getType()); } - public static Pem parsePem(String pemData) throws IOException { @@ -85,7 +84,8 @@ public static Pem parsePem(String pemData) throw new IllegalArgumentException("Invalid pem data: missing BEGIN"); } - public static String parseBegin(String line) { + public static String parseBegin(String line) + { Pattern beginPattern = Pattern.compile("-----BEGIN (.*)-----"); Matcher matcher = beginPattern.matcher(line); if (matcher.matches()) { @@ -115,8 +115,8 @@ private static ListMultimap readHeaders(PeekingIterator { ListMultimap headers = ArrayListMultimap.create(); for (String line = iterator.peek(); - line != null && !line.startsWith(keyEnd) && line.contains(":"); - line = iterator.peek()) { + line != null && !line.startsWith(keyEnd) && line.contains(":"); + line = iterator.peek()) { // consume line from iterator iterator.next(); @@ -140,8 +140,8 @@ private static byte[] readBody(PeekingIterator iterator, String keyEnd) { StringBuilder body = new StringBuilder(); for (String line = iterator.peek(); - line != null && !line.startsWith(keyEnd); - line = iterator.peek()) { + line != null && !line.startsWith(keyEnd); + line = iterator.peek()) { // consume line from iterator iterator.next(); diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemRsaPrivateKey.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemRsaPrivateKey.java index 907a8c28..adf43c2c 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemRsaPrivateKey.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemRsaPrivateKey.java @@ -46,5 +46,4 @@ public BigInteger getPrivateExponent() { return privateExponent; } - } diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockProvisioner.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockProvisioner.java index bc67ee43..83ec55d2 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockProvisioner.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockProvisioner.java @@ -18,7 +18,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -public class MockProvisioner implements Provisioner +public class MockProvisioner + implements Provisioner { private final Map coordinators = new ConcurrentHashMap<>(); private final Map agents = new ConcurrentHashMap<>(); @@ -106,18 +107,19 @@ public List provisionCoordinators(String coordinatorConfigSpec, instanceType); instances.add(new Instance(coordinatorStatus.getInstanceId(), - coordinatorStatus.getInstanceType(), - coordinatorStatus.getLocation(), - null, - null)); + coordinatorStatus.getInstanceType(), + coordinatorStatus.getLocation(), + null, + null)); addCoordinators(coordinatorStatus); } return instances.build(); } - - public CoordinatorStatus startCoordinator(String instanceId) { + + public CoordinatorStatus startCoordinator(String instanceId) + { CoordinatorStatus coordinatorStatus = coordinators.get(instanceId); Preconditions.checkNotNull(coordinatorStatus, "coordinatorStatus is null"); @@ -233,10 +235,10 @@ public List provisionAgents(String agentConfig, ImmutableMap.of()); instances.add(new Instance(agentStatus.getInstanceId(), - agentStatus.getInstanceType(), - agentStatus.getLocation(), - null, - null)); + agentStatus.getInstanceType(), + agentStatus.getLocation(), + null, + null)); addAgents(agentStatus); } @@ -250,7 +252,8 @@ public void terminateAgents(Iterable instanceIds) removeAgents(instanceIds); } - public AgentStatus startAgent(String instanceId) { + public AgentStatus startAgent(String instanceId) + { AgentStatus agentStatus = agents.get(instanceId); Preconditions.checkNotNull(agentStatus, "agentStatus is null"); diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteAgent.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteAgent.java index 141a720a..cb0788d8 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteAgent.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteAgent.java @@ -24,7 +24,8 @@ import static io.airlift.airship.shared.HttpUriBuilder.uriBuilderFrom; import static io.airlift.airship.shared.SlotStatus.createSlotStatus; -public class MockRemoteAgent implements RemoteAgent +public class MockRemoteAgent + implements RemoteAgent { private final String instanceId; private final Map agents; @@ -105,7 +106,8 @@ public synchronized AgentStatus getAgentStatus() AgentStatus agentStatus = agents.get(instanceId); if (agentStatus != null) { return agentStatus; - } else { + } + else { return new AgentStatus(null, AgentLifecycleState.OFFLINE, instanceId, diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteAgentFactory.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteAgentFactory.java index 631495f0..b83be755 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteAgentFactory.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteAgentFactory.java @@ -6,7 +6,8 @@ import java.util.Map; -public class MockRemoteAgentFactory implements RemoteAgentFactory +public class MockRemoteAgentFactory + implements RemoteAgentFactory { private final Map agents; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteCoordinator.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteCoordinator.java index 3c3dd3a6..2640c675 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteCoordinator.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteCoordinator.java @@ -44,7 +44,8 @@ public CoordinatorStatus getCoordinatorStatus() CoordinatorStatus coordinatorStatus = coordinators.get(instanceId); if (coordinatorStatus != null) { return coordinatorStatus; - } else { + } + else { return new CoordinatorStatus(null, CoordinatorLifecycleState.OFFLINE, instanceId, diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteSlot.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteSlot.java index 6d1fa834..4657a305 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteSlot.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteSlot.java @@ -10,7 +10,8 @@ import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; import static io.airlift.airship.shared.SlotLifecycleState.TERMINATED; -public class MockRemoteSlot implements RemoteSlot +public class MockRemoteSlot + implements RemoteSlot { private SlotStatus slotStatus; private final MockRemoteAgent mockRemoteAgent; @@ -27,7 +28,6 @@ public UUID getId() return slotStatus.getId(); } - @Override public SlotStatus status() { diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockServiceInventory.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockServiceInventory.java index bb2ecf63..103f8e8f 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockServiceInventory.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockServiceInventory.java @@ -7,7 +7,8 @@ import java.util.List; -public class MockServiceInventory implements ServiceInventory +public class MockServiceInventory + implements ServiceInventory { private ImmutableList serviceInventory = ImmutableList.of(); diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAdminResource.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAdminResource.java index 10763049..89ec644a 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAdminResource.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAdminResource.java @@ -184,7 +184,6 @@ public void testCoordinatorProvision() assertEquals(coordinator.getCoordinator(instanceId).getExternalUri(), coordinatorStatus.getExternalUri()); assertEquals(coordinator.getCoordinator(instanceId).getState(), CoordinatorLifecycleState.ONLINE); - requestUri = URI.create("http://localhost/v1/admin/coordinator"); response = resource.getAllCoordinators(MockUriInfo.from(requestUri)); assertEquals(response.getStatus(), Response.Status.OK.getStatusCode()); @@ -295,7 +294,6 @@ public void testAgentProvision() assertEquals(coordinator.getAgent(instanceId).getExternalUri(), expectedAgentStatus.getExternalUri()); assertEquals(coordinator.getAgent(instanceId).getState(), AgentLifecycleState.ONLINE); - requestUri = URI.create("http://localhost/v1/admin/agent"); response = resource.getAllAgents(MockUriInfo.from(requestUri)); assertEquals(response.getStatus(), Response.Status.OK.getStatusCode()); diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAwsProvisionerConfig.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAwsProvisionerConfig.java index 32380a03..1158a5d9 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAwsProvisionerConfig.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAwsProvisionerConfig.java @@ -34,22 +34,22 @@ public class TestAwsProvisionerConfig public void testDefaults() { ConfigAssertions.assertRecordedDefaults(ConfigAssertions.recordDefaults(AwsProvisionerConfig.class) - .setAirshipVersion(null) - .setAgentDefaultConfig(null) - .setAwsCredentialsFile("aws-credentials.properties") - .setAwsCoordinatorAmi("ami-27b7744e") - .setAwsCoordinatorKeypair("keypair") - .setAwsCoordinatorSecurityGroup("default") - .setAwsCoordinatorDefaultInstanceType("t1.micro") - .setAwsAgentAmi("ami-27b7744e") - .setAwsAgentKeypair("keypair") - .setAwsAgentSecurityGroup("default") - .setProvisioningScriptsArtifact(null) - .setAwsAgentDefaultInstanceType("t1.micro") - .setAwsEndpoint(null) - .setS3KeystoreBucket(null) - .setS3KeystorePath(null) - .setS3KeystoreRefreshInterval(new Duration(10, TimeUnit.SECONDS)) + .setAirshipVersion(null) + .setAgentDefaultConfig(null) + .setAwsCredentialsFile("aws-credentials.properties") + .setAwsCoordinatorAmi("ami-27b7744e") + .setAwsCoordinatorKeypair("keypair") + .setAwsCoordinatorSecurityGroup("default") + .setAwsCoordinatorDefaultInstanceType("t1.micro") + .setAwsAgentAmi("ami-27b7744e") + .setAwsAgentKeypair("keypair") + .setAwsAgentSecurityGroup("default") + .setProvisioningScriptsArtifact(null) + .setAwsAgentDefaultInstanceType("t1.micro") + .setAwsEndpoint(null) + .setS3KeystoreBucket(null) + .setS3KeystorePath(null) + .setS3KeystoreRefreshInterval(new Duration(10, TimeUnit.SECONDS)) ); } @@ -101,22 +101,22 @@ public void testProvisioningScriptPattern() throws Exception { AwsProvisionerConfig config = new AwsProvisionerConfig() - .setAirshipVersion("99.9") - .setAgentDefaultConfig("agent:config:1") - .setAwsCredentialsFile("aws.credentials") - .setAwsEndpoint("http://ytmnd.com") - .setAwsCoordinatorAmi("c-ami-0123abcd") - .setAwsCoordinatorKeypair("c-keypair") - .setAwsCoordinatorSecurityGroup("c-default") - .setProvisioningScriptsArtifact("foo:bar") - .setAwsCoordinatorDefaultInstanceType("c-t1.micro") - .setAwsAgentAmi("a-ami-0123abcd") - .setAwsAgentKeypair("a-keypair") - .setAwsAgentSecurityGroup("a-default") - .setAwsAgentDefaultInstanceType("a-t1.micro") - .setS3KeystoreBucket("bucket") - .setS3KeystorePath("path") - .setS3KeystoreRefreshInterval(new Duration(30, TimeUnit.SECONDS)); + .setAirshipVersion("99.9") + .setAgentDefaultConfig("agent:config:1") + .setAwsCredentialsFile("aws.credentials") + .setAwsEndpoint("http://ytmnd.com") + .setAwsCoordinatorAmi("c-ami-0123abcd") + .setAwsCoordinatorKeypair("c-keypair") + .setAwsCoordinatorSecurityGroup("c-default") + .setProvisioningScriptsArtifact("foo:bar") + .setAwsCoordinatorDefaultInstanceType("c-t1.micro") + .setAwsAgentAmi("a-ami-0123abcd") + .setAwsAgentKeypair("a-keypair") + .setAwsAgentSecurityGroup("a-default") + .setAwsAgentDefaultInstanceType("a-t1.micro") + .setS3KeystoreBucket("bucket") + .setS3KeystorePath("path") + .setS3KeystoreRefreshInterval(new Duration(30, TimeUnit.SECONDS)); assertFailsValidation(config, "provisioningScriptsArtifact", "Invalid provisioning script artifact", Pattern.class); config.setProvisioningScriptsArtifact("com.example:bar:1-SNAPSHOT"); assertValidates(config); diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorAssignmentResource.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorAssignmentResource.java index d9861157..d1e04f3d 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorAssignmentResource.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorAssignmentResource.java @@ -122,9 +122,9 @@ public void setup() ImmutableMap.of("cpu", 8, "memory", 1024)); prefixSize = shortestUniquePrefix(asList( - appleSlotStatus1.getId().toString(), - appleSlotStatus2.getId().toString(), - bananaSlotStatus.getId().toString()), + appleSlotStatus1.getId().toString(), + appleSlotStatus2.getId().toString(), + bananaSlotStatus.getId().toString()), MIN_PREFIX_SIZE); provisioner.addAgents(agentStatus); diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorConfig.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorConfig.java index cd788d4b..966b4327 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorConfig.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorConfig.java @@ -17,14 +17,14 @@ public class TestCoordinatorConfig public void testDefaults() { ConfigAssertions.assertRecordedDefaults(ConfigAssertions.recordDefaults(CoordinatorConfig.class) - .setStatusExpiration(new Duration(5, TimeUnit.SECONDS)) - .setServiceInventoryCacheDir("service-inventory-cache") - .setAllowDuplicateInstallationsOnAnAgent(false) - .setRepositories("") - .setDefaultRepositoryGroupId("") - .setHttpShortNamePattern(DEFAULT_HTTP_SHORT_NAME_PATTERN) - .setHttpRepoBinaryVersionPattern(null) - .setHttpRepoConfigVersionPattern(null) + .setStatusExpiration(new Duration(5, TimeUnit.SECONDS)) + .setServiceInventoryCacheDir("service-inventory-cache") + .setAllowDuplicateInstallationsOnAnAgent(false) + .setRepositories("") + .setDefaultRepositoryGroupId("") + .setHttpShortNamePattern(DEFAULT_HTTP_SHORT_NAME_PATTERN) + .setHttpRepoBinaryVersionPattern(null) + .setHttpRepoConfigVersionPattern(null) ); } @@ -54,5 +54,4 @@ public void testExplicitPropertyMappings() ConfigAssertions.assertFullMapping(properties, expected); } - } diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorLifecycleResource.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorLifecycleResource.java index a4f15019..9e691543 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorLifecycleResource.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorLifecycleResource.java @@ -127,9 +127,9 @@ public void setup() ImmutableMap.of("cpu", 8, "memory", 1024)); prefixSize = shortestUniquePrefix(asList( - appleSlotStatus1.getId().toString(), - appleSlotStatus2.getId().toString(), - bananaSlotStatus.getId().toString()), + appleSlotStatus1.getId().toString(), + appleSlotStatus2.getId().toString(), + bananaSlotStatus.getId().toString()), MIN_PREFIX_SIZE); provisioner.addAgents(agentStatus); @@ -255,6 +255,5 @@ private void assertOkResponse(Response response, SlotLifecycleState state, UUID. private void assertSlotState(UUID slotId, SlotLifecycleState state) { assertEquals(coordinator.getAgentByAgentId(agentId).getSlotStatus(slotId).getState(), state); - } } diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorServer.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorServer.java index 4b45cbe7..ed8a1bd5 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorServer.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorServer.java @@ -336,7 +336,6 @@ public void testCoordinatorProvision() assertEquals(coordinator.getCoordinator(instanceId).getExternalUri(), expectedCoordinatorStatus.getExternalUri()); assertEquals(coordinator.getCoordinator(instanceId).getState(), CoordinatorLifecycleState.ONLINE); - request = Request.Builder.prepareGet() .setUri(coordinatorUriBuilder().appendPath("/v1/admin/coordinator").build()) .build(); @@ -490,9 +489,9 @@ public void testGetAllSlots() AgentStatus agentStatus = coordinator.getAgentByAgentId(agentId); int prefixSize = shortestUniquePrefix(asList( - agentStatus.getSlotStatus(apple1SotId).getId().toString(), - agentStatus.getSlotStatus(apple2SlotId).getId().toString(), - agentStatus.getSlotStatus(bananaSlotId).getId().toString()), + agentStatus.getSlotStatus(apple1SotId).getId().toString(), + agentStatus.getSlotStatus(apple2SlotId).getId().toString(), + agentStatus.getSlotStatus(bananaSlotId).getId().toString()), MIN_PREFIX_SIZE); assertEqualsNoOrder(actual, ImmutableList.of( diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestFileStateManagerConfig.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestFileStateManagerConfig.java index 0b23611c..b2716c6a 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestFileStateManagerConfig.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestFileStateManagerConfig.java @@ -12,7 +12,7 @@ public class TestFileStateManagerConfig public void testDefaults() { ConfigAssertions.assertRecordedDefaults(ConfigAssertions.recordDefaults(FileStateManagerConfig.class) - .setExpectedStateDir("expected-state") + .setExpectedStateDir("expected-state") ); } @@ -28,5 +28,4 @@ public void testExplicitPropertyMappings() ConfigAssertions.assertFullMapping(properties, expected); } - } diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestGlobPredicate.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestGlobPredicate.java index 67e576cd..31081aee 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestGlobPredicate.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestGlobPredicate.java @@ -51,6 +51,5 @@ public void testGlobPredicate() assertFalse(globPredicate.apply("html")); assertFalse(globPredicate.apply("*.{txt,html}")); assertFalse(globPredicate.apply("readme.txthtml")); - } } diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestSlotFilterBuilder.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestSlotFilterBuilder.java index 86c40e4c..887476bf 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestSlotFilterBuilder.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestSlotFilterBuilder.java @@ -41,7 +41,6 @@ public class TestSlotFilterBuilder null, null); - private Predicate buildFilter(String key, String value, List uuids) { return SlotFilterBuilder.build(MockUriInfo.from("fake://localhost?" + key + "=" + value), true, uuids); @@ -207,7 +206,6 @@ public void testFullBinarySpecPredicate() assertTrue(new BinarySpecPredicate("io.airlift:sample-server:tar.gz:distribution:*").apply(status)); assertTrue(buildFilter("binary", "io.airlift:sample-server:tar.gz:distribution:*").apply(status)); - assertTrue(new BinarySpecPredicate("i*:s*:t*:d*:0*").apply(status)); assertTrue(buildFilter("binary", "i*:s*:t*:d*:0*").apply(status)); diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestStaticProvisionerConfig.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestStaticProvisionerConfig.java index f12f1952..50bb332a 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestStaticProvisionerConfig.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestStaticProvisionerConfig.java @@ -13,8 +13,8 @@ public class TestStaticProvisionerConfig public void testDefaults() { ConfigAssertions.assertRecordedDefaults(ConfigAssertions.recordDefaults(StaticProvisionerConfig.class) - .setCoordinatorsUri(URI.create("file:etc/coordinators.txt")) - .setAgentsUri(URI.create("file:etc/agents.txt")) + .setCoordinatorsUri(URI.create("file:etc/coordinators.txt")) + .setAgentsUri(URI.create("file:etc/agents.txt")) ); } @@ -32,5 +32,4 @@ public void testExplicitPropertyMappings() ConfigAssertions.assertFullMapping(properties, expected); } - } diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestingHttpRepository.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestingHttpRepository.java index 113184d2..a1a3c6cb 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestingHttpRepository.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestingHttpRepository.java @@ -15,7 +15,8 @@ import static io.airlift.airship.shared.FileUtils.deleteRecursively; import static io.airlift.airship.shared.FileUtils.newFile; -public class TestingHttpRepository extends HttpRepository +public class TestingHttpRepository + extends HttpRepository { private static final String VERSION_PATTERN = "([0-9][0-9.]*[0-9](?:-SNAPSHOT)?)[^\\/]*$"; private final File targetRepo; @@ -93,7 +94,6 @@ public static void createConfig(File dir, String artifactId, String version) "config=" + artifactId; out.write(properties.getBytes(UTF_8)); - // jvm.config out.putNextEntry(new ZipEntry("jvm.config")); diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestingMavenRepository.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestingMavenRepository.java index 9e09ba58..e52487d3 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestingMavenRepository.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestingMavenRepository.java @@ -25,7 +25,8 @@ import static io.airlift.airship.shared.MavenCoordinates.toBinaryGAV; import static io.airlift.airship.shared.MavenCoordinates.toConfigGAV; -public class TestingMavenRepository extends MavenRepository +public class TestingMavenRepository + extends MavenRepository { public static final Repository MOCK_REPO = new Repository() { @@ -224,7 +225,6 @@ public static void createConfig(File dir, String groupId, String artifactId, Str "config=" + artifactId; out.write(properties.getBytes(UTF_8)); - // jvm.config out.putNextEntry(new ZipEntry("jvm.config")); diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/auth/TestFileAuthorizedKeyStoreConfig.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/auth/TestFileAuthorizedKeyStoreConfig.java index 747419c1..7d17e5ef 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/auth/TestFileAuthorizedKeyStoreConfig.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/auth/TestFileAuthorizedKeyStoreConfig.java @@ -12,7 +12,7 @@ public class TestFileAuthorizedKeyStoreConfig public void testDefaults() { ConfigAssertions.assertRecordedDefaults(ConfigAssertions.recordDefaults(FileAuthorizedKeyStoreConfig.class) - .setAuthorizedKeysDir("authorized-keys") + .setAuthorizedKeysDir("authorized-keys") ); } @@ -28,5 +28,4 @@ public void testExplicitPropertyMappings() ConfigAssertions.assertFullMapping(properties, expected); } - } diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/auth/TestPublicKey.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/auth/TestPublicKey.java index ed0a0fe5..1d029336 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/auth/TestPublicKey.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/auth/TestPublicKey.java @@ -170,7 +170,7 @@ private static byte[] getBytes(BigInteger n) bytes = Arrays.copyOfRange(bytes, 1, 21); } while (bytes.length < 20) { - bytes = Bytes.concat(new byte[] { 0 }, bytes); + bytes = Bytes.concat(new byte[] {0}, bytes); } assertEquals(bytes.length, 20, encodeHexString(bytes)); assertEquals(new BigInteger(1, bytes), n, encodeHexString(bytes)); diff --git a/airship-coordinator/src/test/resources/io/airlift/airship/coordinator/apple-maven-metadata.xml b/airship-coordinator/src/test/resources/io/airlift/airship/coordinator/apple-maven-metadata.xml index 5ea8f1e7..2d9a11cd 100644 --- a/airship-coordinator/src/test/resources/io/airlift/airship/coordinator/apple-maven-metadata.xml +++ b/airship-coordinator/src/test/resources/io/airlift/airship/coordinator/apple-maven-metadata.xml @@ -1,19 +1,19 @@ - - food.fruit - apple - - 2.0 - 2.0 - - 3.0-SNAPSHOT - 2.0 - 1.0 - 0.9 - 0.8 - 0.7 - 0.6 - - 20110304215947 - + + food.fruit + apple + + 2.0 + 2.0 + + 3.0-SNAPSHOT + 2.0 + 1.0 + 0.9 + 0.8 + 0.7 + 0.6 + + 20110304215947 + \ No newline at end of file diff --git a/airship-coordinator/src/test/resources/io/airlift/airship/coordinator/banana-maven-metadata.xml b/airship-coordinator/src/test/resources/io/airlift/airship/coordinator/banana-maven-metadata.xml index 99d46dda..10c4f2d8 100644 --- a/airship-coordinator/src/test/resources/io/airlift/airship/coordinator/banana-maven-metadata.xml +++ b/airship-coordinator/src/test/resources/io/airlift/airship/coordinator/banana-maven-metadata.xml @@ -1,20 +1,20 @@ - food.fruit - banana - 2.0-SNAPSHOT - - - 20110311.201909 - 1 - - 20110311201909 - - - tar.gz - 2.0-20110311.201909-1 - 20110311201909 - - - + food.fruit + banana + 2.0-SNAPSHOT + + + 20110311.201909 + 1 + + 20110311201909 + + + tar.gz + 2.0-20110311.201909-1 + 20110311201909 + + + \ No newline at end of file diff --git a/airship-integration-tests/src/test/java/io/airlift/airship/integration/MockLocalProvisioner.java b/airship-integration-tests/src/test/java/io/airlift/airship/integration/MockLocalProvisioner.java index 0699b24c..a844c7a1 100644 --- a/airship-integration-tests/src/test/java/io/airlift/airship/integration/MockLocalProvisioner.java +++ b/airship-integration-tests/src/test/java/io/airlift/airship/integration/MockLocalProvisioner.java @@ -40,7 +40,8 @@ import static io.airlift.airship.shared.FileUtils.createTempDir; import static io.airlift.airship.shared.FileUtils.deleteRecursively; -public class MockLocalProvisioner implements Provisioner +public class MockLocalProvisioner + implements Provisioner { private final Map coordinators = new ConcurrentHashMap<>(); private final Map agents = new ConcurrentHashMap<>(); @@ -236,7 +237,8 @@ public static void writeResources(Map resources, File resources } } - private static class GetInstanceFunction implements Function + private static class GetInstanceFunction + implements Function { @Override public Instance apply(CoordinatorServer coordinatorServer) @@ -447,7 +449,8 @@ public static void writeResources(Map resources, File resources } } - private static class GetAgentInstanceFunction implements Function + private static class GetAgentInstanceFunction + implements Function { @Override public Instance apply(AgentServer agentServer) diff --git a/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestCliIntegration.java b/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestCliIntegration.java index b0aa43e1..288bac15 100644 --- a/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestCliIntegration.java +++ b/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestCliIntegration.java @@ -508,7 +508,8 @@ private void execute(String... args) } } - private static class MockOutputFormat implements OutputFormat + private static class MockOutputFormat + implements OutputFormat { private List coordinators; private List agents; @@ -540,7 +541,8 @@ public void displaySlots(Iterable slots) } } - private static class MockInteractiveUser implements InteractiveUser + private static class MockInteractiveUser + implements InteractiveUser { private boolean answer; diff --git a/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestServerIntegration.java b/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestServerIntegration.java index 4e4102a9..5a84b244 100644 --- a/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestServerIntegration.java +++ b/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestServerIntegration.java @@ -332,7 +332,6 @@ public void testCoordinatorProvision() assertEquals(coordinator.getCoordinator(instanceId).getExternalUri(), coordinatorServer.getInstance().getExternalUri()); assertEquals(coordinator.getCoordinator(instanceId).getState(), CoordinatorLifecycleState.ONLINE); - request = Request.Builder.prepareGet() .setUri(coordinatorUriBuilder().appendPath("/v1/admin/coordinator").build()) .build(); @@ -595,7 +594,6 @@ public void testStop() assertEquals(bananaSlot.status().getState(), RUNNING); } - @Test public void testKill() throws Exception @@ -623,7 +621,6 @@ public void testKill() assertEquals(bananaSlot.status().getState(), RUNNING); } - @Test public void testShow() throws Exception diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/AgentStatus.java b/airship-shared/src/main/java/io/airlift/airship/shared/AgentStatus.java index 2d10f06a..2f9a0b41 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/AgentStatus.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/AgentStatus.java @@ -93,10 +93,11 @@ public AgentStatus changeState(AgentLifecycleState state) public AgentStatus changeSlotStatus(SlotStatus slotStatus) { - Map slots = newHashMap(this.slots); + Map slots = newHashMap(this.slots); if (slotStatus.getState() != TERMINATED) { slots.put(slotStatus.getId(), slotStatus); - } else { + } + else { slots.remove(slotStatus.getId()); } return new AgentStatus(agentId, state, instanceId, internalUri, externalUri, location, instanceType, slots.values(), resources); @@ -104,7 +105,7 @@ public AgentStatus changeSlotStatus(SlotStatus slotStatus) public AgentStatus changeAllSlotsState(SlotLifecycleState slotState) { - Map slots = newHashMap(this.slots); + Map slots = newHashMap(this.slots); for (SlotStatus slotStatus : slots.values()) { // set all slots to unknown state slots.put(slotStatus.getId(), slotStatus.changeState(slotState)); diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/AgentStatusRepresentation.java b/airship-shared/src/main/java/io/airlift/airship/shared/AgentStatusRepresentation.java index 9016a387..3313f146 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/AgentStatusRepresentation.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/AgentStatusRepresentation.java @@ -26,7 +26,8 @@ public class AgentStatusRepresentation { - public static class AgentStatusRepresentationFactory { + public static class AgentStatusRepresentationFactory + { public static final int MIN_PREFIX_SIZE = 4; public static final int MIN_LOCATION_SEGMENTS = 2; @@ -53,7 +54,8 @@ public AgentStatusRepresentationFactory(int shortIdPrefixSize, int commonLocatio this.repository = repository; } - public AgentStatusRepresentation create(AgentStatus status) { + public AgentStatusRepresentation create(AgentStatus status) + { Builder builder = ImmutableList.builder(); for (SlotStatus slot : status.getSlotStatuses()) { builder.add(SlotStatusRepresentation.from(slot, Integer.MAX_VALUE, repository)); @@ -103,7 +105,8 @@ public AgentStatusRepresentation apply(AgentStatus status) }; } - public static AgentStatusRepresentation from(AgentStatus status) { + public static AgentStatusRepresentation from(AgentStatus status) + { return new AgentStatusRepresentationFactory().create(status); } @@ -219,7 +222,8 @@ public String getVersion() return version; } - public String getInternalHost() { + public String getInternalHost() + { if (self == null) { return null; } @@ -245,7 +249,8 @@ public String getInternalIp() } } - public String getExternalHost() { + public String getExternalHost() + { if (externalUri == null) { return null; } diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorStatus.java b/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorStatus.java index a959d2d4..e81a1b16 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorStatus.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorStatus.java @@ -46,7 +46,7 @@ public CoordinatorLifecycleState getState() { return state; } - + public CoordinatorStatus changeState(CoordinatorLifecycleState state) { return new CoordinatorStatus(coordinatorId, state, instanceId, internalUri, externalUri, location, instanceType); @@ -112,7 +112,6 @@ public int hashCode() return coordinatorId.hashCode(); } - @Override public String toString() { diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorStatusRepresentation.java b/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorStatusRepresentation.java index 58726cc8..457d3721 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorStatusRepresentation.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorStatusRepresentation.java @@ -21,7 +21,8 @@ public class CoordinatorStatusRepresentation { - public static class CoordinatorStatusRepresentationFactory { + public static class CoordinatorStatusRepresentationFactory + { public static final int MIN_PREFIX_SIZE = 4; public static final int MIN_LOCATION_SEGMENTS = 2; @@ -45,7 +46,8 @@ public CoordinatorStatusRepresentationFactory(int shortIdPrefixSize, int commonL this.commonLocationParts = commonLocationParts; } - public CoordinatorStatusRepresentation create(CoordinatorStatus status) { + public CoordinatorStatusRepresentation create(CoordinatorStatus status) + { return new CoordinatorStatusRepresentation( status.getCoordinatorId(), safeTruncate(status.getCoordinatorId(), shortIdPrefixSize), diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/DigestUtils.java b/airship-shared/src/main/java/io/airlift/airship/shared/DigestUtils.java index a5254cf5..2699dc7b 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/DigestUtils.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/DigestUtils.java @@ -20,7 +20,8 @@ public static String md5Hex(String data) } } - public static String toHex(byte[] data) { + public static String toHex(byte[] data) + { char[] chars = new char[data.length * 2]; int charIndex = 0; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/HttpUriBuilder.java b/airship-shared/src/main/java/io/airlift/airship/shared/HttpUriBuilder.java index 82b937fe..64ee25f6 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/HttpUriBuilder.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/HttpUriBuilder.java @@ -31,9 +31,9 @@ public class HttpUriBuilder private ListMultimap params = LinkedListMultimap.create(); // decoded query params private static byte[] PCHAR = { - 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z', - 'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z', - '0','1','2','3','4','5','6','7','8','9', + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '.', '_', '~', '!', '$', '\'', '(', ')', '*', '+', ',', ';', '=', ':', '@', }; @@ -86,7 +86,7 @@ public HttpUriBuilder port(int port) this.port = port; return this; } - + public HttpUriBuilder defaultPort() { this.port = -1; @@ -110,7 +110,7 @@ public HttpUriBuilder replacePath(String path) /** * Append an unencoded path. - * + *

* All reserved characters except '/' will be percent-encoded. '/' are considered as path separators and * appended verbatim. */ diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/InstallationUtils.java b/airship-shared/src/main/java/io/airlift/airship/shared/InstallationUtils.java index c8229f68..287fcb80 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/InstallationUtils.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/InstallationUtils.java @@ -21,7 +21,6 @@ public static Installation toInstallation(Repository repository, Assignment assi { assignment = resolveAssignment(repository, assignment); - // load resources Map resources = readResources(repository, assignment); diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/MavenCoordinates.java b/airship-shared/src/main/java/io/airlift/airship/shared/MavenCoordinates.java index 37678444..82ec1648 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/MavenCoordinates.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/MavenCoordinates.java @@ -63,12 +63,15 @@ private static MavenCoordinates fromGAV(String coordinates, String defaultPackag List parts = ImmutableList.copyOf(Splitter.on(':').split(coordinates)); if (parts.size() == 5) { return new MavenCoordinates(parts.get(0), parts.get(1), parts.get(4), parts.get(2), parts.get(3), null); - } else if (parts.size() == 4) { + } + else if (parts.size() == 4) { return new MavenCoordinates(parts.get(0), parts.get(1), parts.get(3), parts.get(2), null, null); - } else if (defaultPackaging != null) { + } + else if (defaultPackaging != null) { if (parts.size() == 3) { return new MavenCoordinates(parts.get(0), parts.get(1), parts.get(2), defaultPackaging, null, null); - } else if (parts.size() == 2) { + } + else if (parts.size() == 2) { return new MavenCoordinates(null, parts.get(0), parts.get(1), defaultPackaging, null, null); } } @@ -108,7 +111,8 @@ public String toGAV(@Nullable String defaultPackaging, boolean showFullVersion) else { if (fileVersion != null) { sb.append(fileVersion); - } else { + } + else { sb.append(version); } } @@ -116,8 +120,6 @@ public String toGAV(@Nullable String defaultPackaging, boolean showFullVersion) return sb.toString(); } - - private final String groupId; private final String artifactId; private final String packaging; @@ -168,7 +170,8 @@ public String getFileVersion() { if (fileVersion != null) { return fileVersion; - } else { + } + else { return version; } } diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/Repository.java b/airship-shared/src/main/java/io/airlift/airship/shared/Repository.java index 5457ab25..2211b40d 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/Repository.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/Repository.java @@ -7,14 +7,22 @@ public interface Repository String configShortName(String config); String configRelativize(String config); + String configResolve(String config); + String configUpgrade(String config, String version); + boolean configEqualsIgnoreVersion(String config1, String config2); + URI configToHttpUri(String config); String binaryRelativize(String config); + String binaryResolve(String binary); + String binaryUpgrade(String binary, String version); + boolean binaryEqualsIgnoreVersion(String binary1, String binary2); + URI binaryToHttpUri(String binary); } diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/RepositorySet.java b/airship-shared/src/main/java/io/airlift/airship/shared/RepositorySet.java index e225a208..0afc9282 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/RepositorySet.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/RepositorySet.java @@ -10,7 +10,8 @@ import static com.google.common.collect.Sets.newTreeSet; -public class RepositorySet implements Repository +public class RepositorySet + implements Repository { private final Set repositories; @@ -48,7 +49,7 @@ public String configRelativize(String config) relativeConfigs.add(relativeConfig); } } - + // if we end up with more than one form for the relative config, just return the absolute config if (relativeConfigs.size() != 1) { return config; @@ -78,7 +79,6 @@ public String configResolve(String config) return configs.iterator().next(); } - @Override public String configUpgrade(String config, String version) { diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/SlotLifecycleState.java b/airship-shared/src/main/java/io/airlift/airship/shared/SlotLifecycleState.java index 223963cf..a51dbffa 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/SlotLifecycleState.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/SlotLifecycleState.java @@ -41,7 +41,8 @@ public enum SlotLifecycleState byName = builder.build(); } - public static SlotLifecycleState lookup(String name) { + public static SlotLifecycleState lookup(String name) + { Preconditions.checkNotNull(name, "name is null"); return byName.get(name.toLowerCase()); } @@ -53,5 +54,4 @@ public static SlotLifecycleState lookup(String name) { this.shortName = shortName; } - } diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/SlotStatus.java b/airship-shared/src/main/java/io/airlift/airship/shared/SlotStatus.java index 478eb4c1..485ca0df 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/SlotStatus.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/SlotStatus.java @@ -112,7 +112,6 @@ private SlotStatus(UUID id, this.resources = ImmutableMap.copyOf(resources); } - public UUID getId() { return id; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/SlotStatusRepresentation.java b/airship-shared/src/main/java/io/airlift/airship/shared/SlotStatusRepresentation.java index 33a3e9a5..5ea9ea6e 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/SlotStatusRepresentation.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/SlotStatusRepresentation.java @@ -37,7 +37,8 @@ public class SlotStatusRepresentation { - public static class SlotStatusRepresentationFactory { + public static class SlotStatusRepresentationFactory + { public static final int MIN_PREFIX_SIZE = 4; public static final int MIN_LOCATION_SEGMENTS = 2; @@ -64,7 +65,8 @@ public SlotStatusRepresentationFactory(int shortIdPrefixSize, int commonLocation this.repository = repository; } - public SlotStatusRepresentation create(SlotStatus status) { + public SlotStatusRepresentation create(SlotStatus status) + { String binary = null; String config = null; String shortBinary = null; @@ -75,11 +77,11 @@ public SlotStatusRepresentation create(SlotStatus status) { if (repository != null) { shortBinary = Objects.firstNonNull(repository.binaryRelativize(binary), binary); shortConfig = Objects.firstNonNull(repository.configRelativize(config), config); - } else { + } + else { shortBinary = binary; shortConfig = config; } - } String expectedBinary = null; @@ -152,7 +154,8 @@ public SlotStatusRepresentation apply(SlotStatus status) }; } - public static SlotStatusRepresentation from(SlotStatus status) { + public static SlotStatusRepresentation from(SlotStatus status) + { return new SlotStatusRepresentationFactory().create(status); } @@ -168,11 +171,11 @@ public static SlotStatusRepresentation from(SlotStatus slotStatus, int shortIdPr if (repository != null) { shortBinary = Objects.firstNonNull(repository.binaryRelativize(binary), binary); shortConfig = Objects.firstNonNull(repository.configRelativize(config), config); - } else { + } + else { shortBinary = binary; shortConfig = config; } - } String expectedBinary = null; @@ -402,14 +405,16 @@ public SlotStatus toSlotStatus(String instanceId) statusMessage); } - public String getExternalHost() { + public String getExternalHost() + { if (externalUri == null) { return null; } return externalUri.getHost(); } - public String getInternalHost() { + public String getInternalHost() + { if (self == null) { return null; } diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/VersionConflictException.java b/airship-shared/src/main/java/io/airlift/airship/shared/VersionConflictException.java index 7fc475a1..125c9103 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/VersionConflictException.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/VersionConflictException.java @@ -1,6 +1,7 @@ package io.airlift.airship.shared; -public class VersionConflictException extends RuntimeException +public class VersionConflictException + extends RuntimeException { private final String name; private final String version; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/VersionConflictExceptionMapper.java b/airship-shared/src/main/java/io/airlift/airship/shared/VersionConflictExceptionMapper.java index ac48e63a..d74fd2c6 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/VersionConflictExceptionMapper.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/VersionConflictExceptionMapper.java @@ -4,7 +4,8 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.ext.ExceptionMapper; -public class VersionConflictExceptionMapper implements ExceptionMapper +public class VersionConflictExceptionMapper + implements ExceptionMapper { @Override public Response toResponse(VersionConflictException exception) diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/VersionsUtil.java b/airship-shared/src/main/java/io/airlift/airship/shared/VersionsUtil.java index 4904cfd6..db90e6b4 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/VersionsUtil.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/VersionsUtil.java @@ -117,7 +117,7 @@ public static String createAgentVersion(String agentId, AgentLifecycleState stat String data = Joiner.on("||").useForNull("--NULL--").join(parts); return DigestUtils.md5Hex(data); } - + public static String createAgentsVersion(Iterable agents) { Preconditions.checkNotNull(agents, "agents is null"); diff --git a/airship-shared/src/test/java/io/airlift/airship/shared/ArchiveHelper.java b/airship-shared/src/test/java/io/airlift/airship/shared/ArchiveHelper.java index 5a683c3c..4587301a 100644 --- a/airship-shared/src/test/java/io/airlift/airship/shared/ArchiveHelper.java +++ b/airship-shared/src/test/java/io/airlift/airship/shared/ArchiveHelper.java @@ -31,9 +31,9 @@ public static void createArchive(File archive) // tar up the archive createTar(tempDir, archive); - } finally { + } + finally { FileUtils.deleteRecursively(tempDir); } - } } diff --git a/airship-shared/src/test/java/io/airlift/airship/shared/MockUriInfo.java b/airship-shared/src/test/java/io/airlift/airship/shared/MockUriInfo.java index 75a92d3d..17af277c 100644 --- a/airship-shared/src/test/java/io/airlift/airship/shared/MockUriInfo.java +++ b/airship-shared/src/test/java/io/airlift/airship/shared/MockUriInfo.java @@ -37,7 +37,8 @@ import static io.airlift.airship.shared.MockUriInfo.GuavaMultivaluedMap.createGuavaMultivaluedMap; import static io.airlift.airship.shared.MockUriInfo.GuavaMultivaluedMap.emptyMultivaluedMap; -public class MockUriInfo implements UriInfo +public class MockUriInfo + implements UriInfo { private static final Splitter PATH_SPLITTER = Splitter.on('/'); private static final Splitter QUERY_STRING_SPLITTER = Splitter.on('&').trimResults().omitEmptyStrings(); @@ -47,7 +48,6 @@ public class MockUriInfo implements UriInfo private final URI requestUri; private final URI baseUri; - public static UriInfo from(String requestUri) { return new MockUriInfo(URI.create(requestUri)); @@ -202,8 +202,9 @@ public List getMatchedResources() throw new UnsupportedOperationException(); } - - static class GuavaMultivaluedMap extends ForwardingMap> implements MultivaluedMap + static class GuavaMultivaluedMap + extends ForwardingMap> + implements MultivaluedMap { private final ListMultimap multimap; @@ -250,7 +251,8 @@ public V getFirst(K key) } } - private static class ImmutablePathSegment implements PathSegment + private static class ImmutablePathSegment + implements PathSegment { private final String path; diff --git a/airship-shared/src/test/java/io/airlift/airship/shared/TestHttpUriBuilder.java b/airship-shared/src/test/java/io/airlift/airship/shared/TestHttpUriBuilder.java index a9d21fa5..57a44114 100644 --- a/airship-shared/src/test/java/io/airlift/airship/shared/TestHttpUriBuilder.java +++ b/airship-shared/src/test/java/io/airlift/airship/shared/TestHttpUriBuilder.java @@ -28,7 +28,6 @@ public void testBasic() assertEquals(uri.toASCIIString(), "http://www.example.com"); } - @Test public void testWithPath() { @@ -138,7 +137,7 @@ public void testFull() .replacePath("/a/b/c") .replaceParameter("k", "1") .build(); - + assertEquals(uri.toASCIIString(), "http://www.example.com:8081/a/b/c?k=1"); } @@ -262,7 +261,6 @@ public void testEncodesPath() assertEquals(uri.toASCIIString(), "http://www.example.com/%60%23%25%5E%7B%7D%7C%5B%5D%3C%3E%3F%C3%A1%C3%A9%C3%AD%C3%B3%C3%BA"); } - @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = ".*scheme.*") public void testVerifiesSchemeIsSet() { @@ -285,14 +283,14 @@ public void testQueryParametersNoPath() public void testEncodesQueryParameters() { URI uri = uriBuilder() - .scheme("http") - .host("www.example.com") - .replaceParameter("a", "&") - .build(); + .scheme("http") + .host("www.example.com") + .replaceParameter("a", "&") + .build(); assertEquals(uri.toASCIIString(), "http://www.example.com/?a=%26"); } - + @Test public void testAcceptsHttpAndHttpScheme() { @@ -301,5 +299,4 @@ public void testAcceptsHttpAndHttpScheme() uriBuilderFrom(URI.create("HTTP://example.com")); uriBuilderFrom(URI.create("HTTPS://example.com")); } - } diff --git a/airship-shared/src/test/java/io/airlift/airship/shared/TestMavenCoordinates.java b/airship-shared/src/test/java/io/airlift/airship/shared/TestMavenCoordinates.java index a132aef7..6c890691 100644 --- a/airship-shared/src/test/java/io/airlift/airship/shared/TestMavenCoordinates.java +++ b/airship-shared/src/test/java/io/airlift/airship/shared/TestMavenCoordinates.java @@ -29,7 +29,6 @@ public void resolvedCoordinates() Assert.assertFalse(spec.equalsIgnoreVersion(new MavenCoordinates("my.groupId", "foo", "version", "packaging", "classifier", "file-version"))); Assert.assertFalse(spec.equalsIgnoreVersion(new MavenCoordinates("my.groupId", "artifactId", "version", "foo", "classifier", "file-version"))); Assert.assertFalse(spec.equalsIgnoreVersion(new MavenCoordinates("my.groupId", "artifactId", "version", "packaging", "foo", "file-version"))); - } @Test @@ -110,5 +109,4 @@ public void testEquivalence() new MavenCoordinates("my.group", "artifactId", "version", "packaging", "classifier", null)) .check(); } - } diff --git a/airship-shared/src/test/java/io/airlift/airship/shared/TestStrings.java b/airship-shared/src/test/java/io/airlift/airship/shared/TestStrings.java index 57547a03..d0ba8ff8 100644 --- a/airship-shared/src/test/java/io/airlift/airship/shared/TestStrings.java +++ b/airship-shared/src/test/java/io/airlift/airship/shared/TestStrings.java @@ -60,7 +60,8 @@ public void testCommonSegmentWithMin() } @Test - public void testTrim() { + public void testTrim() + { assertEquals(trimLeadingSegments("/a/b/c", '/', 0), "/a/b/c"); assertEquals(trimLeadingSegments("/a/b/c", '/', 1), "/b/c"); assertEquals(trimLeadingSegments("/a/b/c", '/', 2), "/c"); @@ -100,5 +101,4 @@ public void testDuplicateStrings3() { shortestUniquePrefix(of("aa", "aaa", "aa", "aa")); } - } diff --git a/airship-shared/src/test/resources/agent-status.json b/airship-shared/src/test/resources/agent-status.json index c5e6eb08..aa7ee1dd 100644 --- a/airship-shared/src/test/resources/agent-status.json +++ b/airship-shared/src/test/resources/agent-status.json @@ -1,52 +1,52 @@ { - "agentId":"44444444-4444-4444-4444-444444444444", - "shortAgentId":"4444", - "instanceId":"instanceId", - "state":"ONLINE", - "instanceType":"instance.type", - "location":"/test/unknown/location", - "shortLocation":"/unknown/location", - "slots":[ + "agentId": "44444444-4444-4444-4444-444444444444", + "shortAgentId": "4444", + "instanceId": "instanceId", + "state": "ONLINE", + "instanceType": "instance.type", + "location": "/test/unknown/location", + "shortLocation": "/unknown/location", + "slots": [ { - "id":"aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", - "name":"slot1", - "self":"internal://apple", - "externalUri":"external://apple", - "instanceId":"instance", - "location":"/test/location/apple", - "shortLocation":"/location/apple", - "installPath":"/apple", - "binary":"food.fruit:apple:1.0", - "shortBinary":"food.fruit:apple:1.0", - "config":"@prod:apple:1.0", - "shortConfig":"@prod:apple:1.0", - "status":"STOPPED", - "resources":{}, - "version":"abc" + "id": "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", + "name": "slot1", + "self": "internal://apple", + "externalUri": "external://apple", + "instanceId": "instance", + "location": "/test/location/apple", + "shortLocation": "/location/apple", + "installPath": "/apple", + "binary": "food.fruit:apple:1.0", + "shortBinary": "food.fruit:apple:1.0", + "config": "@prod:apple:1.0", + "shortConfig": "@prod:apple:1.0", + "status": "STOPPED", + "resources": {}, + "version": "abc" }, { - "id":"bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb", - "name":"slot2", - "self":"internal://banana", - "externalUri":"external://banana", - "instanceId":"instance", - "location":"/test/location/banana", - "shortLocation":"/location/banana", - "installPath":"/banana", - "binary":"food.fruit:banana:2.0-SNAPSHOT", - "shortBinary":"food.fruit:banana:2.0-SNAPSHOT", - "config":"@prod:banana:2.0-SNAPSHOT", - "shortConfig":"@prod:banana:2.0-SNAPSHOT", - "status":"STOPPED", - "resources":{}, - "version":"abc" + "id": "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb", + "name": "slot2", + "self": "internal://banana", + "externalUri": "external://banana", + "instanceId": "instance", + "location": "/test/location/banana", + "shortLocation": "/location/banana", + "installPath": "/banana", + "binary": "food.fruit:banana:2.0-SNAPSHOT", + "shortBinary": "food.fruit:banana:2.0-SNAPSHOT", + "config": "@prod:banana:2.0-SNAPSHOT", + "shortConfig": "@prod:banana:2.0-SNAPSHOT", + "status": "STOPPED", + "resources": {}, + "version": "abc" } ], - "resources":{ - "cpu":8, - "memory":1024 + "resources": { + "cpu": 8, + "memory": 1024 }, - "self":"internal://agent", - "externalUri":"external://agent", - "version":"agent-version" + "self": "internal://agent", + "externalUri": "external://agent", + "version": "agent-version" } diff --git a/airship-shared/src/test/resources/slot-status.json b/airship-shared/src/test/resources/slot-status.json index f4264821..c51abcbf 100644 --- a/airship-shared/src/test/resources/slot-status.json +++ b/airship-shared/src/test/resources/slot-status.json @@ -1,22 +1,22 @@ { - "id":"aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", + "id": "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", "shortId": "aaaaa", - "self":"internal://apple", - "externalUri":"external://apple", - "instanceId":"instance", - "location":"/test/location/apple", - "shortLocation":"/location/apple", - "binary":"food.fruit:apple:1.0", - "shortBinary":"food.fruit:apple:1.0", - "config":"@prod:apple:1.0", - "shortConfig":"@prod:apple:1.0", - "status":"STOPPED", - "version":"abc", + "self": "internal://apple", + "externalUri": "external://apple", + "instanceId": "instance", + "location": "/test/location/apple", + "shortLocation": "/location/apple", + "binary": "food.fruit:apple:1.0", + "shortBinary": "food.fruit:apple:1.0", + "config": "@prod:apple:1.0", + "shortConfig": "@prod:apple:1.0", + "status": "STOPPED", + "version": "abc", "installPath": "/apple", "resources": { "memory": 512 }, - "expectedBinary":"food.fruit:apple:1.0", - "expectedConfig":"@prod:apple:1.0", - "expectedStatus":"STOPPED" + "expectedBinary": "food.fruit:apple:1.0", + "expectedConfig": "@prod:apple:1.0", + "expectedStatus": "STOPPED" }