Skip to content

Commit cbea166

Browse files
author
Adam Haid
committed
Merge branch 'release/1.5'
2 parents 2a2554b + 84f12e0 commit cbea166

1,488 files changed

Lines changed: 34966 additions & 27959 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
<<<<<<< HEAD
2-
*.iml
3-
.idea/
4-
_site
5-
.sass-cache
6-
.git/
7-
target/
8-
project/
9-
10-
=======
111
*~
122
:*.swp
133
*.orig
@@ -27,4 +17,3 @@ target
2717
.history
2818

2919
.DS_Store
30-
>>>>>>> release1.2

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The SolidFire Java SDK is a collection of software modules and libraries that fa
1111
| Component | Version |
1212
| ------------ | ------------------- |
1313
| Java | 7.0 & 8.0 |
14-
| SolidFire OS | Element 7.0 - 9.1 |
14+
| SolidFire OS | Element 7.0 - 10.0 |
1515

1616
## Getting Help
1717

@@ -27,7 +27,7 @@ If you have any questions or comments about this product, submit an issue on git
2727
<dependency>
2828
<groupId>com.solidfire</groupId>
2929
<artifactId>solidfire-sdk-java</artifactId>
30-
<version>1.4.0.212</version>
30+
<version>1.5.0.89</version>
3131
</dependency>
3232

3333
~~~
@@ -36,15 +36,15 @@ or SBT:
3636

3737
~~~ scala
3838

39-
libraryDependencies += "com.solidfire" % "solidfire-sdk-java" % "1.4"
39+
libraryDependencies += "com.solidfire" % "solidfire-sdk-java" % "1.5"
4040

4141
~~~
4242

4343
or Gradle:
4444

4545
~~~ groovy
4646
47-
compile 'com.solidfire:solidfire-sdk-java:1.4'
47+
compile 'com.solidfire:solidfire-sdk-java:1.5'
4848
4949
~~~
5050

@@ -56,7 +56,7 @@ compile 'com.solidfire:solidfire-sdk-java:1.4'
5656
| solidfire.code.gson | 2.6.2 |
5757
| joda-time | 2.9.3 |
5858
| joda-convert | 1.8.1 |
59-
| slf4j-api | 1.6.6 |
59+
| slf4j-api | 1.7.25 |
6060

6161

6262
### Limitations with a Certificate Signed Assembly Jar
@@ -68,9 +68,9 @@ If using the SDK with a restricted version of the above listed components, e.g.
6868

6969
## Documentation
7070

