Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

Commit ea3f84a

Browse files
niclashniclash
committed
Trying to unify the naming of all the extensions.
Signed-off-by: niclas <[email protected]>
1 parent 09b9280 commit ea3f84a

File tree

82 files changed

+178
-196
lines changed

Some content is hidden

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

82 files changed

+178
-196
lines changed

extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/GeodeConfiguration.java renamed to extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/GeodeEntityStoreConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* Geode Configuration.
2828
*/
2929
// START SNIPPET: config
30-
public interface GeodeConfiguration
30+
public interface GeodeEntityStoreConfiguration
3131
{
3232
/**
3333
* Geode Topology.

‎extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/GeodeEntityStoreMixin.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class GeodeEntityStoreMixin
5050
implements ServiceActivation, MapEntityStore
5151
{
5252
@This
53-
private Configuration<GeodeConfiguration> config;
53+
private Configuration<GeodeEntityStoreConfiguration> config;
5454

5555
private AutoCloseable closeable;
5656
private Region<String, String> region;
@@ -60,7 +60,7 @@ public void activateService()
6060
throws Exception
6161
{
6262
config.refresh();
63-
GeodeConfiguration configuration = config.get();
63+
GeodeEntityStoreConfiguration configuration = config.get();
6464
switch( configuration.topology().get() )
6565
{
6666
case EMBEDDED:
@@ -75,7 +75,7 @@ public void activateService()
7575
}
7676
}
7777

78-
private void activateEmbedded( GeodeConfiguration configuration )
78+
private void activateEmbedded( GeodeEntityStoreConfiguration configuration )
7979
throws IOException
8080
{
8181
Properties cacheProperties = buildCacheProperties( configuration );
@@ -92,7 +92,7 @@ private void activateEmbedded( GeodeConfiguration configuration )
9292
closeable = cache;
9393
}
9494

95-
private void activateClientServer( GeodeConfiguration configuration )
95+
private void activateClientServer( GeodeEntityStoreConfiguration configuration )
9696
throws IOException
9797
{
9898
Properties cacheProperties = buildCacheProperties( configuration );
@@ -109,7 +109,7 @@ private void activateClientServer( GeodeConfiguration configuration )
109109
closeable = cache;
110110
}
111111

112-
private Properties buildCacheProperties( GeodeConfiguration config )
112+
private Properties buildCacheProperties( GeodeEntityStoreConfiguration config )
113113
throws IOException
114114
{
115115
Properties properties = new Properties();

‎extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/assembly/GeodeEntityStoreAssembler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.apache.polygene.bootstrap.AssemblyException;
2424
import org.apache.polygene.bootstrap.ModuleAssembly;
2525
import org.apache.polygene.bootstrap.ServiceDeclaration;
26-
import org.apache.polygene.entitystore.geode.GeodeConfiguration;
26+
import org.apache.polygene.entitystore.geode.GeodeEntityStoreConfiguration;
2727
import org.apache.polygene.entitystore.geode.GeodeEntityStoreService;
2828

2929
/**
@@ -43,7 +43,7 @@ public void assemble( ModuleAssembly module )
4343
}
4444
if( hasConfig() )
4545
{
46-
configModule().entities( GeodeConfiguration.class ).visibleIn( configVisibility() );
46+
configModule().entities( GeodeEntityStoreConfiguration.class ).visibleIn( configVisibility() );
4747
}
4848
}
4949
}

extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/HazelcastConfiguration.java renamed to extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* Configuration of HazelcastEntityStoreService.
2727
*/
2828
// START SNIPPET: config
29-
public interface HazelcastConfiguration
29+
public interface HazelcastEntityStoreConfiguration
3030
{
3131

3232
@UseDefaults

‎extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreMixin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class HazelcastEntityStoreMixin
5050
private static final String DEFAULT_MAPNAME = "polygene:entitystore:data";
5151

5252
@This
53-
private Configuration<HazelcastConfiguration> config;
53+
private Configuration<HazelcastEntityStoreConfiguration> config;
5454

5555
private IMap<String, String> stringMap;
5656
private HazelcastInstance hazelcastInstance;
@@ -59,7 +59,7 @@ public class HazelcastEntityStoreMixin
5959
public void activateService()
6060
throws Exception
6161
{
62-
HazelcastConfiguration configuration = config.get();
62+
HazelcastEntityStoreConfiguration configuration = config.get();
6363
Config conf = createConfig( configuration );
6464
hazelcastInstance = Hazelcast.newHazelcastInstance( conf );
6565
String mapName = DEFAULT_MAPNAME;
@@ -148,7 +148,7 @@ public Stream<Reader> entityStates()
148148
return stringMap.values().stream().map( StringReader::new );
149149
}
150150

151-
private Config createConfig( HazelcastConfiguration configuration )
151+
private Config createConfig( HazelcastEntityStoreConfiguration configuration )
152152
throws IOException
153153
{
154154
String hzConfLocation = configuration.configXmlLocation().get();

‎extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.apache.polygene.bootstrap.AssemblyException;
2424
import org.apache.polygene.bootstrap.ModuleAssembly;
2525
import org.apache.polygene.bootstrap.ServiceDeclaration;
26-
import org.apache.polygene.entitystore.hazelcast.HazelcastConfiguration;
26+
import org.apache.polygene.entitystore.hazelcast.HazelcastEntityStoreConfiguration;
2727
import org.apache.polygene.entitystore.hazelcast.HazelcastEntityStoreService;
2828

2929
public class HazelcastEntityStoreAssembler
@@ -42,7 +42,7 @@ public void assemble( ModuleAssembly module )
4242
}
4343
if( hasConfig() )
4444
{
45-
configModule().entities( HazelcastConfiguration.class ).visibleIn( configVisibility() );
45+
configModule().entities( HazelcastEntityStoreConfiguration.class ).visibleIn( configVisibility() );
4646
}
4747
}
4848
}

extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/JCloudsMapEntityStoreConfiguration.java renamed to extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/JCloudsEntityStoreConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/**
2929
* Configuration of JCloudsMapEntityStore service.
3030
*/
31-
public interface JCloudsMapEntityStoreConfiguration
31+
public interface JCloudsEntityStoreConfiguration
3232
{
3333
// START SNIPPET: config
3434
/**

extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/JCloudsMapEntityStoreMixin.java renamed to extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/JCloudsEntityStoreMixin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
// It defines where your entities are allowed to be stored.
7070
// @UseDefaults Property<List<String>> geopoliticalBoundaries(); ???
7171
// SEE http://www.jclouds.org/documentation/reference/location-metadata-design
72-
public class JCloudsMapEntityStoreMixin
72+
public class JCloudsEntityStoreMixin
7373
implements ServiceActivation, MapEntityStore
7474
{
7575

@@ -90,7 +90,7 @@ public class JCloudsMapEntityStoreMixin
9090
);
9191

9292
@This
93-
private Configuration<JCloudsMapEntityStoreConfiguration> configuration;
93+
private Configuration<JCloudsEntityStoreConfiguration> configuration;
9494

9595
private BlobStoreContext storeContext;
9696

extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/JCloudsMapEntityStoreService.java renamed to extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/JCloudsEntityStoreService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
* <p>Based on @{@link JSONMapEntityStoreMixin}.</p>
3737
*/
3838
@Concerns( { StateChangeNotificationConcern.class, ConcurrentModificationCheckConcern.class } )
39-
@Mixins( { JSONMapEntityStoreMixin.class, JCloudsMapEntityStoreMixin.class } )
40-
public interface JCloudsMapEntityStoreService
39+
@Mixins( { JSONMapEntityStoreMixin.class, JCloudsEntityStoreMixin.class } )
40+
public interface JCloudsEntityStoreService
4141
extends ServiceActivation,
4242
JSONMapEntityStoreActivation,
4343
EntityStore,

‎extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import org.apache.polygene.bootstrap.AssemblyException;
2525
import org.apache.polygene.bootstrap.ModuleAssembly;
2626
import org.apache.polygene.bootstrap.ServiceDeclaration;
27-
import org.apache.polygene.entitystore.jclouds.JCloudsMapEntityStoreConfiguration;
28-
import org.apache.polygene.entitystore.jclouds.JCloudsMapEntityStoreService;
27+
import org.apache.polygene.entitystore.jclouds.JCloudsEntityStoreConfiguration;
28+
import org.apache.polygene.entitystore.jclouds.JCloudsEntityStoreService;
2929

3030
public class JCloudsEntityStoreAssembler
3131
extends Assemblers.VisibilityIdentityConfig<JCloudsEntityStoreAssembler>
@@ -34,7 +34,7 @@ public class JCloudsEntityStoreAssembler
3434
public void assemble( ModuleAssembly module )
3535
throws AssemblyException
3636
{
37-
ServiceDeclaration service = module.services( JCloudsMapEntityStoreService.class ).
37+
ServiceDeclaration service = module.services( JCloudsEntityStoreService.class ).
3838
visibleIn( visibility() ).
3939
instantiateOnStartup();
4040
if( hasIdentity() )
@@ -43,7 +43,7 @@ public void assemble( ModuleAssembly module )
4343
}
4444
if( hasConfig() )
4545
{
46-
configModule().entities( JCloudsMapEntityStoreConfiguration.class ).visibleIn( configVisibility() );
46+
configModule().entities( JCloudsEntityStoreConfiguration.class ).visibleIn( configVisibility() );
4747
}
4848
}
4949
}

0 commit comments

Comments
 (0)