Skip to content

Commit 0e5dae7

Browse files
dbulahovstbischof
authored andcommitted
fix uuid
Signed-off-by: dbulahov <[email protected]>
1 parent 7cde5aa commit 0e5dae7

File tree

1 file changed

+6
-5
lines changed
  • server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage

1 file changed

+6
-5
lines changed

server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage/SoapUtil.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,8 @@
370370

371371
public class SoapUtil {
372372

373-
private static final Logger LOGGER = LoggerFactory.getLogger(SoapUtil.class);
373+
private static final String UUID_VALUE = "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}";
374+
private static final Logger LOGGER = LoggerFactory.getLogger(SoapUtil.class);
374375

375376
private SoapUtil() {
376377
// constructor
@@ -1746,7 +1747,7 @@ private static SOAPElement addDiscoverRowSetsRoot(SOAPElement body) throws SOAPE
17461747
SOAPElement r = addChildElement(st, Constants.XSD.QN_RESTRICTION);
17471748
r.setAttribute("base", "xsd:string");
17481749
SOAPElement p = addChildElement(r, Constants.XSD.QN_PATTERN);
1749-
p.setAttribute("value", "[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}");
1750+
p.setAttribute("value", UUID_VALUE);
17501751

17511752
SOAPElement ct1 = addChildElement(schema, Constants.XSD.QN_COMPLEX_TYPE);
17521753
ct1.setAttribute("name", "row");
@@ -1814,7 +1815,7 @@ private static SOAPElement addDiscoverPropertiesRoot(SOAPElement body) throws SO
18141815
SOAPElement r = addChildElement(st, Constants.XSD.QN_RESTRICTION);
18151816
r.setAttribute("base", "xsd:string");
18161817
SOAPElement p = addChildElement(r, Constants.XSD.QN_PATTERN);
1817-
p.setAttribute("value", "[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}");
1818+
p.setAttribute("value", UUID_VALUE);
18181819

18191820
SOAPElement ct1 = addChildElement(schema, Constants.XSD.QN_COMPLEX_TYPE);
18201821
ct1.setAttribute("name", "xmlDocument");
@@ -2621,7 +2622,7 @@ private static SOAPElement fillRoot(SOAPElement root) {
26212622
SOAPElement r = addChildElement(st, Constants.XSD.QN_RESTRICTION);
26222623
r.setAttribute("base", "xsd:string");
26232624
SOAPElement p = addChildElement(r, Constants.XSD.QN_PATTERN);
2624-
p.setAttribute("value", "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}");
2625+
p.setAttribute("value", UUID_VALUE);
26252626
return schema;
26262627
}
26272628

@@ -2685,7 +2686,7 @@ private static void addRowsetSchema(SOAPElement root, RowSet rowSet) {
26852686
SOAPElement restriction = addChildElement(simpleType, Constants.XSD.QN_RESTRICTION);
26862687
restriction.setAttribute("base", "xsd:string");
26872688
SOAPElement pattern = addChildElement(restriction, Constants.XSD.QN_RESTRICTION);
2688-
pattern.setAttribute("value", "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}");
2689+
pattern.setAttribute("value", UUID_VALUE);
26892690

26902691
SOAPElement ct = addChildElement(schema, Constants.XSD.QN_COMPLEX_TYPE);
26912692
ct.setAttribute("name", "row");

0 commit comments

Comments
 (0)