From c6f1cea8afcb31f880734b65b8f6b9d29a1d9f1f Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Tue, 2 Jun 2015 16:26:30 +0200 Subject: [PATCH] remove BatchReport.Component stored in CE's ComponentImpl --- .../sonar/server/computation/component/ComponentImpl.java | 6 +++--- .../server/computation/component/ComponentImplTest.java | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentImpl.java index f5f1d5ba0bb..c255d9a78c0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentImpl.java @@ -31,7 +31,7 @@ import static com.google.common.collect.Iterables.filter; public class ComponentImpl implements Component { private final Type type; - private final BatchReport.Component component; + private final int ref; private final List children; // Mutable values @@ -39,7 +39,7 @@ public class ComponentImpl implements Component { private String uuid; public ComponentImpl(BatchReport.Component component, @Nullable Iterable children) { - this.component = component; + this.ref = component.getRef(); this.type = convertType(component.getType()); this.children = children == null ? Collections.emptyList() : copyOf(filter(children, notNull())); } @@ -66,7 +66,7 @@ public class ComponentImpl implements Component { @Override public int getRef() { - return component.getRef(); + return ref; } public String getUuid() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentImplTest.java index d5ba594bfa8..3100ab9a1f9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentImplTest.java @@ -29,6 +29,11 @@ import static org.assertj.core.api.Assertions.assertThat; public class ComponentImplTest { private ComponentImpl component = new ComponentImpl(BatchReport.Component.newBuilder().build(), Collections.emptyList()); + @Test(expected = NullPointerException.class) + public void constructor_throws_NPE_if_component_arg_is_Null() { + new ComponentImpl(null, null); + } + @Test(expected = UnsupportedOperationException.class) public void getUuid_throws_UOE_if_uuid_has_not_been_set_yet() { component.getUuid(); -- 2.39.5