You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/04/07 07:53:55 UTC
[2/7] stratos git commit: Format autoscaler component code
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestObsoletedMemberRule.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestObsoletedMemberRule.java b/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestObsoletedMemberRule.java
index 562753a..5925641 100644
--- a/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestObsoletedMemberRule.java
+++ b/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestObsoletedMemberRule.java
@@ -59,26 +59,26 @@ public class TestObsoletedMemberRule {
for (KnowledgeBuilderError error : errors) {
sb.append(error.getMessage());
}
- if(sb.length() > 0) {
+ if (sb.length() > 0) {
log.error(sb.toString());
}
throw new IllegalArgumentException(String.format("Could not parse drools file: %s", droolsFilePath));
}
-
+
kbase = KnowledgeBaseFactory.newKnowledgeBase();
kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
log.info("Knowledge base has been set up.");
conf = ConfUtil.getInstance("src/test/resources/autoscaler.xml").getConfiguration();
}
-
+
@Test
public void testOneObsoletedMemberCase() {
-
+
// reset helper class
- TestDelegator.setObsoletedMembers(new ConcurrentHashMap<String, MemberContext>());
-
- if(kbase == null) {
+ TestDelegator.setObsoletedMembers(new ConcurrentHashMap<String, MemberContext>());
+
+ if (kbase == null) {
throw new IllegalArgumentException("Knowledge base is null.");
}
ksession = kbase.newStatefulKnowledgeSession();
@@ -97,19 +97,19 @@ public class TestObsoletedMemberRule {
// TODO Auto-generated catch block
e.printStackTrace();
}
-
+
assertEquals(1, TestDelegator.getObsoletedMembers().size());
assertTrue(TestDelegator.getObsoletedMembers().containsKey(memberId));
-
+
}
-
+
@Test
public void testMoreThanOneObsoletedMemberCase() {
-
+
// reset helper class
- TestDelegator.setObsoletedMembers(new ConcurrentHashMap<String, MemberContext>());
-
- if(kbase == null) {
+ TestDelegator.setObsoletedMembers(new ConcurrentHashMap<String, MemberContext>());
+
+ if (kbase == null) {
throw new IllegalArgumentException("Knowledge base is null.");
}
@@ -119,15 +119,15 @@ public class TestObsoletedMemberRule {
String memberId1 = "member1";
String memberId2 = "member2";
String memberId3 = "member3";
-
+
MemberContext ctxt1 = new MemberContext();
ctxt1.setMemberId(memberId1);
p.addObsoleteMember(ctxt1);
-
+
MemberContext ctxt2 = new MemberContext();
ctxt2.setMemberId(memberId2);
p.addObsoleteMember(ctxt2);
-
+
FactHandle handle = ksession.insert(p);
ksession.fireAllRules();
@@ -137,43 +137,43 @@ public class TestObsoletedMemberRule {
// TODO Auto-generated catch block
e.printStackTrace();
}
-
+
assertEquals(2, TestDelegator.getObsoletedMembers().size());
-
+
assertEquals(0, p.getObsoletedMembers().size());
-
+
assertNotEquals(TestDelegator.getObsoletedMembers().get(memberId1), TestDelegator.getObsoletedMembers().get(memberId2));
-
+
// boolean check0thPosition = memberId1.equals(TestDelegator.getObsoletedMembers().get(0)) ||
// memberId2.equals(TestDelegator.getObsoletedMembers().get(0));
// assertEquals(true, check0thPosition);
-
+
// boolean check1stPosition = memberId1.equals(TestDelegator.getObsoletedMembers().get(1)) ||
// memberId2.equals(TestDelegator.getObsoletedMembers().get(2));
// assertEquals(true, check1stPosition);
-
+
// reset helper class
TestDelegator.setObsoletedMembers(new ConcurrentHashMap<String, MemberContext>());
-
+
MemberContext ctxt3 = new MemberContext();
ctxt3.setMemberId(memberId3);
p.addObsoleteMember(ctxt3);
ksession.update(handle, p);
ksession.fireAllRules();
-
+
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
-
+
assertEquals(1, TestDelegator.getObsoletedMembers().size());
assertTrue(TestDelegator.getObsoletedMembers().containsKey(memberId3));
-
-
+
+
}
-
+
public static String get() {
return "null";
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestRulesPackaged.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestRulesPackaged.java b/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestRulesPackaged.java
index 48c349e..5d3559b 100644
--- a/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestRulesPackaged.java
+++ b/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestRulesPackaged.java
@@ -44,7 +44,7 @@ public class TestRulesPackaged {
parseDroolsFile(minCheckDrlFilePath);
}
-//FIXME add this when dependent scaling file is completed
+ //FIXME add this when dependent scaling file is completed
@Test
public void testDependentScalingDroolsFile() {
parseDroolsFile(dependentScalingDrlFilePath);
@@ -72,7 +72,7 @@ public class TestRulesPackaged {
sb.append(error.getMessage());
log.error(error.getMessage());
}
- if(sb.length() > 0) {
+ if (sb.length() > 0) {
log.error(sb.toString());
}
throw new IllegalArgumentException(String.format("Could not parse drools file: %s", droolsFilePath));
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/test/resources/deployment-policy.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/test/resources/deployment-policy.xml b/components/org.apache.stratos.autoscaler/src/test/resources/deployment-policy.xml
index d14fadd..d27eefe 100644
--- a/components/org.apache.stratos.autoscaler/src/test/resources/deployment-policy.xml
+++ b/components/org.apache.stratos.autoscaler/src/test/resources/deployment-policy.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<deploymentPolicy id ="economy-deployment">
- <partitionGroup id="group1" >
- <partitionAlgo>one-after-another</partitionAlgo>
- <partition id="P1" >
- <provider>ec2</provider>
- <property name="region" value="ap-southeast-1"/>
- <partitionMax>3</partitionMax>
- <min>1</min>
- </partition>
- <!--partition id="P2" >
- <partitionMax>5</partitionMax>
- <min>1</min>
- </partition-->
- </partitionGroup>
+<deploymentPolicy id="economy-deployment">
+ <partitionGroup id="group1">
+ <partitionAlgo>one-after-another</partitionAlgo>
+ <partition id="P1">
+ <provider>ec2</provider>
+ <property name="region" value="ap-southeast-1"/>
+ <partitionMax>3</partitionMax>
+ <min>1</min>
+ </partition>
+ <!--partition id="P2" >
+ <partitionMax>5</partitionMax>
+ <min>1</min>
+ </partition-->
+ </partitionGroup>
</deploymentPolicy>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/test/resources/partition.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/test/resources/partition.xml b/components/org.apache.stratos.autoscaler/src/test/resources/partition.xml
index fcff113..dd83a8f 100644
--- a/components/org.apache.stratos.autoscaler/src/test/resources/partition.xml
+++ b/components/org.apache.stratos.autoscaler/src/test/resources/partition.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<partitions>
- <partition id="P1" >
- <provider>ec2</provider>
- <property name="region" value="ap-southeast-1"/>
- <property name="zone" value="ap-southeast-1-a"/>
- <partitionMax>3</partitionMax>
- <min>1</min>
- </partition>
+ <partition id="P1">
+ <provider>ec2</provider>
+ <property name="region" value="ap-southeast-1"/>
+ <property name="zone" value="ap-southeast-1-a"/>
+ <partitionMax>3</partitionMax>
+ <min>1</min>
+ </partition>
</partitions>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/test/resources/partitions.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/test/resources/partitions.xml b/components/org.apache.stratos.autoscaler/src/test/resources/partitions.xml
index 1c26e84..2522a7f 100644
--- a/components/org.apache.stratos.autoscaler/src/test/resources/partitions.xml
+++ b/components/org.apache.stratos.autoscaler/src/test/resources/partitions.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<partitions>
- <partition id="P1" >
- <provider>ec2</provider>
- <property name="region" value="ap-southeast-1"/>
- <partitionMax>3</partitionMax>
- <min>1</min>
- </partition>
- <partition id="P2" >
- <provider>openstack</provider>
- <property name="region" value="region-1"/>
- <partitionMax>5</partitionMax>
- <min>1</min>
- </partition>
+ <partition id="P1">
+ <provider>ec2</provider>
+ <property name="region" value="ap-southeast-1"/>
+ <partitionMax>3</partitionMax>
+ <min>1</min>
+ </partition>
+ <partition id="P2">
+ <provider>openstack</provider>
+ <property name="region" value="region-1"/>
+ <partitionMax>5</partitionMax>
+ <min>1</min>
+ </partition>
</partitions>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index ddd5a4d..34d353c 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -539,7 +539,7 @@ public class StratosApiV41 extends AbstractApi {
@AuthorizationAction("/permission/protected/manage/getNetworkPartitions")
public Response getNetworkPartitions()
throws RestAPIException {
- NetworkPartitionBean[] networkPartitions = StratosApiV41Utils.getNetworkPartitions();
+ NetworkPartitionBean[] networkPartitions = StratosApiV41Utils.getNetworkPartitions();
return Response.ok(networkPartitions).build();
}