Skip to content

Commit f4c99f8

Browse files
authored
Merge pull request #159 from splunk/DVPL-9622
Fixed test cases failures and Clean-up Javadoc generation Breaking Change: Changed getMaxHotBuckets to String type to conform to Splunk platform updates
2 parents 123693b + 6f43673 commit f4c99f8

38 files changed

+139
-524
lines changed

.idea/ant.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

build.xml

Lines changed: 0 additions & 451 deletions
This file was deleted.

splunk/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<properties>
1515
<!-- <jvm.arg.https.protocol>-Dhttps.protocols=TLSv1.1,TLSv1.2</jvm.arg.https.protocol> -->
1616
<https.protocols>TLSv1.2</https.protocols>
17-
<maven.javadoc.skip>true</maven.javadoc.skip>
17+
<!-- <maven.javadoc.skip>true</maven.javadoc.skip>-->
1818
</properties>
1919
<dependencies>
2020
<dependency>

splunk/src/main/java/com/splunk/EventType.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ public void setDescription(String description) {
9191
* take effect immediately.
9292
* @see Entity#disable
9393
* @see Entity#enable
94+
* @param disabled The boolean flag
9495
*/
9596
public void setDisabled(boolean disabled) {
9697
setCacheValue("disabled", disabled);

splunk/src/main/java/com/splunk/HttpService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ public static SSLSecurityProtocol getSslSecurityProtocol() {
198198

199199
/**
200200
* Sets the SSL security protocol of this service.
201+
* @param securityProtocol The SSLSecurityProtocal instance
201202
*/
202203
public static void setSslSecurityProtocol(SSLSecurityProtocol securityProtocol) {
203204
// Only update the SSL_SOCKET_FACTORY if changing protocols

splunk/src/main/java/com/splunk/Index.java

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,28 @@ public class Index extends Entity {
4040
* Creates a writable socket to this index.
4141
*
4242
* @return The writable socket.
43-
* @throws IOException
43+
* @throws IOException Throws exception if fails to write socket.
4444
*/
4545
public Socket attach() throws IOException {
4646
Receiver receiver = service.getReceiver();
4747
return receiver.attach(getName());
4848
}
4949

5050
/**
51-
* Writes events to this index, reusing the connection.
52-
* This method passes an output stream connected to the index to the
53-
* {@code run} method of the {@code ReceiverBehavior} object, then handles
51+
* Writes events to this index, reusing the connection.
52+
* This method passes an output stream connected to the index to the
53+
* {@code run} method of the {@code ReceiverBehavior} object, then handles
5454
* setting up and tearing down the socket.
5555
* <p>
56-
* For an example of how to use this method, see
57-
* <a href="http://dev.splunk.com/view/SP-CAAAEJ2" target="_blank">How to
58-
* get data into Splunk</a> on
59-
* <a href="http://dev.splunk.com/view/SP-CAAAEJ2"
56+
* For an example of how to use this method, see
57+
* <a href="http://dev.splunk.com/view/SP-CAAAEJ2" target="_blank">How to
58+
* get data into Splunk</a> on
59+
* <a href="http://dev.splunk.com/view/SP-CAAAEJ2"
6060
* target="_blank">dev.splunk.com</a>.
61-
*
62-
* @param behavior The body of a {@code try} block as an anonymous
61+
*
62+
* @param behavior The body of a {@code try} block as an anonymous
6363
* implementation of the {@code ReceiverBehavior} interface.
64+
* @throws IOException The IOException class
6465
*/
6566
public void attachWith(ReceiverBehavior behavior) throws IOException {
6667
Socket socket = null;
@@ -82,7 +83,7 @@ public void attachWith(ReceiverBehavior behavior) throws IOException {
8283
* @param args Optional arguments for this stream. Valid parameters are:
8384
* "host", "host_regex", "source", and "sourcetype".
8485
* @return The socket.
85-
* @throws IOException
86+
* @throws IOException The IOException class
8687
*/
8788
public Socket attach(Args args) throws IOException {
8889
Receiver receiver = service.getReceiver();
@@ -327,6 +328,7 @@ public String getLastInitTime() {
327328
* is older than this, Splunk does not create or rebuild its bloomfilter.
328329
* The valid format is <i>number</i> followed by a time unit ("s", "m", "h",
329330
* or "d"). For example, "30d" for 30 days.
331+
* @return String value
330332
*/
331333
public String getMaxBloomBackfillBucketAge() {
332334
return getString("maxBloomBackfillBucketAge", null);
@@ -358,10 +360,10 @@ public String getMaxDataSize() {
358360
/**
359361
* Returns the maximum number of hot buckets that can exist for this index.
360362
*
361-
* @return The maximum number of hot buckets.
363+
* @return The maximum number of hot buckets or "auto" (which means 3).
362364
*/
363-
public int getMaxHotBuckets() {
364-
return getInteger("maxHotBuckets");
365+
public String getMaxHotBuckets() {
366+
return getString("maxHotBuckets");
365367
}
366368

367369
/**
@@ -441,6 +443,7 @@ public int getMaxTotalDataSizeMB() {
441443
* If there are any acknowledged events sharing this raw slice, the
442444
* {@code MaxTimeUnreplicatedWithAcksparamater} applies instead.
443445
* @see #getMaxTimeUnreplicatedWithAcks
446+
* @return int value
444447
*/
445448
public int getMaxTimeUnreplicatedNoAcks() {
446449
return getInteger("maxTimeUnreplicatedNoAcks");
@@ -451,6 +454,7 @@ public int getMaxTimeUnreplicatedNoAcks() {
451454
* unacknowledged in a raw slice. This value only applies when indexer
452455
* acknowledgement is enabled on forwarders and replication is enabled with
453456
* clustering.
457+
* @return int value
454458
*/
455459
public int getMaxTimeUnreplicatedWithAcks() {
456460
return getInteger("maxTimeUnreplicatedWithAcks");
@@ -720,8 +724,7 @@ public void setBucketRebuildMemoryHint(String value) {
720724
/**
721725
* Sets the destination path for the frozen archive, where Splunk
722726
* automatically puts frozen buckets. The bucket freezing policy is as
723-
*follows:
724-
* <p>
727+
* follows:
725728
* <ul><li><b>New-style buckets (4.2 and later):</b> All files are removed
726729
* except the raw data. To thaw frozen buckets, run {@code Splunk rebuild
727730
* <bucket dir>} on the bucket, then move the buckets to the thawed
@@ -828,9 +831,9 @@ public void setMaxDataSize(String size) {
828831
* @see #setMaxHotIdleSecs
829832
* @see #getMaxHotIdleSecs
830833
*
831-
* @param size The maximum number of hot buckets per index.
834+
* @param size The maximum number of hot buckets per index, or an 'auto' string.
832835
*/
833-
public void setMaxHotBuckets(int size) {
836+
public void setMaxHotBuckets(String size) {
834837
setCacheValue("maxHotBuckets", size);
835838
}
836839

splunk/src/main/java/com/splunk/Input.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public class Input extends Entity {
3939
* Returns an {@code InputKind} representing this input's type.
4040
*
4141
* The input kind is inferred from the input's path.
42+
* @return InputKind instance
4243
*/
4344
public InputKind getKind() {
4445
String[] pathComponents =

splunk/src/main/java/com/splunk/InputCollection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public class InputCollection extends EntityCollection<Input> {
6464
* <li> The stanza (for Windows Registry inputs)</li>
6565
* <li> The name of the configuration (for Windows AD inputs)</li></ul>
6666
* @return No return value.
67-
* @throws UnsupportedOperationException
67+
* @throws UnsupportedOperationException The UnsupportedOperationException instance
6868
*/
6969
@Override public Input create(String name) {
7070
throw new UnsupportedOperationException();
@@ -88,7 +88,7 @@ public class InputCollection extends EntityCollection<Input> {
8888
* <a href="http://dev.splunk.com/view/SP-CAAAEJ2"
8989
* target="_blank">dev.splunk.com</a>.
9090
* @return No return value.
91-
* @throws UnsupportedOperationException
91+
* @throws UnsupportedOperationException The UnsupportedOperationException instance
9292
*/
9393
@Override public Input create(String name, Map args) {
9494
throw new UnsupportedOperationException();

splunk/src/main/java/com/splunk/LicensePool.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public Map<String, Long> getSlavesUsageBytes() {
9898

9999
/**
100100
* Returns the stack ID for this license pool. Valid values are:
101-
* <p><ul>
101+
* <ul>
102102
* <li>"download-trial"</li>
103103
* <li>"enterprise"</li>
104104
* <li>"forwarder"</li>

splunk/src/main/java/com/splunk/LimitPivotFilter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public class LimitPivotFilter extends PivotFilter {
5454

5555
/**
5656
* Return the name of the field to use for sorting.
57+
* @return String value
5758
*/
5859
public String getAttributeName() {
5960
return this.sortAttribute;

0 commit comments

Comments
 (0)