diff options
author | Valerij Fredriksen <valerijf@oath.com> | 2018-01-17 13:55:36 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@oath.com> | 2018-01-17 13:55:36 +0100 |
commit | e421b70c60a25ffd6081dc1667bb33aedbf487ca (patch) | |
tree | cfcabb8997f515d5f95c1addf8a6b8ba97bb07f3 /node-maintainer | |
parent | c856a11ec8904d654fba73ada0f3f4de02cf8004 (diff) |
Weaken declarationa access
Diffstat (limited to 'node-maintainer')
10 files changed, 42 insertions, 42 deletions
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/IPAddressVerifier.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/IPAddressVerifier.java index 804da219140..496bf47bd7c 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/IPAddressVerifier.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/IPAddressVerifier.java @@ -81,7 +81,7 @@ public class IPAddressVerifier { return false; } - protected String reverseLookUp(String ipAddress) throws NamingException { + String reverseLookUp(String ipAddress) throws NamingException { Hashtable<String, String> env = new Hashtable<>(); env.put("java.naming.factory.initial", "com.sun.jndi.dns.DnsContextFactory"); DirContext ctx = new InitialDirContext(env); @@ -99,7 +99,7 @@ public class IPAddressVerifier { return ""; } - protected String convertIpv6ToLookupFormat(String ipAddress) { + String convertIpv6ToLookupFormat(String ipAddress) { StringBuilder newIpAddress = new StringBuilder(); String doubleColonReplacement = "0.0.0.0.0.0.0.0.0.0.0.0."; String domain = "ip6.arpa"; @@ -119,7 +119,7 @@ public class IPAddressVerifier { return newIpAddress.toString(); } - protected String convertIpv4ToLookupFormat(String ipAddress) { + String convertIpv4ToLookupFormat(String ipAddress) { String domain = "in-addr.arpa"; String[] octets = ipAddress.split("\\."); StringBuilder convertedIpAddress = new StringBuilder(); diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/CPUBenchmark.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/CPUBenchmark.java index a55a92ba8a3..57763177a5b 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/CPUBenchmark.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/CPUBenchmark.java @@ -48,21 +48,21 @@ public class CPUBenchmark implements Benchmark { } } - protected List<ParseResult> parseCpuCyclesPerSec(List<String> commandOutput) { + List<ParseResult> parseCpuCyclesPerSec(List<String> commandOutput) { List<String> searchWords = new ArrayList<>(Arrays.asList(CYCLES_SEARCH_WORD, SECONDS_SEARCH_WORD)); ParseInstructions parseInstructions = new ParseInstructions(SEARCH_ELEMENT_INDEX, RETURN_ELEMENT_INDEX, SPLIT_REGEX_STRING, searchWords); return OutputParser.parseOutput(parseInstructions, commandOutput); } - protected void setCpuCyclesPerSec(List<ParseResult> parseResults) { + void setCpuCyclesPerSec(List<ParseResult> parseResults) { double cpuCyclesPerSec = getCyclesPerSecond(parseResults); if (cpuCyclesPerSec > 0) { benchmarkResults.setCpuCyclesPerSec(cpuCyclesPerSec); } } - protected double getCyclesPerSecond(List<ParseResult> parseResults) { + private double getCyclesPerSecond(List<ParseResult> parseResults) { double cycles = -1; double seconds = -1; for (ParseResult parseResult : parseResults) { @@ -83,7 +83,7 @@ public class CPUBenchmark implements Benchmark { return -1; } - protected double makeCyclesDouble(String cycles) { + double makeCyclesDouble(String cycles) { cycles = cycles.replaceAll("[^\\d]", ""); if (checkIfNumber(cycles)) { return Double.parseDouble(cycles); @@ -91,7 +91,7 @@ public class CPUBenchmark implements Benchmark { return -1; } - protected double makeSecondsDouble(String seconds) { + double makeSecondsDouble(String seconds) { seconds = seconds.replaceAll(",", "."); if (checkIfNumber(seconds)) { return Double.parseDouble(seconds); @@ -99,7 +99,7 @@ public class CPUBenchmark implements Benchmark { return -1; } - protected boolean checkIfNumber(String numberCandidate) { + boolean checkIfNumber(String numberCandidate) { if (numberCandidate == null || numberCandidate.equals("")) { return false; } @@ -111,7 +111,7 @@ public class CPUBenchmark implements Benchmark { return true; } - protected double convertToGHz(double cycles, double seconds) { + double convertToGHz(double cycles, double seconds) { double giga = 1000000000.0; return (cycles / seconds) / giga; } diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/DiskBenchmark.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/DiskBenchmark.java index 39a6f66460b..7d2082f5027 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/DiskBenchmark.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/DiskBenchmark.java @@ -49,18 +49,18 @@ public class DiskBenchmark implements Benchmark { } } - protected ParseResult parseDiskSpeed(List<String> commandOutput) { + ParseResult parseDiskSpeed(List<String> commandOutput) { List<String> searchWords = new ArrayList<>(Arrays.asList(KILO_BYTE_SEARCH_WORD, MEGA_BYTE_SEARCH_WORD, GIGA_BYTE_SEARCH_WORD)); ParseInstructions parseInstructions = new ParseInstructions(SEARCH_ELEMENT_INDEX, RETURN_ELEMENT_INDEX, SPLIT_REGEX_STRING, searchWords); return OutputParser.parseSingleOutput(parseInstructions, commandOutput); } - protected void setDiskSpeed(ParseResult parseResult) { + void setDiskSpeed(ParseResult parseResult) { double diskSpeedMBs = getDiskSpeedInMBs(parseResult); benchmarkResults.setDiskSpeedMbs(diskSpeedMBs); } - protected double getDiskSpeedInMBs(ParseResult parseResult) { + double getDiskSpeedInMBs(ParseResult parseResult) { double diskSpeedMBs = 0; double convertKBsToMBs = 1 / 1000.0; double convertGBsToMBs = 1000.0; @@ -85,7 +85,7 @@ public class DiskBenchmark implements Benchmark { return diskSpeedMBs; } - protected boolean checkSpeedValidity(String speed) { + boolean checkSpeedValidity(String speed) { try { Double.parseDouble(speed); } catch (NullPointerException | NumberFormatException e) { @@ -94,7 +94,7 @@ public class DiskBenchmark implements Benchmark { return true; } - protected Double convertToMBs(String speed, double numberToConvert) { + Double convertToMBs(String speed, double numberToConvert) { double speedMbs = Double.parseDouble(speed); return speedMbs * numberToConvert; } diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifier.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifier.java index c07cefb4405..627477def0f 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifier.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifier.java @@ -28,19 +28,19 @@ import java.util.Optional; public class SpecVerifier extends Main.VerifierCommand { @Option(name = {"-d", "--disk"}, required = true, description = "Expected disk size in GB") - protected double diskAvailableGb; + private double diskAvailableGb; @Option(name = {"-m", "--memory"}, required = true, description = "Expected main memory size in GB") - protected double mainMemoryAvailableGb; + private double mainMemoryAvailableGb; @Option(name = {"-c", "--cpu_cores"}, required = true, description = "Expected number of CPU cores") - protected double cpuCores; + private double cpuCores; @Option(name = {"-s", "--is_ssd"}, required = true, description = "Set to true if disk is SSD", allowedValues = {"true", "false"}) - protected String fastDisk; + private String fastDisk; @Option(name = {"-i", "--ips"}, description = "Comma separated list of IP addresses assigned to this node") - protected String ipAddresses; + private String ipAddresses; @Override public void run(HardwareDivergenceReport hardwareDivergenceReport, CommandExecutor commandExecutor) { diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/CPURetriever.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/CPURetriever.java index f3ebe68a7f8..6416babb79b 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/CPURetriever.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/CPURetriever.java @@ -45,7 +45,7 @@ public class CPURetriever implements HardwareRetriever { } } - protected List<ParseResult> parseCPUInfoFile(List<String> commandOutput) { + List<ParseResult> parseCPUInfoFile(List<String> commandOutput) { List<String> searchWords = Collections.singletonList(SEARCH_WORD); ParseInstructions parseInstructions = new ParseInstructions(SEARCH_ELEMENT_INDEX, RETURN_ELEMENT_INDEX, REGEX_SPLIT, searchWords); return OutputParser.parseOutput(parseInstructions, commandOutput); @@ -55,7 +55,7 @@ public class CPURetriever implements HardwareRetriever { hardwareInfo.setMinCpuCores(countCpuCores(parseResults)); } - protected int countCpuCores(List<ParseResult> parseResults) { + private int countCpuCores(List<ParseResult> parseResults) { return parseResults.size(); } diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/DiskRetriever.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/DiskRetriever.java index 810368627f2..3ac863082fe 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/DiskRetriever.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/DiskRetriever.java @@ -47,7 +47,7 @@ public class DiskRetriever implements HardwareRetriever { updateDiskSize(); } - protected void updateDiskType() { + void updateDiskType() { try { List<String> commandOutput = commandExecutor.executeCommand(DISK_CHECK_TYPE); ParseResult parseResult = parseDiskType(commandOutput); @@ -57,7 +57,7 @@ public class DiskRetriever implements HardwareRetriever { } } - protected void updateDiskSize() { + void updateDiskSize() { try { List<String> commandOutput = commandExecutor.executeCommand(DISK_CHECK_SIZE); List<ParseResult> parseResult = parseDiskSize(commandOutput); @@ -67,7 +67,7 @@ public class DiskRetriever implements HardwareRetriever { } } - protected ParseResult parseDiskType(List<String> commandOutput) throws IOException { + ParseResult parseDiskType(List<String> commandOutput) throws IOException { List<String> searchWords = Collections.singletonList(DISK_NAME); ParseInstructions parseInstructions = new ParseInstructions(DISK_TYPE_SEARCH_ELEMENT_INDEX, DISK_TYPE_RETURN_ELEMENT_INDEX, DISK_TYPE_REGEX_SPLIT, searchWords); ParseResult parseResult = OutputParser.parseSingleOutput(parseInstructions, commandOutput); @@ -77,7 +77,7 @@ public class DiskRetriever implements HardwareRetriever { return parseResult; } - protected void setDiskType(ParseResult parseResult) { + void setDiskType(ParseResult parseResult) { hardwareInfo.setDiskType(DiskType.UNKNOWN); String fastDiskSymbol = "0"; String nonFastDiskSymbol = "1"; @@ -88,13 +88,13 @@ public class DiskRetriever implements HardwareRetriever { } } - protected List<ParseResult> parseDiskSize(List<String> commandOutput) { + List<ParseResult> parseDiskSize(List<String> commandOutput) { List<String> searchWords = Collections.singletonList(DISK_SIZE_SEARCH_WORD); ParseInstructions parseInstructions = new ParseInstructions(DISK_SIZE_SEARCH_ELEMENT_INDEX, DISK_SIZE_RETURN_ELEMENT_INDEX, DISK_SIZE_REGEX_SPLIT, searchWords); return OutputParser.parseOutput(parseInstructions, commandOutput); } - protected void setDiskSize(List<ParseResult> parseResults) { + private void setDiskSize(List<ParseResult> parseResults) { double diskSize = 0; try { for (ParseResult parseResult : parseResults) { diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/HardwareRetriever.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/HardwareRetriever.java index d77342db982..fe02262e80f 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/HardwareRetriever.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/HardwareRetriever.java @@ -5,7 +5,7 @@ package com.yahoo.vespa.hosted.node.verification.spec.retrievers; * @author olaaun * @author sgrostad */ -public interface HardwareRetriever { +interface HardwareRetriever { /** * Should retrieve spec from some part of the hardware, and store the result in hardwareinfo instance passed to class diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/MemoryRetriever.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/MemoryRetriever.java index 015b274801b..ae3c928a0a5 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/MemoryRetriever.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/MemoryRetriever.java @@ -45,7 +45,7 @@ public class MemoryRetriever implements HardwareRetriever { } } - protected ParseResult parseMemInfoFile(List<String> commandOutput) throws IOException { + ParseResult parseMemInfoFile(List<String> commandOutput) throws IOException { List<String> searchWords = Collections.singletonList(SEARCH_WORD); ParseInstructions parseInstructions = new ParseInstructions(SEARCH_ELEMENT_INDEX, RETURN_ELEMENT_INDEX, REGEX_SPLIT, searchWords); ParseResult parseResult = OutputParser.parseSingleOutput(parseInstructions, commandOutput); @@ -55,12 +55,12 @@ public class MemoryRetriever implements HardwareRetriever { return parseResult; } - protected void updateMemoryInfo(ParseResult parseResult) { + void updateMemoryInfo(ParseResult parseResult) { double memory = convertKBToGB(parseResult.getValue()); hardwareInfo.setMinMainMemoryAvailableGb(memory); } - protected double convertKBToGB(String totMem) { + double convertKBToGB(String totMem) { String[] split = totMem.split(" "); double value = Double.parseDouble(split[0]); double kiloToGiga = 1000000.0; diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/NetRetriever.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/NetRetriever.java index 3bea3da73fc..be933841688 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/NetRetriever.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/NetRetriever.java @@ -64,7 +64,7 @@ public class NetRetriever implements HardwareRetriever { updateHardwareInfoWithNet(parseResults); } - protected List<ParseResult> findInterface() { + List<ParseResult> findInterface() { List<ParseResult> parseResults = new ArrayList<>(); try { List<String> commandOutput = commandExecutor.executeCommand(NET_FIND_INTERFACE); @@ -76,13 +76,13 @@ public class NetRetriever implements HardwareRetriever { return parseResults; } - protected List<ParseResult> parseNetInterface(List<String> commandOutput) { + List<ParseResult> parseNetInterface(List<String> commandOutput) { List<String> searchWords = new ArrayList<>(Arrays.asList(SEARCH_WORD_INTERFACE_IP4, SEARCH_WORD_INTERFACE_IPV6)); ParseInstructions parseInstructions = new ParseInstructions(INTERFACE_SEARCH_ELEMENT_INDEX, INTERFACE_RETURN_ELEMENT_INDEX, INTERFACE_NAME_REGEX_SPLIT, searchWords); return OutputParser.parseOutput(parseInstructions, commandOutput); } - protected void findInterfaceSpeed(List<ParseResult> parseResults) { + void findInterfaceSpeed(List<ParseResult> parseResults) { try { List<String> commandOutput = commandExecutor.executeCommand(NET_CHECK_INTERFACE_SPEED); ParseResult parseResult = parseInterfaceSpeed(commandOutput); @@ -92,7 +92,7 @@ public class NetRetriever implements HardwareRetriever { } } - protected ParseResult parseInterfaceSpeed(List<String> commandOutput) throws IOException { + ParseResult parseInterfaceSpeed(List<String> commandOutput) throws IOException { List<String> searchWords = Collections.singletonList(SEARCH_WORD_INTERFACE_SPEED); ParseInstructions parseInstructions = new ParseInstructions(INTERFACE_SPEED_SEARCH_ELEMENT_INDEX, INTERFACE_SPEED_RETURN_ELEMENT_INDEX, INTERFACE_SPEED_REGEX_SPLIT, searchWords); ParseResult parseResult = OutputParser.parseSingleOutput(parseInstructions, commandOutput); @@ -102,7 +102,7 @@ public class NetRetriever implements HardwareRetriever { return parseResult; } - protected void testPingResponse(List<ParseResult> parseResults) { + private void testPingResponse(List<ParseResult> parseResults) { try { List<String> commandOutput = commandExecutor.executeCommand(PING_NET_COMMAND); parseResults.add(parsePingResponse(commandOutput)); @@ -113,7 +113,7 @@ public class NetRetriever implements HardwareRetriever { } } - protected ParseResult parsePingResponse(List<String> commandOutput) throws IOException { + ParseResult parsePingResponse(List<String> commandOutput) throws IOException { List<String> searchWords = Collections.singletonList(PING_SEARCH_WORD); ParseInstructions parseInstructions = new ParseInstructions(PING_SEARCH_ELEMENT_INDEX, PING_RETURN_ELEMENT_INDEX, PING_SPLIT_REGEX_STRING, searchWords); ParseResult parseResult = OutputParser.parseSingleOutput(parseInstructions, commandOutput); @@ -123,7 +123,7 @@ public class NetRetriever implements HardwareRetriever { return new ParseResult(PING_SEARCH_WORD, parseResult.getValue()); } - protected void updateHardwareInfoWithNet(List<ParseResult> parseResults) { + void updateHardwareInfoWithNet(List<ParseResult> parseResults) { hardwareInfo.setIpv6Interface(false); hardwareInfo.setIpv4Interface(false); for (ParseResult parseResult : parseResults) { @@ -147,11 +147,11 @@ public class NetRetriever implements HardwareRetriever { } } - protected double convertInterfaceSpeed(String speed) { + double convertInterfaceSpeed(String speed) { return Double.parseDouble(speed.replaceAll("[^\\d.]", "")); } - protected void setIpv6Connectivity(ParseResult parseResult) { + void setIpv6Connectivity(ParseResult parseResult) { String pingResponse = parseResult.getValue(); String packetLoss = pingResponse.replaceAll("[^\\d.]", ""); if (packetLoss.equals("")) return; diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/mock/MockCommandExecutor.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/mock/MockCommandExecutor.java index 6e89b91aa94..88df18e9d4b 100644 --- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/mock/MockCommandExecutor.java +++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/mock/MockCommandExecutor.java @@ -19,7 +19,7 @@ public class MockCommandExecutor extends CommandExecutor { private ArrayList<String> mockCommands; private int counter; - public static final String DUMMY_COMMAND = "DUMMY"; + private static final String DUMMY_COMMAND = "DUMMY"; public MockCommandExecutor() { mockCommands = new ArrayList<>(); |