Skip to content

Commit

Permalink
Merge branch 'release/1.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam Haid committed Nov 29, 2017
2 parents 2a2554b + 84f12e0 commit cbea166
Show file tree
Hide file tree
Showing 1,488 changed files with 34,966 additions and 27,959 deletions.
11 changes: 0 additions & 11 deletions .gitignore
View file
@@ -1,13 +1,3 @@
<<<<<<< HEAD
*.iml
.idea/
_site
.sass-cache
.git/
target/
project/

=======
*~
:*.swp
*.orig
Expand All @@ -27,4 +17,3 @@ target
.history

.DS_Store
>>>>>>> release1.2
14 changes: 7 additions & 7 deletions README.md
View file
Expand Up @@ -11,7 +11,7 @@ The SolidFire Java SDK is a collection of software modules and libraries that fa
| Component | Version |
| ------------ | ------------------- |
| Java | 7.0 & 8.0 |
| SolidFire OS | Element 7.0 - 9.1 |
| SolidFire OS | Element 7.0 - 10.0 |

## Getting Help

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

~~~
Expand All @@ -36,15 +36,15 @@ or SBT:

~~~ scala

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

~~~

or Gradle:

~~~ groovy
compile 'com.solidfire:solidfire-sdk-java:1.4'
compile 'com.solidfire:solidfire-sdk-java:1.5'
~~~

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


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

## Documentation

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

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

## Examples

Expand Down
102 changes: 42 additions & 60 deletions docs/allclasses-frame.html
View file

Large diffs are not rendered by default.

