Merge pull request #194 from WASdev/dev_bd

Fixed deprecations

Author: BillyD73

Diff for: .gitignore

@@ -19,3 +19,6 @@ build
 
 # Mac stuff
 **/.DS_Store
+
+#IntelliJ stuff
+.idea

Diff for: cli-client/src/fat/java/com/ibm/ws/lars/upload/cli/UploadFatTest.java

@@ -20,7 +20,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasProperty;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.File;
 import java.util.Arrays;

Diff for: cli-client/src/test/java/com/ibm/ws/lars/upload/cli/MainTest.java

@@ -18,7 +18,7 @@
 
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 import java.io.ByteArrayInputStream;

Diff for: cli-client/src/test/java/com/ibm/ws/lars/upload/cli/UploadTest.java

@@ -20,7 +20,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 import java.io.ByteArrayInputStream;

Diff for: client-lib-tests/src/fat/java/com/ibm/ws/repository/test/EsaResourceTest.java

@@ -26,7 +26,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;

Diff for: client-lib-tests/src/fat/java/com/ibm/ws/repository/test/RepositoryUtilsTest.java

@@ -77,13 +77,13 @@ public void testRepositoryStatusOK() throws IOException, RequestFailureException
      */
     @Test
     public void testInvalidRepositoryNotAvailable() {
-        RestRepositoryConnection invalidLoginInfo = new RestRepositoryConnection("I", "don't", "exist", "http://dont.exist.com");
+        RestRepositoryConnection invalidLoginInfo = new RestRepositoryConnection("I", "don't", "exist", "http://dont252qmadjf842sgs7842d.hu43634existsaosd.com");
         assertFalse("An invalid test repository should not be available", invalidLoginInfo.isRepositoryAvailable());
     }
 
     @Test
     public void testInvalidRepositoryThrowsException() throws IOException, RequestFailureException {
-        RestRepositoryConnection invalidLoginInfo = new RestRepositoryConnection("I", "don't", "exist", "http://dont.exist.com");
+        RestRepositoryConnection invalidLoginInfo = new RestRepositoryConnection("I", "don't", "exist", "http://dont252qmadjf842sgs7842d.hu43634existsaosd.com");
         try {
             invalidLoginInfo.checkRepositoryStatus();
             fail("Should not have been able to reach here, repository status should have thrown an exception");

Diff for: client-lib-tests/src/fat/java/com/ibm/ws/repository/test/ResourceTest.java

@@ -24,7 +24,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeThat;

Diff for: client-lib-tests/src/fat/java/com/ibm/ws/repository/test/SampleResourceTest.java

@@ -22,7 +22,7 @@
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;

Diff for: client-lib-tests/src/fat/java/com/ibm/ws/repository/transport/client/test/RepositoryClientTest.java

@@ -21,7 +21,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeThat;

Diff for: client-lib-tests/src/fat/java/com/ibm/ws/repository/transport/client/test/RestClientTest.java

@@ -23,7 +23,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 

Diff for: client-lib-tests/src/test/java/com/ibm/ws/repository/common/enums/test/FilterPredicateTest.java

@@ -17,7 +17,7 @@
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 

Diff for: client-lib-tests/src/test/java/com/ibm/ws/repository/connections/test/SingleFileRepositoryConnectionTest.java

@@ -17,7 +17,7 @@
 
 import static org.hamcrest.Matchers.emptyCollectionOf;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 import java.io.File;

Diff for: client-lib-tests/src/test/java/com/ibm/ws/repository/resources/internal/test/EsaResourceImplTest.java

@@ -20,7 +20,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.ArrayList;
 import java.util.Collection;

Diff for: client-lib-tests/src/test/java/com/ibm/ws/repository/transport/client/test/AbstractFileClientTest.java

@@ -17,7 +17,7 @@
 
 import static org.hamcrest.Matchers.hasSize;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.File;
 import java.io.IOException;

Diff for: client-lib/src/main/java/com/ibm/ws/repository/resources/internal/EsaResourceImpl.java

@@ -433,6 +433,7 @@ public Collection<Link> getLinks() {
 
     /** {@inheritDoc} */
     @Override
+    @SuppressWarnings("deprecation")
     public void addRequireFeature(String requiredFeatureSymbolicName) {
         copyRequireFeatureToRequireFeatureWithTolerates();
         // Add to the old field without tolerates info
@@ -534,6 +535,7 @@ public Collection<String> getRequireFix() {
 
     /** {@inheritDoc} */
     @Override
+    @SuppressWarnings("deprecation")
     public void setRequireFeature(Collection<String> feats) {
         // No need to copy (like we do in addRequireFeatureWithTolerates)
         // as we are overwriting anyway
@@ -580,6 +582,7 @@ public void setRequireFeatureWithTolerates(Map<String, Collection<String>> featu
 
     /** {@inheritDoc} */
     @Override
+    @SuppressWarnings("deprecation")
     public Collection<String> getRequireFeature() {
         return _asset.getWlpInformation().getRequireFeature();
     }

Diff for: server/build.gradle

@@ -81,7 +81,7 @@ dependencies {
     compile group:'com.fasterxml.jackson.core', name:'jackson-core', version:jackson_version
     compile group:'com.fasterxml.jackson.core', name:'jackson-databind', version:jackson_version
     compile group:'com.fasterxml.jackson.core', name:'jackson-annotations', version:jackson_version
-    
+
     sharedLibs group:'org.mongodb', name:'mongo-java-driver', version:mongodb_java_version
     providedCompile fileTree(dir: "${libertyRoot}/dev/api/spec", include: requiredSpecJars)
     providedCompile fileTree(dir: "${libertyRoot}/dev/api/ibm", include: requiredIbmJars)

Diff for: server/src/fat/java/com/ibm/ws/lars/rest/ApiTest.java

@@ -22,7 +22,7 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 

Diff for: server/src/fat/java/com/ibm/ws/lars/rest/ImCompatibilityTest.java

@@ -17,7 +17,7 @@
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.collection.IsMapContaining.hasEntry;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.ByteArrayInputStream;
 import java.util.Properties;

Diff for: server/src/fat/java/com/ibm/ws/lars/rest/PermissionTest.java

@@ -19,7 +19,7 @@
 import static com.ibm.ws.lars.rest.matchers.ServerAssetByIdMatcher.assetsWithIds;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

Diff for: server/src/fat/java/com/ibm/ws/lars/rest/PersistenceBeanTest.java

@@ -23,7 +23,7 @@
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -39,6 +39,7 @@
 import java.util.Map;
 import java.util.logging.Logger;
 
+import com.mongodb.MongoClientOptions;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -55,15 +56,13 @@
 import com.ibm.ws.lars.testutils.FatUtils;
 import com.mongodb.DB;
 import com.mongodb.MongoClient;
-import com.mongodb.WriteConcern;
 
 import mockit.Mocked;
 
 public class PersistenceBeanTest {
 
     // TODO Should the db name be configurable?
     private static final String DB_NAME = "testdb";
-    private static final WriteConcern WRITE_CONCERN = WriteConcern.JOURNAL_SAFE;
 
     private MongoClient mongoClient;
     private PersistenceBean persistenceBean;
@@ -86,8 +85,7 @@ public void setUp() throws Exception {
         //
         // Also we currently don't bother with Mongo security but clearly we
         // might like to think about that at some point
-        mongoClient = new MongoClient("localhost:" + FatUtils.DB_PORT);
-        mongoClient.setWriteConcern(WRITE_CONCERN);
+        mongoClient = new MongoClient("localhost:" + FatUtils.DB_PORT, new MongoClientOptions.Builder().build());
 
         db = mongoClient.getDB(DB_NAME);
 

Diff for: server/src/fat/java/com/ibm/ws/lars/rest/RepositoryContext.java

@@ -56,7 +56,7 @@
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.client.utils.URLEncodedUtils;
-import org.apache.http.conn.ssl.SSLContextBuilder;
+import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.http.conn.ssl.TrustStrategy;
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.entity.ContentType;

Diff for: server/src/test/java/com/ibm/ws/lars/rest/AssetQueryParametersTest.java

@@ -20,7 +20,7 @@
 import static java.util.Arrays.asList;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.ArrayList;
 import java.util.List;