Merge pull request Terracotta-OSS#197 from anthonydahanne/upgrade_ver…

…sions

Upgrade versions

concurrent-map-entity/server/src/main/java/org/terracotta/entity/map/server/PassiveTerracottaClusteredMap.java

@@ -61,11 +61,6 @@ public void createNew() {
     throw new UnsupportedOperationException("TODO Implement me!");
   }
 
-  @Override
-  public void loadExisting() {
-    throw new UnsupportedOperationException("TODO Implement me!");
-  }
-
   @Override
   public void destroy() {
     throw new UnsupportedOperationException("TODO Implement me!");

management/monitoring-service/src/main/java/org/terracotta/management/service/monitoring/MonitoringServiceProvider.java

@@ -112,7 +112,7 @@ public Collection<Class<?>> getProvidedServiceTypes() {
   }
 
   @Override
-  public void clear() throws ServiceProviderCleanupException {
+  public void prepareForSynchronization() throws ServiceProviderCleanupException {
     listener.clear();
     statisticsService.close();
   }

management/monitoring-service/src/test/java/org/terracotta/management/service/monitoring/ManagementRegistryServiceTest.java

@@ -21,7 +21,6 @@
 import org.junit.runners.JUnit4;
 import org.terracotta.entity.BasicServiceConfiguration;
 import org.terracotta.entity.ClientCommunicator;
-import org.terracotta.entity.PlatformConfiguration;
 import org.terracotta.entity.ServiceConfiguration;
 import org.terracotta.entity.ServiceRegistry;
 import org.terracotta.management.model.message.Message;
@@ -61,7 +60,7 @@ public class ManagementRegistryServiceTest {
 
   @Before
   public void setUp() throws Exception {
-    provider.initialize(null, () -> "server-1");
+    provider.initialize(null, new MyPlatformConfiguration("server-1"));
     platformListener = provider.getService(0, new BasicServiceConfiguration<>(IStripeMonitoring.class));
   }
 

management/monitoring-service/src/test/java/org/terracotta/management/service/monitoring/MyPlatformConfiguration.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.terracotta.management.service.monitoring;
+
+import org.terracotta.entity.PlatformConfiguration;
+
+import java.util.Collection;
+
+public class MyPlatformConfiguration implements PlatformConfiguration {
+
+  private final String serverName;
+
+  public MyPlatformConfiguration(String serverName) {
+    this.serverName =  serverName;
+  }
+
+  @Override
+  public String getServerName() {
+    return serverName;
+  }
+
+  @Override
+  public <T> Collection<T> getExtendedConfiguration(Class<T> aClass) {
+    return null;
+  }
+}
+
+

management/monitoring-service/src/test/java/org/terracotta/management/service/monitoring/VoltronMonitoringServiceTest.java

@@ -117,7 +117,7 @@ public void setUp() throws Exception {
     passive = new PlatformServer("server-2", "localhost", "127.0.0.1", "0.0.0.0", 9511, 9611, "v1", "b1", now);
 
     // platform does this call to fire events to us
-    serviceProvider.initialize(null, () -> "server-1");
+    serviceProvider.initialize(null, new MyPlatformConfiguration("server-1"));
     platformListener = serviceProvider.getService(0, new BasicServiceConfiguration<>(IStripeMonitoring.class));
 
     // simulation of platform calls when active server is up

offheap-resource/src/main/java/org/terracotta/offheapresource/OffHeapResourcesProvider.java

@@ -114,7 +114,7 @@ public Collection<Class<?>> getProvidedServiceTypes() {
   }
 
   @Override
-  public void clear() {
+  public void prepareForSynchronization () {
     resources.clear();
   }
 

offheap-resource/src/test/java/org/terracotta/offheapresource/OffHeapResourcesProviderTest.java

@@ -137,7 +137,7 @@ public void testNullReturnAfterClear() {
 
     OffHeapResourcesProvider provider = new OffHeapResourcesProvider();
     provider.initialize(config, null);
-    provider.clear();
+    provider.prepareForSynchronization();
     assertThat(provider.getService(42L, OffHeapResourceIdentifier.identifier("foo")), nullValue());
   }
 
@@ -158,7 +158,7 @@ public void testResourceTooBig() throws Exception {
     } catch (ArithmeticException e) {
       // expected
     } finally {
-      provider.clear();
+      provider.prepareForSynchronization();
     }
   }
 
@@ -176,7 +176,7 @@ public void testResourceMax() throws Exception {
     try {
       provider.initialize(config, null);
     } finally {
-      provider.clear();
+      provider.prepareForSynchronization();
     }
   }
 }

pom.xml

@@ -27,10 +27,10 @@
   <properties>
     <maven-forge-plugin.version>1.2.16</maven-forge-plugin.version>
     <slf4j.version>1.7.7</slf4j.version>
-    <terracotta-apis.version>1.0.11.beta</terracotta-apis.version>
-    <tcconfig.version>10.0.11.beta</tcconfig.version>
-    <passthrough-testing.version>1.0.11.beta3</passthrough-testing.version>
-    <statistics.version>1.4.0</statistics.version>
+    <terracotta-apis.version>1.0.12.beta</terracotta-apis.version>
+    <tcconfig.version>10.0.12.beta</tcconfig.version>
+    <passthrough-testing.version>1.0.12.beta</passthrough-testing.version>
+    <statistics.version>1.4.1</statistics.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <java.version>1.6</java.version>