From c8b426318857bf6907ccdf799c7f4317399b6028 Mon Sep 17 00:00:00 2001 From: "Tej, Tarun" Date: Mon, 11 Sep 2017 15:30:24 -0400 Subject: sonar blocker/critical fixes Fixes for sonar critical and blocker issues Issue-Id: POLICY-113 Change-Id: I33bf28abfc52bf289401c58409beaac01b5c2fa6 Signed-off-by: Tej, Tarun --- .../src/main/java/org/onap/policy/admin/RESTfulPAPEngine.java | 2 +- .../src/main/java/org/onap/policy/model/PDPGroupContainer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'POLICY-SDK-APP/src/main/java/org/onap') diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/RESTfulPAPEngine.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/RESTfulPAPEngine.java index d75af075d..1f9372a7d 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/RESTfulPAPEngine.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/RESTfulPAPEngine.java @@ -119,7 +119,7 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP } @Override - public void SetDefaultGroup(OnapPDPGroup group) throws PAPException { + public void setDefaultGroup(OnapPDPGroup group) throws PAPException { sendToPAP("POST", null, null, null, groupID + group.getId(), "default=true"); } diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java index c05a67441..04ec3e868 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java @@ -142,7 +142,7 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po public void makeDefault(OnapPDPGroup group) { try { - this.papEngine.SetDefaultGroup(group); + this.papEngine.setDefaultGroup(group); } catch (PAPException e) { String message = "Unable to set Default Group on server: " + e; LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + message, e); -- cgit 1.2.3-korg > summaryrefslogtreecommitdiffstats
blob: 3c35e9223e8a8fd9b5e494fd92395ca2d6df5473 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
<?xml version="1.0" encoding="UTF-8"?>
<!--
  Copyright © 2017-2018 AT&T Intellectual Property.
  Modifications Copyright © 2018 IBM.
  
  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.
-->
<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.onap.ccsdk.parent</groupId>
		<artifactId>odlparent-lite</artifactId>
		<version>1.2.2-SNAPSHOT</version>
		<relativePath/>
	</parent>

	<groupId>org.onap.ccsdk.features</groupId>
	<artifactId>blueprints-processor-installer</artifactId>
	<version>0.4.2-SNAPSHOT</version>
	<packaging>pom</packaging>
	<name>Blueprints Processor :: ${project.artifactId}</name>

	<properties>
		<application.name>blueprints-processor</application.name>
		<features.boot>blueprints-processor-features</features.boot>
		<features.repositories>mvn:org.onap.ccsdk.features/ccsdk-features/blueprints-processor-features/${project.version}/xml/features</features.repositories>
		<include.transitive.dependencies>false</include.transitive.dependencies>
	</properties>

	<dependencies>
		<dependency>
			<groupId>org.onap.ccsdk.features</groupId>
			<artifactId>ccsdk-blueprints-processor</artifactId>
			<version>${project.version}</version>
			<classifier>features</classifier>
			<type>xml</type>
			<exclusions>
				<exclusion>
					<groupId>*</groupId>
					<artifactId>*</artifactId>
				</exclusion>
			</exclusions>
		</dependency>
		<dependency>
			<groupId>org.onap.ccsdk.features</groupId>
			<artifactId>blueprints-data-adaptor-provider</artifactId>
			<version>${project.version}</version>
		</dependency>
		<dependency>
			<groupId>org.onap.ccsdk.features</groupId>
			<artifactId>blueprints-rest-adaptor-provider</artifactId>
			<version>${project.version}</version>
		</dependency>
		<dependency>
			<groupId>org.onap.ccsdk.features</groupId>
			<artifactId>blueprints-assignment-provider</artifactId>
			<version>${project.version}</version>
		</dependency>
		<dependency>
			<groupId>org.onap.ccsdk.features</groupId>
			<artifactId>blueprints-generator-provider</artifactId>
			<version>${project.version}</version>
		</dependency>
		<dependency>
			<groupId>org.onap.ccsdk.features</groupId>
			<artifactId>blueprints-model-provider</artifactId>
			<version>${project.version}</version>
		</dependency>
	</dependencies>

	<build>
		<plugins>
			<plugin>
				<artifactId>maven-assembly-plugin</artifactId>
				<executions>
					<execution>
						<id>maven-repo-zip</id>
						<goals>
							<goal>single</goal>
						</goals>
						<phase>package</phase>
						<configuration>
							<attach>true</attach>
							<finalName>stage/${application.name}-${project.version}</finalName>
							<descriptors>
								<descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
							</descriptors>
							<appendAssemblyId>true</appendAssemblyId>
						</configuration>
					</execution>
					<execution>
						<id>installer-zip</id>
						<goals>
							<goal>single</goal>
						</goals>
						<phase>package</phase>
						<configuration>
							<attach>true</attach>
							<finalName>${application.name}-${project.version}-installer</finalName>
							<descriptors>
								<descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
							</descriptors>
							<appendAssemblyId>false</appendAssemblyId>
						</configuration>
					</execution>
				</executions>
			</plugin>
			<plugin>
				<groupId>org.apache.maven.plugins</groupId>
				<artifactId>maven-dependency-plugin</artifactId>
				<executions>
					<execution>
						<id>copy-dependencies</id>
						<goals>
							<goal>copy-dependencies</goal>
						</goals>
						<phase>prepare-package</phase>
						<configuration>
							<transitive>false</transitive>
							<outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
							<overWriteReleases>false</overWriteReleases>
							<overWriteSnapshots>true</overWriteSnapshots>
							<overWriteIfNewer>true</overWriteIfNewer>
							<useRepositoryLayout>true</useRepositoryLayout>
							<addParentPoms>false</addParentPoms>
							<copyPom>false</copyPom>
							<includeGroupIds>org.onap.ccsdk.features</includeGroupIds>
							<scope>provided</scope>
						</configuration>
					</execution>
				</executions>
			</plugin>
			<plugin>
				<artifactId>maven-resources-plugin</artifactId>
				<version>2.6</version>
				<executions>
					<execution>
						<id>copy-version</id>
						<goals>
							<goal>copy-resources</goal>
						</goals><!-- here the phase you need -->
						<phase>validate</phase>
						<configuration>
							<outputDirectory>${basedir}/target/stage</outputDirectory>
							<resources>
								<resource>
									<directory>src/main/resources/scripts</directory>
									<includes>
										<include>install-feature.sh</include>
									</includes>
									<filtering>true</filtering>
								</resource>
							</resources>
						</configuration>
					</execution>
				</executions>
			</plugin>
		</plugins>
	</build>
</project>