71-
[Latest JavaDoc](https://solidfire.github.io/solidfire-sdk-java/latest/api/)
71+
[Latest JavaDoc](https://github.com/solidfire/solidfire-sdk-java/raw/master/docs/)
7272

73-
[Download Release Notes](https://github.com/solidfire/solidfire-sdk-java/raw/master/NetApp_SolidFire_Java_SDK_Release_Notes.pdf)
73+
[Release Notes](https://github.com/solidfire/solidfire-sdk-java/raw/master/NetApp_SolidFire_Java_SDK_Release_Notes.pdf)
7474

7575
## Examples
7676

‎docs/allclasses-frame.html‎

Lines changed: 42 additions & 60 deletions
Large diffs are not rendered by default.

‎docs/allclasses-noframe.html‎

Lines changed: 42 additions & 60 deletions
Large diffs are not rendered by default.

‎docs/com/solidfire/adaptor/ElementServiceAdaptor.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_121) on Tue May 23 09:36:15 MDT 2017 -->
5+
<!-- Generated by javadoc (1.8.0) on Mon Nov 27 14:30:18 MST 2017 -->
66
<title>ElementServiceAdaptor</title>
7-
<meta name="date" content="2017-05-23">
7+
<meta name="date" content="2017-11-27">
88
<link rel="stylesheet" type="text/css" href="../../../solidfire-javadoc.css" title="Style">
99
<script type="text/javascript" src="../../../script.js"></script>
1010
</head>
@@ -45,7 +45,7 @@
4545
<li><a href="../../../index-all.html">Index</a></li>
4646
<li><a href="../../../help-doc.html">Help</a></li>
4747
</ul>
48-
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
48+
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
4949
</div>
5050
<div class="subNav">
5151
<ul class="navList">
@@ -385,7 +385,7 @@ <h4>invokeSFApi</h4>
385385
<li><a href="../../../index-all.html">Index</a></li>
386386
<li><a href="../../../help-doc.html">Help</a></li>
387387
</ul>
388-
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
388+
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
389389
</div>
390390
<div class="subNav">
391391
<ul class="navList">

‎docs/com/solidfire/adaptor/ScheduleAdaptor.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_121) on Tue May 23 09:36:15 MDT 2017 -->
5+
<!-- Generated by javadoc (1.8.0) on Mon Nov 27 14:30:18 MST 2017 -->
66
<title>ScheduleAdaptor</title>
7-
<meta name="date" content="2017-05-23">
7+
<meta name="date" content="2017-11-27">
88
<link rel="stylesheet" type="text/css" href="../../../solidfire-javadoc.css" title="Style">
99
<script type="text/javascript" src="../../../script.js"></script>
1010
</head>
@@ -45,7 +45,7 @@
4545
<li><a href="../../../index-all.html">Index</a></li>
4646
<li><a href="../../../help-doc.html">Help</a></li>
4747
</ul>
48-
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
48+
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
4949
</div>
5050
<div class="subNav">
5151
<ul class="navList">
@@ -453,7 +453,7 @@ <h4>toApiSchedule</h4>
453453
<li><a href="../../../index-all.html">Index</a></li>
454454
<li><a href="../../../help-doc.html">Help</a></li>
455455
</ul>
456-
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
456+
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
457457
</div>
458458
<div class="subNav">
459459
<ul class="navList">

‎docs/com/solidfire/adaptor/package-frame.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_121) on Tue May 23 09:36:15 MDT 2017 -->
5+
<!-- Generated by javadoc (1.8.0) on Mon Nov 27 14:30:18 MST 2017 -->
66
<title>com.solidfire.adaptor</title>
7-
<meta name="date" content="2017-05-23">
7+
<meta name="date" content="2017-11-27">
88
<link rel="stylesheet" type="text/css" href="../../../solidfire-javadoc.css" title="Style">
99
<script type="text/javascript" src="../../../script.js"></script>
1010
</head>

‎docs/com/solidfire/adaptor/package-summary.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_121) on Tue May 23 09:36:15 MDT 2017 -->
5+
<!-- Generated by javadoc (1.8.0) on Mon Nov 27 14:30:18 MST 2017 -->
66
<title>com.solidfire.adaptor</title>
7-
<meta name="date" content="2017-05-23">
7+
<meta name="date" content="2017-11-27">
88
<link rel="stylesheet" type="text/css" href="../../../solidfire-javadoc.css" title="Style">
99
<script type="text/javascript" src="../../../script.js"></script>
1010
</head>
@@ -39,7 +39,7 @@
3939
<li><a href="../../../index-all.html">Index</a></li>
4040
<li><a href="../../../help-doc.html">Help</a></li>
4141
</ul>
42-
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
42+
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
4343
</div>
4444
<div class="subNav">
4545
<ul class="navList">
@@ -114,7 +114,7 @@ <h1 title="Package" class="title">Package&nbsp;com.solidfire.adaptor</h1>
114114
<li><a href="../../../index-all.html">Index</a></li>
115115
<li><a href="../../../help-doc.html">Help</a></li>
116116
</ul>
117-
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
117+
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
118118
</div>
119119
<div class="subNav">
120120
<ul class="navList">

‎docs/com/solidfire/adaptor/package-tree.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_121) on Tue May 23 09:36:15 MDT 2017 -->
5+
<!-- Generated by javadoc (1.8.0) on Mon Nov 27 14:30:18 MST 2017 -->
66
<title>com.solidfire.adaptor Class Hierarchy</title>
7-
<meta name="date" content="2017-05-23">
7+
<meta name="date" content="2017-11-27">
88
<link rel="stylesheet" type="text/css" href="../../../solidfire-javadoc.css" title="Style">
99
<script type="text/javascript" src="../../../script.js"></script>
1010
</head>
@@ -39,7 +39,7 @@
3939
<li><a href="../../../index-all.html">Index</a></li>
4040
<li><a href="../../../help-doc.html">Help</a></li>
4141
</ul>
42-
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
42+
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
4343
</div>
4444
<div class="subNav">
4545
<ul class="navList">
@@ -104,7 +104,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
104104
<li><a href="../../../index-all.html">Index</a></li>
105105
<li><a href="../../../help-doc.html">Help</a></li>
106106
</ul>
107-
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
107+
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
108108
</div>
109109
<div class="subNav">
110110
<ul class="navList">

