<artifactId>application-config-rest-services</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.openecomp.sdc</groupId>
+ <artifactId>togglz-rest-services</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.openecomp.sdc.onboarding</groupId>
<artifactId>action-library-rest-services</artifactId>
<bean id = "healthCheck" class="org.openecomp.sdcrests.health.rest.services.HealthCheckImpl"/>
<bean id = "itemPermissions" class="org.openecomp.sdcrests.itempermissions.rest.services.ItemPermissionsImpl"/>
<bean id = "notifications" class="org.openecomp.sdcrests.notifications.rest.services.impl.NotificationsImpl"/>
+ <bean id = "togglz" class="org.openecomp.sdcrests.togglz.rest.services.TogglzFeaturesImpl"/>
+
<!-- RESTful Services -->
<jaxrs:server id="restContainer" address="/">
<ref bean="healthCheck"/>
<ref bean="itemPermissions"/>
<ref bean="notifications"/>
+ <ref bean="togglz"/>
</jaxrs:serviceBeans>
<jaxrs:providers>
<module>item-rest</module>
<module>notifications-fe</module>
<module>notifications-rest</module>
+ <module>togglz-rest</module>
</modules>
</project>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.openecomp.sdc</groupId>
+ <artifactId>openecomp-sdc-rest-webapp</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>togglz-rest</artifactId>
+ <packaging>pom</packaging>
+
+
+ <modules>
+ <module>togglz-rest-types</module>
+ <module>togglz-rest-services</module>
+ </modules>
+
+</project>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.openecomp.sdc</groupId>
+ <artifactId>togglz-rest</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>togglz-rest-services</artifactId>
+ <dependencies>
+
+
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>${ws.rs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.framework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>${javax.inject.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openecomp.sdc.core</groupId>
+ <artifactId>openecomp-common-lib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openecomp.sdc</groupId>
+ <artifactId>togglz-rest-types</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openecomp.sdc</groupId>
+ <artifactId>openecomp-sdc-common-rest</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- CXF -->
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <scope>test</scope>
+ <version>${mockito.all.version}</version>
+ </dependency>
+ </dependencies>
+
+
+</project>
\ No newline at end of file
--- /dev/null
+/*
+ * Copyright © 2016-2017 European Support Limited
+ *
+ * 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.openecomp.sdcrests.togglz.rest;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.openecomp.sdcrests.togglz.types.FeatureSetDto;
+import org.springframework.validation.annotation.Validated;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Path("/v1.0/togglz")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+@Api(value = "TOGGLZ")
+@Validated
+public interface TogglzFeatures {
+
+ @GET
+ @ApiOperation(value = "Get TOGGLZ Features",
+ response = FeatureSetDto.class,
+ responseContainer = "List")
+ Response getFeatures();
+
+}
--- /dev/null
+/*
+ * Copyright © 2016-2017 European Support Limited
+ *
+ * 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.openecomp.sdcrests.togglz.rest.mapping;
+
+import org.openecomp.sdcrests.mapping.MappingBase;
+import org.openecomp.sdcrests.togglz.types.FeatureDto;
+import org.openecomp.sdcrests.togglz.types.FeatureSetDto;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.openecomp.sdc.common.togglz.ToggleStatus;
+
+public class MapToggleableFeatureToDto extends MappingBase<Collection<ToggleStatus>, FeatureSetDto> {
+
+ @Override
+ public void doMapping(Collection<ToggleStatus> source, FeatureSetDto target) {
+ if (source != null && !source.isEmpty()){
+ Set<FeatureDto> fDtos = source.stream().map(f -> new FeatureDto(f.name(), f.isActive()))
+ .collect(Collectors.toSet());
+ target.setFeatures(fDtos);
+ } else {
+ target.setFeatures(Collections.EMPTY_SET);
+ }
+ }
+}
--- /dev/null
+/*
+ * Copyright © 2016-2017 European Support Limited
+ *
+ * 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.openecomp.sdcrests.togglz.rest.services;
+
+import org.openecomp.sdc.common.togglz.ToggleableFeature;
+import org.openecomp.sdcrests.togglz.rest.TogglzFeatures;
+import org.openecomp.sdcrests.togglz.rest.mapping.MapToggleableFeatureToDto;
+import org.openecomp.sdcrests.togglz.types.FeatureSetDto;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+import javax.inject.Named;
+import javax.ws.rs.core.Response;
+import java.util.Arrays;
+
+@Named
+@Service("TogglzFeature")
+@Scope(value = "prototype")
+public class TogglzFeaturesImpl implements TogglzFeatures {
+
+ @Override
+ public Response getFeatures() {
+ FeatureSetDto featureSetDto = new FeatureSetDto();
+ new MapToggleableFeatureToDto().doMapping(Arrays.asList(ToggleableFeature.values()), featureSetDto);
+ return Response.ok(featureSetDto).build();
+ }
+}
+
--- /dev/null
+package org.openecomp;
+
+import com.google.common.collect.Sets;
+import org.junit.Test;
+import org.openecomp.sdc.common.togglz.ToggleableFeature;
+import org.openecomp.sdcrests.togglz.rest.TogglzFeatures;
+import org.openecomp.sdcrests.togglz.rest.mapping.MapToggleableFeatureToDto;
+import org.openecomp.sdcrests.togglz.rest.services.TogglzFeaturesImpl;
+import org.openecomp.sdcrests.togglz.types.FeatureDto;
+import org.openecomp.sdcrests.togglz.types.FeatureSetDto;
+import org.togglz.core.annotation.Label;
+import org.openecomp.sdc.common.togglz.ToggleStatus;
+
+import javax.ws.rs.core.Response;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class TogglzFeatureRestTest {
+
+ @Test
+ public void shouldConvertDataProperly() {
+ ToggleStatus tf = mock(ToggleStatus.class);
+ final String TF_NAME = "tf";
+ final boolean ACTIVE = true;
+ when(tf.name()).thenReturn(TF_NAME);
+ when(tf.isActive()).thenReturn(ACTIVE);
+ MapToggleableFeatureToDto mapToggleableFeatureToDto = new MapToggleableFeatureToDto();
+ FeatureSetDto target = new FeatureSetDto();
+ Collection<ToggleStatus> source = Arrays.asList(tf);
+ mapToggleableFeatureToDto.doMapping(source, target);
+ assertEquals(source.size(), target.getFeatures().size());
+ FeatureDto result = target.getFeatures().iterator().next();
+ assertEquals(TF_NAME, result.getName());
+ assertEquals(ACTIVE, result.isActive());
+
+ }
+
+ @Test
+ public void shouldGetCurrentTogglzValues() {
+ TogglzFeatures togglzFeature = new TogglzFeaturesImpl();
+ Response response = togglzFeature.getFeatures();
+ assertNotNull(response);
+ Object entity = response.getEntity();
+ assertEquals(entity.getClass(), FeatureSetDto.class);
+ Set<FeatureDto> features = ((FeatureSetDto) entity).getFeatures();
+ assertEquals(features.size(), ToggleableFeature.values().length);
+ Set<String> names = Arrays.asList(ToggleableFeature.values()).stream().map(toggleableFeature -> toggleableFeature.name()).collect(Collectors.toSet());
+ Set<String> dtoNames = features.stream().map(featureDto -> featureDto.getName()).collect(Collectors.toSet());
+ assertTrue(Sets.symmetricDifference(names, dtoNames).isEmpty());
+ }
+}
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.openecomp.sdc</groupId>
+ <artifactId>togglz-rest</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>togglz-rest-types</artifactId>
+
+</project>
\ No newline at end of file
--- /dev/null
+/*
+ * Copyright © 2016-2017 European Support Limited
+ *
+ * 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.openecomp.sdcrests.togglz.types;
+
+import java.util.Objects;
+
+public class FeatureDto {
+
+ private final String name;
+ private final boolean active;
+
+ public FeatureDto(String name, boolean active) {
+ this.name = name;
+ this.active = active;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public boolean isActive() {
+ return active;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof FeatureDto)) return false;
+ FeatureDto that = (FeatureDto) o;
+ return Objects.equals(getName(), that.getName());
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(getName());
+ }
+
+ @Override
+ public String toString() {
+ final StringBuffer sb = new StringBuffer("FeatureDto{");
+ sb.append("name='").append(name).append('\'');
+ sb.append(", active=").append(active);
+ sb.append('}');
+ return sb.toString();
+ }
+}
--- /dev/null
+/*
+ * Copyright © 2016-2017 European Support Limited
+ *
+ * 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.openecomp.sdcrests.togglz.types;
+
+import java.util.Set;
+
+public class FeatureSetDto {
+
+ private Set<FeatureDto> features;
+
+ public Set<FeatureDto> getFeatures() {
+ return features;
+ }
+
+ public void setFeatures(Set<FeatureDto> features) {
+ this.features = features;
+ }
+
+ @Override
+ public String toString() {
+ final StringBuffer sb = new StringBuffer("FeatureSetDto{");
+ sb.append("features=").append(features);
+ sb.append('}');
+ return sb.toString();
+ }
+}
--- /dev/null
+package org.openecomp.sdc.common.togglz;
+
+import org.togglz.core.Feature;
+
+public interface ToggleStatus extends Feature {
+ boolean isActive();
+}
import org.togglz.core.annotation.Label;
import org.togglz.core.context.FeatureContext;
-public enum ToggleableFeature implements Feature {
+public enum ToggleableFeature implements ToggleStatus {
@Label ("Forwarder Capability")
FORWARDER_CAPABILITY;
+ @Override
public boolean isActive() {
return FeatureContext.getFeatureManager().isActive(this);
}
GET_COMPONENT_DEPENDENCY,
Health_check,
- notifications
+ notifications,
+ TOGGLZ
;
public static String getServiceName(LoggerServiceName serviceName) {
Code Review / sdc.git / commitdiff