102 changes: 42 additions & 60 deletions docs/allclasses-noframe.html
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions docs/com/solidfire/adaptor/ElementServiceAdaptor.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_121) on Tue May 23 09:36:15 MDT 2017 -->
<!-- Generated by javadoc (1.8.0) on Mon Nov 27 14:30:18 MST 2017 -->
<title>ElementServiceAdaptor</title>
<meta name="date" content="2017-05-23">
<meta name="date" content="2017-11-27">
<link rel="stylesheet" type="text/css" href="../../../solidfire-javadoc.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
</head>
Expand Down Expand Up @@ -45,7 +45,7 @@
<li><a href="../../../index-all.html">Index</a></li>
<li><a href="../../../help-doc.html">Help</a></li>
</ul>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
</div>
<div class="subNav">
<ul class="navList">
Expand Down Expand Up @@ -385,7 +385,7 @@ <h4>invokeSFApi</h4>
<li><a href="../../../index-all.html">Index</a></li>
<li><a href="../../../help-doc.html">Help</a></li>
</ul>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
</div>
<div class="subNav">
<ul class="navList">
Expand Down
8 changes: 4 additions & 4 deletions docs/com/solidfire/adaptor/ScheduleAdaptor.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_121) on Tue May 23 09:36:15 MDT 2017 -->
<!-- Generated by javadoc (1.8.0) on Mon Nov 27 14:30:18 MST 2017 -->
<title>ScheduleAdaptor</title>
<meta name="date" content="2017-05-23">
<meta name="date" content="2017-11-27">
<link rel="stylesheet" type="text/css" href="../../../solidfire-javadoc.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
</head>
Expand Down Expand Up @@ -45,7 +45,7 @@
<li><a href="../../../index-all.html">Index</a></li>
<li><a href="../../../help-doc.html">Help</a></li>
</ul>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
</div>
<div class="subNav">
<ul class="navList">
Expand Down Expand Up @@ -453,7 +453,7 @@ <h4>toApiSchedule</h4>
<li><a href="../../../index-all.html">Index</a></li>
<li><a href="../../../help-doc.html">Help</a></li>
</ul>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
</div>
<div class="subNav">
<ul class="navList">
Expand Down
4 changes: 2 additions & 2 deletions docs/com/solidfire/adaptor/package-frame.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_121) on Tue May 23 09:36:15 MDT 2017 -->
<!-- Generated by javadoc (1.8.0) on Mon Nov 27 14:30:18 MST 2017 -->
<title>com.solidfire.adaptor</title>
<meta name="date" content="2017-05-23">
<meta name="date" content="2017-11-27">
<link rel="stylesheet" type="text/css" href="../../../solidfire-javadoc.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
</head>
Expand Down
8 changes: 4 additions & 4 deletions docs/com/solidfire/adaptor/package-summary.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_121) on Tue May 23 09:36:15 MDT 2017 -->
<!-- Generated by javadoc (1.8.0) on Mon Nov 27 14:30:18 MST 2017 -->
<title>com.solidfire.adaptor</title>
<meta name="date" content="2017-05-23">
<meta name="date" content="2017-11-27">
<link rel="stylesheet" type="text/css" href="../../../solidfire-javadoc.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
</head>
Expand Down Expand Up @@ -39,7 +39,7 @@
<li><a href="../../../index-all.html">Index</a></li>
<li><a href="../../../help-doc.html">Help</a></li>
</ul>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
</div>
<div class="subNav">
<ul class="navList">
Expand Down Expand Up @@ -114,7 +114,7 @@ <h1 title="Package" class="title">Package&nbsp;com.solidfire.adaptor</h1>
<li><a href="../../../index-all.html">Index</a></li>
<li><a href="../../../help-doc.html">Help</a></li>
</ul>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
</div>
<div class="subNav">
<ul class="navList">
Expand Down
8 changes: 4 additions & 4 deletions docs/com/solidfire/adaptor/package-tree.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_121) on Tue May 23 09:36:15 MDT 2017 -->
<!-- Generated by javadoc (1.8.0) on Mon Nov 27 14:30:18 MST 2017 -->
<title>com.solidfire.adaptor Class Hierarchy</title>
<meta name="date" content="2017-05-23">
<meta name="date" content="2017-11-27">
<link rel="stylesheet" type="text/css" href="../../../solidfire-javadoc.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
</head>
Expand Down Expand Up @@ -39,7 +39,7 @@
<li><a href="../../../index-all.html">Index</a></li>
<li><a href="../../../help-doc.html">Help</a></li>
</ul>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
</div>
<div class="subNav">
<ul class="navList">
Expand Down Expand Up @@ -104,7 +104,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
<li><a href="../../../index-all.html">Index</a></li>
<li><a href="../../../help-doc.html">Help</a></li>
</ul>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
</div>
<div class="subNav">
<ul class="navList">
Expand Down
36 changes: 8 additions & 28 deletions docs/com/solidfire/client/AbstractFactory.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_121) on Tue May 23 09:36:15 MDT 2017 -->
<!-- Generated by javadoc (1.8.0) on Mon Nov 27 14:30:18 MST 2017 -->
<title>AbstractFactory</title>
<meta name="date" content="2017-05-23">
<meta name="date" content="2017-11-27">
<link rel="stylesheet" type="text/css" href="../../../solidfire-javadoc.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
</head>
Expand All @@ -18,7 +18,7 @@
catch(err) {
}
//-->
var methods = {"i0":10,"i1":10,"i2":6,"i3":6,"i4":9,"i5":9,"i6":6};
var methods = {"i0":10,"i1":10,"i2":6,"i3":9,"i4":9,"i5":6};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
Expand All @@ -45,7 +45,7 @@
<li><a href="../../../index-all.html">Index</a></li>
<li><a href="../../../help-doc.html">Help</a></li>
</ul>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
</div>
<div class="subNav">
<ul class="navList">
Expand Down Expand Up @@ -182,24 +182,18 @@ <h3>Method Summary</h3>
</tr>
<tr id="i2" class="altColor">
<td class="colFirst"><code>protected abstract double</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/solidfire/client/AbstractFactory.html#getMaxApiVersion--">getMaxApiVersion</a></span>()</code>
<div class="block">Getter for property 'maxApiVersion'.</div>
</td>
</tr>
<tr id="i3" class="rowColor">
<td class="colFirst"><code>protected abstract double</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/solidfire/client/AbstractFactory.html#getMinApiVersion--">getMinApiVersion</a></span>()</code>
<div class="block">Getter for property 'minApiVersion'.</div>
</td>
</tr>
<tr id="i4" class="altColor">
<tr id="i3" class="rowColor">
<td class="colFirst"><code>protected static void</code></td>
<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,
boolean&nbsp;verifySSL)</code>
<div class="block">Checks if the provided target is in the form of an IP address or a hostname.</div>
</td>
</tr>
<tr id="i5" class="rowColor">
<tr id="i4" class="altColor">
<td class="colFirst"><code>protected static URL</code></td>
<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,
<a href="../../../com/solidfire/core/javautil/Optional.html" title="class in com.solidfire.core.javautil">Optional</a>&lt;Integer&gt;&nbsp;port,
Expand All @@ -211,7 +205,7 @@ <h3>Method Summary</h3>
https://{target}/json-rpc/{apiVersion}</div>
</td>
</tr>
<tr id="i6" class="altColor">
<tr id="i5" class="rowColor">
<td class="colFirst"><code>protected abstract <a href="../../../com/solidfire/client/AbstractFactory.html" title="type parameter in AbstractFactory">T</a></code></td>
<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>
<div class="block">Initializes the ServiceBase with a given RequestDispatcher.</div>
Expand Down Expand Up @@ -270,20 +264,6 @@ <h4>getMinApiVersion</h4>
</dl>
</li>
</ul>
<a name="getMaxApiVersion--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>getMaxApiVersion</h4>
<pre>protected abstract&nbsp;double&nbsp;getMaxApiVersion()</pre>
<div class="block">Getter for property 'maxApiVersion'.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>Value for property 'maxApiVersion'.</dd>
</dl>
</li>
</ul>
<a name="toServiceBase-com.solidfire.core.client.RequestDispatcher-">
<!-- -->
</a>
Expand Down Expand Up @@ -427,7 +407,7 @@ <h4>checkVersion</h4>
<li><a href="../../../index-all.html">Index</a></li>
<li><a href="../../../help-doc.html">Help</a></li>
</ul>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.4.0.212</div>
<div class="aboutLanguage"><img><br/><b>Solidfire Java SDK</b><br/>v1.5.0.90</div>
</div>
<div class="subNav">
<ul class="navList">
Expand Down

0 comments on commit cbea166

Please sign in to comment.