‎docs/com/solidfire/client/AbstractFactory.html‎

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_121) on Tue May 23 09:36:15 MDT 2017 -->
5+
<!-- Generated by javadoc (1.8.0) on Mon Nov 27 14:30:18 MST 2017 -->
66
<title>AbstractFactory</title>
7-
<meta name="date" content="2017-05-23">
7+
<meta name="date" content="2017-11-27">
88
<link rel="stylesheet" type="text/css" href="../../../solidfire-javadoc.css" title="Style">
99
<script type="text/javascript" src="../../../script.js"></script>
1010
</head>
@@ -18,7 +18,7 @@
1818
catch(err) {
1919
}
2020
//-->
21-
var methods = {"i0":10,"i1":10,"i2":6,"i3":6,"i4":9,"i5":9,"i6":6};
21+
var methods = {"i0":10,"i1":10,"i2":6,"i3":9,"i4":9,"i5":6};
2222
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
2323
var altColor = "altColor";
2424
var rowColor = "rowColor";
@@ -45,7 +45,7 @@
4545
<li><a href="../../../index-all.html">Index</a></li>
4646
<li><a href="../../../help-doc.html">Help</a></li>
4747
</ul>
48-
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
48+
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
4949
</div>
5050
<div class="subNav">
5151
<ul class="navList">
@@ -182,24 +182,18 @@ <h3>Method Summary</h3>
182182
</tr>
183183
<tr id="i2" class="altColor">
184184
<td class="colFirst"><code>protected abstract double</code></td>
185-
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/solidfire/client/AbstractFactory.html#getMaxApiVersion--">getMaxApiVersion</a></span>()</code>
186-
<div class="block">Getter for property 'maxApiVersion'.</div>
187-
</td>
188-
</tr>
189-
<tr id="i3" class="rowColor">
190-
<td class="colFirst"><code>protected abstract double</code></td>
191185
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/solidfire/client/AbstractFactory.html#getMinApiVersion--">getMinApiVersion</a></span>()</code>
192186
<div class="block">Getter for property 'minApiVersion'.</div>
193187
</td>
194188
</tr>
195-
<tr id="i4" class="altColor">
189+
<tr id="i3" class="rowColor">
196190
<td class="colFirst"><code>protected static void</code></td>
197191
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/solidfire/client/AbstractFactory.html#testTargetFormat-java.lang.String-boolean-">testTargetFormat</a></span>(String&nbsp;target,
198192
boolean&nbsp;verifySSL)</code>
199193
<div class="block">Checks if the provided target is in the form of an IP address or a hostname.</div>
200194
</td>
201195
</tr>
202-
<tr id="i5" class="rowColor">
196+
<tr id="i4" class="altColor">
203197
<td class="colFirst"><code>protected static URL</code></td>
204198
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/solidfire/client/AbstractFactory.html#toEndpoint-java.lang.String-com.solidfire.core.javautil.Optional-double-">toEndpoint</a></span>(String&nbsp;target,
205199
<a href="../../../com/solidfire/core/javautil/Optional.html" title="class in com.solidfire.core.javautil">Optional</a>&lt;Integer&gt;&nbsp;port,
@@ -211,7 +205,7 @@ <h3>Method Summary</h3>
211205
https://{target}/json-rpc/{apiVersion}</div>
212206
</td>
213207
</tr>
214-
<tr id="i6" class="altColor">
208+
<tr id="i5" class="rowColor">
215209
<td class="colFirst"><code>protected abstract <a href="../../../com/solidfire/client/AbstractFactory.html" title="type parameter in AbstractFactory">T</a></code></td>
216210
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/solidfire/client/AbstractFactory.html#toServiceBase-com.solidfire.core.client.RequestDispatcher-">toServiceBase</a></span>(<a href="../../../com/solidfire/core/client/RequestDispatcher.html" title="interface in com.solidfire.core.client">RequestDispatcher</a>&nbsp;requestDispatcher)</code>
217211
<div class="block">Initializes the ServiceBase with a given RequestDispatcher.</div>
@@ -270,20 +264,6 @@ <h4>getMinApiVersion</h4>
270264
</dl>
271265
</li>
272266
</ul>
273-
<a name="getMaxApiVersion--">
274-
<!-- -->
275-
</a>
276-
<ul class="blockList">
277-
<li class="blockList">
278-
<h4>getMaxApiVersion</h4>
279-
<pre>protected abstract&nbsp;double&nbsp;getMaxApiVersion()</pre>
280-
<div class="block">Getter for property 'maxApiVersion'.</div>
281-
<dl>
282-
<dt><span class="returnLabel">Returns:</span></dt>
283-
<dd>Value for property 'maxApiVersion'.</dd>
284-
</dl>
285-
</li>
286-
</ul>
287267
<a name="toServiceBase-com.solidfire.core.client.RequestDispatcher-">
288268
<!-- -->
289269
</a>
@@ -427,7 +407,7 @@ <h4>checkVersion</h4>
427407
<li><a href="../../../index-all.html">Index</a></li>
428408
<li><a href="../../../help-doc.html">Help</a></li>
429409
</ul>
430-
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
410+
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
431411
</div>
432412
<div class="subNav">
433413
<ul class="navList">

0 commit comments

Comments
 (0)