aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--models-interactions/model-impl/guard/src/main/java/org/onap/policy/guard/OperationsHistory.java6
-rw-r--r--models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpGroup.java12
-rw-r--r--models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/DmaapSimRestControllerV1.java4
3 files changed, 12 insertions, 10 deletions
diff --git a/models-interactions/model-impl/guard/src/main/java/org/onap/policy/guard/OperationsHistory.java b/models-interactions/model-impl/guard/src/main/java/org/onap/policy/guard/OperationsHistory.java
index 0e66217f4..2ec1f342e 100644
--- a/models-interactions/model-impl/guard/src/main/java/org/onap/policy/guard/OperationsHistory.java
+++ b/models-interactions/model-impl/guard/src/main/java/org/onap/policy/guard/OperationsHistory.java
@@ -3,6 +3,7 @@
* ONAP
* ================================================================================
* Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2021 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -34,8 +35,9 @@ import lombok.Data;
@Entity
@Table(name = "operationshistory", indexes = {
- @Index(name = "operationshistory_clreqid_index", columnList = "requestId,closedLoopName"),
- @Index(name = "operationshistory_target_index", columnList = "target,operation,actor,endtime")})
+ @Index(name = "operationshistory_clreqid_index", columnList = "requestId,closedLoopName"),
+ @Index(name = "operationshistory_target_index", columnList = "target,operation,actor,endtime")
+})
@Data
public class OperationsHistory implements Serializable {
diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpGroup.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpGroup.java
index c94cfdd91..2856bfb39 100644
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpGroup.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpGroup.java
@@ -3,7 +3,7 @@
* ONAP Policy Model
* ================================================================================
* Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019,2021 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -90,11 +90,11 @@ public class JpaPdpGroup extends PfConcept implements PfAuthorative<PdpGroup> {
// @formatter:off
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
@CollectionTable(joinColumns = {
- @JoinColumn(name = "pdpGroupParentKeyName", referencedColumnName = "parentKeyName"),
- @JoinColumn(name = "pdpGroupParentKeyVersion", referencedColumnName = "parentKeyVersion"),
- @JoinColumn(name = "pdpGroupParentLocalName", referencedColumnName = "parentLocalName"),
- @JoinColumn(name = "pdpGroupLocalName", referencedColumnName = "localName")
- })
+ @JoinColumn(name = "pdpGroupParentKeyName", referencedColumnName = "parentKeyName"),
+ @JoinColumn(name = "pdpGroupParentKeyVersion", referencedColumnName = "parentKeyVersion"),
+ @JoinColumn(name = "pdpGroupParentLocalName", referencedColumnName = "parentLocalName"),
+ @JoinColumn(name = "pdpGroupLocalName", referencedColumnName = "localName")
+ })
// @formatter:on
@NotNull
private List<@NotNull @Valid JpaPdpSubGroup> pdpSubGroups;
diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/DmaapSimRestControllerV1.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/DmaapSimRestControllerV1.java
index 8339d0e64..f6e14d2b0 100644
--- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/DmaapSimRestControllerV1.java
+++ b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/DmaapSimRestControllerV1.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019,2021 Nordix Foundation.
* Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -70,7 +70,7 @@ public class DmaapSimRestControllerV1 extends BaseRestControllerV1 {
@POST
@Path("{topicName}")
@Consumes(value = {CambriaMessageBodyHandler.MEDIA_TYPE_APPLICATION_CAMBRIA,
- TextMessageBodyHandler.MEDIA_TYPE_TEXT_PLAIN, MEDIA_TYPE_APPLICATION_JSON})
+ TextMessageBodyHandler.MEDIA_TYPE_TEXT_PLAIN, MEDIA_TYPE_APPLICATION_JSON})
public Response postDmaapMessage(@PathParam("topicName") final String topicName, final Object dmaapMessage) {
return DmaapSimProvider.getInstance().processDmaapMessagePut(topicName, dmaapMessage);